From 77f207ef4e111c6daa924f357ab65c0c7135b254 Mon Sep 17 00:00:00 2001
From: Anonymous <anonymous@anonymous.com>
Date: Wed, 15 Jan 2014 02:34:23 -0700
Subject: [PATCH] Added serverNetworkMessages library

---
 engine/server/library/CMakeLists.txt          |    1 +
 .../library/serverMetrics/src/CMakeLists.txt  |    5 +-
 .../serverNetworkMessages/CMakeLists.txt      |   11 +
 .../AcceptHighBidMessage.h                    |    1 +
 .../AccountFeatureIdRequest.h                 |    1 +
 .../AccountFeatureIdResponse.h                |    1 +
 .../serverNetworkMessages/AddAuctionMessage.h |    1 +
 .../serverNetworkMessages/AddBidMessage.h     |    1 +
 .../AddCharacterMessage.h                     |    1 +
 .../AddImmediateAuctionMessage.h              |    1 +
 .../AddObjectIdBlockMessage.h                 |    1 +
 .../AddResourceTypeMessage.h                  |    1 +
 .../AdjustAccountFeatureIdRequest.h           |    1 +
 .../AdjustAccountFeatureIdResponse.h          |    1 +
 .../AiCreatureStateMessage.h                  |    2 +
 .../serverNetworkMessages/AiMovementMessage.h |    2 +
 .../serverNetworkMessages/AuctionBase.h       |    1 +
 .../serverNetworkMessages/AuctionData.h       |    1 +
 .../AuthTransferClientMessage.h               |    1 +
 .../public/serverNetworkMessages/AvatarList.h |    1 +
 .../serverNetworkMessages/AvatarListArchive.h |    1 +
 .../serverNetworkMessages/BiographyMessage.h  |    1 +
 .../BountyHunterTargetListMessage.h           |    1 +
 .../BountyHunterTargetMessage.h               |    1 +
 .../CMCreateAuctionBidMessage.h               |    1 +
 .../CMCreateAuctionMessage.h                  |    1 +
 .../CMCreateLocationMessage.h                 |    1 +
 .../CMDeleteAuctionMessage.h                  |    1 +
 .../CMDeleteLocationMessage.h                 |    1 +
 .../CMUpdateAuctionMessage.h                  |    1 +
 .../CMUpdateLocationMessage.h                 |    1 +
 .../serverNetworkMessages/CSDBNetMessages.h   |    1 +
 .../serverNetworkMessages/CSToolRequest.h     |    1 +
 .../serverNetworkMessages/CSToolResponse.h    |    1 +
 .../CancelAuctionMessage.h                    |    1 +
 .../CentralConnectionServerMessages.h         |    1 +
 .../CentralGameServerMessages.h               |    1 +
 .../CentralPingMessage.h                      |    1 +
 .../CentralPlanetServerConnect.h              |    1 +
 .../CentralTaskMessages.h                     |    1 +
 .../ChangeUniverseProcessMessage.h            |    1 +
 .../CharacterListMessage.h                    |    1 +
 .../CharacterNamesMessage.h                   |    1 +
 .../CharacterTransferStatusMessage.h          |    1 +
 .../serverNetworkMessages/ChatConnectAvatar.h |    1 +
 .../ChatDisconnectAvatar.h                    |    2 +
 .../serverNetworkMessages/ChatServerOnline.h  |    2 +
 .../ChunkCompleteMessage.h                    |    1 +
 .../ChunkObjectListMessage.h                  |    1 +
 .../ClaimRewardsMessage.h                     |    1 +
 .../ClaimRewardsReplyMessage.h                |    1 +
 .../CleanupInvalidItemRetrievalMessage.h      |    1 +
 .../CommoditiesLoadDoneMessage.h              |    1 +
 .../ConnectionServerDown.h                    |    1 +
 .../CreateDynamicRegionCircleMessage.h        |    2 +
 .../CreateDynamicRegionRectangleMessage.h     |    2 +
 .../CreateDynamicSpawnRegionCircleMessage.h   |    2 +
 .../CreateGroupMessage.h                      |    2 +
 .../CreateNewObjectMessage.h                  |    1 +
 .../CreateObjectMessage.h                     |    1 +
 .../CreateSyncUiMessage.h                     |    1 +
 .../CreateVendorMarketMessage.h               |    1 +
 .../DeleteAuctionLocationMessage.h            |    1 +
 .../DestroyVendorMarketMessage.h              |    1 +
 .../DownloadCharacterMessage.h                |    1 +
 .../EnableNewJediTrackingMessage.h            |    1 +
 .../EndBaselinesMessage.h                     |    1 +
 .../serverNetworkMessages/EnumerateServers.h  |    2 +
 .../ExchangeListCreditsMessage.h              |    1 +
 .../ExcommunicateGameServerMessage.h          |    1 +
 .../FactionalSystemMessage.h                  |    1 +
 .../FailedToLoadObjectMessage.h               |    1 +
 .../FeatureIdTransactionRequest.h             |    1 +
 .../FeatureIdTransactionResponse.h            |    1 +
 .../FeatureIdTransactionSyncUpdate.h          |    1 +
 .../FirstPlanetGameServerIdMessage.h          |    1 +
 .../FirstServerNetworkMessages.h              |    1 +
 .../FlagObjectForDeleteMessage.h              |    1 +
 .../ForceUnloadObjectMessage.h                |    1 +
 .../GameConnectionServerMessages.h            |    1 +
 .../GameGameServerMessages.h                  |    1 +
 .../GameServerCSRequestMessage.h              |    1 +
 .../GameServerCSResponseMessage.h             |    1 +
 .../GameServerConnectAck.h                    |    1 +
 .../GameServerForLoginMessage.h               |    1 +
 .../GameServerForceChangeAuthorityMessage.h   |    1 +
 .../GameServerMessageInterface.h              |    2 +
 .../GameServerReadyMessage.h                  |    1 +
 .../GameServerUniverseLoadedMessage.h         |    1 +
 .../GameTaskManagerMessages.h                 |    1 +
 .../GetAuctionLocationsMessage.h              |    1 +
 .../GetItemDetailsMessage.h                   |    1 +
 .../serverNetworkMessages/GetItemMessage.h    |    1 +
 .../GetMarketAuctionAttributesMessage.h       |    1 +
 .../GetMarketAuctionBidsMessage.h             |    1 +
 .../GetMarketAuctionsMessage.h                |    1 +
 .../GetMoneyFromOfflineObjectMessage.h        |    1 +
 .../GetPlayerVendorCountMessage.h             |    2 +
 .../GetVendorOwnerMessage.h                   |    1 +
 .../GetVendorValueMessage.h                   |    1 +
 .../serverNetworkMessages/GroupMemberParam.h  |    1 +
 .../GroupMemberParamArchive.h                 |    1 +
 .../serverNetworkMessages/ItemMovedMessage.h  |    1 +
 .../LoadCommoditiesMessage.h                  |    1 +
 .../LoadContainedObjectMessage.h              |    1 +
 .../LoadContentsMessage.h                     |    1 +
 .../serverNetworkMessages/LoadObjectMessage.h |    1 +
 .../LoadStructureMessage.h                    |    1 +
 .../LoadUniverseMessage.h                     |    1 +
 .../LocateObjectResponseMessage.h             |    2 +
 .../LocatePlayerResponseMessage.h             |    2 +
 .../LocateStructureMessage.h                  |    1 +
 .../serverNetworkMessages/LocationRequest.h   |    1 +
 .../serverNetworkMessages/LocationResponse.h  |    1 +
 .../serverNetworkMessages/LoginClusterName.h  |    1 +
 .../serverNetworkMessages/LoginClusterName2.h |    1 +
 .../LoginConnectionServerAddress.h            |    1 +
 .../LoginCreateCharacterAckMessage.h          |    1 +
 .../LoginCreateCharacterMessage.h             |    1 +
 .../serverNetworkMessages/LoginKeyPush.h      |    1 +
 .../LoginRestoreCharacterMessage.h            |    1 +
 .../LoginUpgradeAccountMessage.h              |    1 +
 .../MessageQueueAlterAttribute.h              |    1 +
 .../MessageQueueCommandQueueEnqueueFwd.h      |    2 +
 ...eQueueCommandQueueForceExecuteCommandFwd.h |    2 +
 .../MessageQueueGrantOfflineXp.h              |    2 +
 .../MessageQueuePvpCommand.h                  |    2 +
 .../MessageQueueScriptTrigger.h               |    2 +
 .../MessageQueueSetState.h                    |    2 +
 .../MessageQueueTeleportObject.h              |    2 +
 .../MessageToAckMessage.h                     |    1 +
 .../serverNetworkMessages/MessageToMessage.h  |    1 +
 .../serverNetworkMessages/MessageToPayload.h  |    1 +
 .../MetricsDataMessage.h                      |    1 +
 .../MetricsInitiationMessage.h                |    1 +
 .../public/serverNetworkMessages/NewClient.h  |    1 +
 .../OnAcceptHighBidMessage.h                  |    1 +
 .../OnAddAuctionMessage.h                     |    1 +
 .../serverNetworkMessages/OnAddBidMessage.h   |    1 +
 .../OnAuctionExpiredMessage.h                 |    1 +
 .../OnCancelAuctionMessage.h                  |    1 +
 .../OnCleanupInvalidItemRetrievalMessage.h    |    1 +
 .../OnCreateVendorMarketMessage.h             |    1 +
 .../OnGetItemDetailsMessage.h                 |    1 +
 .../serverNetworkMessages/OnGetItemMessage.h  |    1 +
 .../OnGetPlayerVendorCountMessage.h           |    2 +
 .../OnGetVendorOwnerMessage.h                 |    1 +
 .../OnGetVendorValueMessage.h                 |    1 +
 .../OnItemExpiredMessage.h                    |    1 +
 .../OnPermanentAuctionPurchasedMessage.h      |    1 +
 .../OnQueryAuctionHeadersMessage.h            |    1 +
 .../OnQueryVendorItemCountReplyMessage.h      |    2 +
 .../OnUpdateVendorSearchOptionMessage.h       |    1 +
 .../OnVendorRefuseItemMessage.h               |    1 +
 .../PersistedPlayerMessage.h                  |    1 +
 .../PlanetLoadCharacterMessage.h              |    1 +
 .../PlanetObjectIdMessage.h                   |    1 +
 .../PlanetRemoveObject.h                      |    1 +
 .../PlayedTimeAccumMessage.h                  |    2 +
 .../PopulationListMessage.h                   |    1 +
 .../PreloadFinishedMessage.h                  |    1 +
 .../PreloadRequestCompleteMessage.h           |    1 +
 .../ProfilerOperationMessage.h                |    1 +
 .../QueryAuctionHeadersMessage.h              |    1 +
 .../QueryVendorItemCountMessage.h             |    1 +
 .../public/serverNetworkMessages/RandomName.h |    2 +
 .../ReleaseAuthoritativeMessage.h             |    1 +
 .../ReloadAdminTableMessage.h                 |    1 +
 .../ReloadCommandTableMessage.h               |    1 +
 .../ReloadDatatableMessage.h                  |    1 +
 .../ReloadScriptMessage.h                     |    1 +
 .../ReloadTemplateMessage.h                   |    1 +
 .../RenameCharacterMessage.h                  |    1 +
 .../RequestBiographyMessage.h                 |    1 +
 .../RequestChunkMessage.h                     |    1 +
 .../RequestGameServerForLoginMessage.h        |    1 +
 .../RequestObjectIdsMessage.h                 |    1 +
 .../RequestObjectMessage.h                    |    1 +
 .../RequestPlanetObjectIdMessage.h            |    1 +
 .../RequestUnloadObjectMessage.h              |    1 +
 .../RestartServerMessage.h                    |    1 +
 .../RetrievedItemLoadMessage.h                |    1 +
 .../SPCharacterProfileMessage.h               |    1 +
 .../SceneTransferMessages.h                   |    1 +
 .../ServerDeleteCharacterMessage.h            |    1 +
 .../SetAuthoritativeMessage.h                 |    1 +
 .../SetConnectionServerPublic.h               |    1 +
 .../SetEntranceChargeMessage.h                |    1 +
 .../SetGameTimeMessage.h                      |    1 +
 .../SetObjectPositionMessage.h                |    1 +
 .../SetPlanetServerMessage.h                  |    1 +
 .../SetSalesTaxMessage.h                      |    1 +
 .../SetUniverseAuthoritativeMessage.h         |    1 +
 .../SetupServerNetworkMessages.h              |    1 +
 .../StructureListMessage.h                    |    1 +
 .../StructuresForPurgeMessage.h               |    1 +
 .../SynchronizeScriptVarDeltasMessage.h       |    2 +
 .../SynchronizeScriptVarsMessage.h            |    2 +
 .../TaskConnectionIdMessage.h                 |    2 +
 .../TaskConsoleCommand.h                      |    1 +
 .../serverNetworkMessages/TaskEnumCluster.h   |    2 +
 .../serverNetworkMessages/TaskEnumProcesses.h |    2 +
 .../serverNetworkMessages/TaskKillProcess.h   |    2 +
 .../TaskProcessDiedMessage.h                  |    1 +
 .../serverNetworkMessages/TaskSpawnProcess.h  |    2 +
 .../TaskSpawnProcessAck.h                     |    2 +
 .../serverNetworkMessages/TaskUtilization.h   |    2 +
 .../serverNetworkMessages/TeleportMessage.h   |    1 +
 .../serverNetworkMessages/TeleportToMessage.h |    1 +
 .../ToggleAvatarLoginStatus.h                 |    1 +
 .../TransferAccountData.h                     |    1 +
 .../TransferAccountDataArchive.h              |    1 +
 .../TransferCharacterData.h                   |    1 +
 .../TransferCharacterDataArchive.h            |    1 +
 .../TransferReplyCharacterList.h              |    1 +
 .../TransferReplyMoveValidation.h             |    1 +
 .../TransferRequestMoveValidation.h           |    1 +
 .../UnloadObjectMessage.h                     |    1 +
 .../UnloadProxyMessage.h                      |    1 +
 .../UnloadedPlayerMessage.h                   |    1 +
 .../UpdateConnectionServerStatus.h            |    1 +
 .../UpdateLoginConnectionServerStatus.h       |    1 +
 .../UpdateObjectOnPlanetMessage.h             |    1 +
 .../UpdateObjectPositionMessage.h             |    2 +
 .../UpdatePlayerCountMessage.h                |    1 +
 .../UpdateVendorSearchOptionMessage.h         |    1 +
 .../UpdateVendorStatusMessage.h               |    1 +
 .../UploadCharacterMessage.h                  |    1 +
 .../ValidateAccountMessage.h                  |    2 +
 .../ValidateAccountReplyMessage.h             |    2 +
 .../ValidateCharacterForLoginMessage.h        |    1 +
 .../ValidateCharacterForLoginReplyMessage.h   |    1 +
 .../VendorStatusChangeMessage.h               |    1 +
 .../serverNetworkMessages/VerifyAndLockName.h |    1 +
 .../serverNetworkMessages/src/CMakeLists.txt  |  516 ++++++
 .../src/shared/AvatarList.cpp                 |   13 +
 .../src/shared/AvatarList.h                   |   36 +
 .../src/shared/AvatarListArchive.cpp          |   35 +
 .../src/shared/AvatarListArchive.h            |   31 +
 .../src/shared/ChatConnectAvatar.cpp          |   51 +
 .../src/shared/ChatConnectAvatar.h            |   77 +
 .../src/shared/ChatDisconnectAvatar.cpp       |   36 +
 .../src/shared/ChatDisconnectAvatar.h         |   39 +
 .../src/shared/ChatServerOnline.cpp           |   40 +
 .../src/shared/ChatServerOnline.h             |   46 +
 .../src/shared/EnumerateServers.cpp           |   48 +
 .../src/shared/EnumerateServers.h             |   73 +
 .../src/shared/RandomName.cpp                 |   82 +
 .../src/shared/RandomName.h                   |   94 +
 .../src/shared/TaskConnectionIdMessage.cpp    |   58 +
 .../src/shared/TaskConnectionIdMessage.h      |   78 +
 .../src/shared/TaskEnumCluster.cpp            |   37 +
 .../src/shared/TaskEnumCluster.h              |   40 +
 .../src/shared/TaskEnumProcesses.cpp          |   50 +
 .../src/shared/TaskEnumProcesses.h            |   68 +
 .../src/shared/TaskKillProcess.cpp            |   44 +
 .../src/shared/TaskKillProcess.h              |   59 +
 .../src/shared/TaskSpawnProcess.cpp           |   73 +
 .../src/shared/TaskSpawnProcess.h             |   61 +
 .../src/shared/TaskSpawnProcessAck.cpp        |   43 +
 .../src/shared/TaskSpawnProcessAck.h          |   32 +
 .../src/shared/TaskUtilization.cpp            |   51 +
 .../src/shared/TaskUtilization.h              |   58 +
 .../src/shared/VerifyAndLockName.cpp          |   94 +
 .../src/shared/VerifyAndLockName.h            |  123 ++
 .../CentralConnectionServerMessages.cpp       |  350 ++++
 .../CentralConnectionServerMessages.h         |  590 ++++++
 .../SetConnectionServerPublic.cpp             |   36 +
 .../SetConnectionServerPublic.h               |   39 +
 .../UpdateConnectionServerStatus.cpp          |   35 +
 .../UpdateConnectionServerStatus.h            |   54 +
 .../UpdatePlayerCountMessage.cpp              |   51 +
 .../UpdatePlayerCountMessage.h                |   93 +
 .../ValidateCharacterForLoginMessage.cpp      |   33 +
 .../ValidateCharacterForLoginMessage.h        |   58 +
 .../ValidateCharacterForLoginReplyMessage.cpp |   50 +
 .../ValidateCharacterForLoginReplyMessage.h   |  103 ++
 .../AccountFeatureIdRequest.cpp               |   57 +
 .../AccountFeatureIdRequest.h                 |   92 +
 .../AccountFeatureIdResponse.cpp              |   87 +
 .../AccountFeatureIdResponse.h                |  145 ++
 .../centralGameServer/AddCharacterMessage.cpp |   56 +
 .../centralGameServer/AddCharacterMessage.h   |   87 +
 .../AddObjectIdBlockMessage.cpp               |   49 +
 .../AddObjectIdBlockMessage.h                 |   72 +
 .../AdjustAccountFeatureIdRequest.cpp         |   73 +
 .../AdjustAccountFeatureIdRequest.h           |  126 ++
 .../AdjustAccountFeatureIdResponse.cpp        |   99 +
 .../AdjustAccountFeatureIdResponse.h          |  189 ++
 .../centralGameServer/CSDBNetMessages.cpp     |  237 +++
 .../centralGameServer/CSDBNetMessages.h       |  351 ++++
 .../CentralGameServerMessages.cpp             |  538 ++++++
 .../CentralGameServerMessages.h               |  787 ++++++++
 .../centralGameServer/CentralPingMessage.cpp  |   36 +
 .../centralGameServer/CentralPingMessage.h    |   40 +
 .../ChangeUniverseProcessMessage.cpp          |   49 +
 .../ChangeUniverseProcessMessage.h            |   47 +
 .../CharacterListMessage.cpp                  |  102 ++
 .../centralGameServer/CharacterListMessage.h  |   83 +
 .../CharacterTransferStatusMessage.cpp        |   57 +
 .../CharacterTransferStatusMessage.h          |   65 +
 .../ChunkCompleteMessage.cpp                  |   50 +
 .../centralGameServer/ChunkCompleteMessage.h  |   38 +
 .../ChunkObjectListMessage.cpp                |   64 +
 .../ChunkObjectListMessage.h                  |   71 +
 .../centralGameServer/ClaimRewardsMessage.cpp |  182 ++
 .../centralGameServer/ClaimRewardsMessage.h   |   72 +
 .../ClaimRewardsReplyMessage.cpp              |  158 ++
 .../ClaimRewardsReplyMessage.h                |   64 +
 .../CreateNewObjectMessage.cpp                |   62 +
 .../CreateNewObjectMessage.h                  |   66 +
 .../DownloadCharacterMessage.cpp              |   61 +
 .../DownloadCharacterMessage.h                |   74 +
 .../ExcommunicateGameServerMessage.cpp        |   46 +
 .../ExcommunicateGameServerMessage.h          |   68 +
 .../FailedToLoadObjectMessage.cpp             |   54 +
 .../FailedToLoadObjectMessage.h               |   51 +
 .../FeatureIdTransactionRequest.cpp           |   45 +
 .../FeatureIdTransactionRequest.h             |   63 +
 .../FeatureIdTransactionResponse.cpp          |   45 +
 .../FeatureIdTransactionResponse.h            |   63 +
 .../FeatureIdTransactionSyncUpdate.cpp        |   49 +
 .../FeatureIdTransactionSyncUpdate.h          |   72 +
 .../FlagObjectForDeleteMessage.cpp            |   66 +
 .../FlagObjectForDeleteMessage.h              |   83 +
 .../ForceUnloadObjectMessage.cpp              |   53 +
 .../ForceUnloadObjectMessage.h                |   55 +
 .../GameServerCSRequestMessage.cpp            |   59 +
 .../GameServerCSRequestMessage.h              |   89 +
 .../GameServerCSResponseMessage.cpp           |   47 +
 .../GameServerCSResponseMessage.h             |   63 +
 .../GameServerReadyMessage.cpp                |   47 +
 .../GameServerReadyMessage.h                  |   43 +
 .../GameServerUniverseLoadedMessage.cpp       |   44 +
 .../GameServerUniverseLoadedMessage.h         |   57 +
 .../centralGameServer/LoadObjectMessage.cpp   |   56 +
 .../centralGameServer/LoadObjectMessage.h     |   55 +
 .../centralGameServer/LoadUniverseMessage.cpp |   46 +
 .../centralGameServer/LoadUniverseMessage.h   |   47 +
 .../centralGameServer/MessageToAckMessage.cpp |   36 +
 .../centralGameServer/MessageToAckMessage.h   |   52 +
 .../centralGameServer/MessageToMessage.cpp    |   46 +
 .../centralGameServer/MessageToMessage.h      |   54 +
 .../centralGameServer/MessageToPayload.cpp    |  272 +++
 .../centralGameServer/MessageToPayload.h      |   90 +
 .../MessageToPayloadImpl.cpp                  |  290 +++
 .../centralGameServer/MessageToPayloadImpl.h  |  188 ++
 .../PlanetObjectIdMessage.cpp                 |   50 +
 .../centralGameServer/PlanetObjectIdMessage.h |   53 +
 .../PopulationListMessage.cpp                 |   36 +
 .../centralGameServer/PopulationListMessage.h |   43 +
 .../PreloadFinishedMessage.cpp                |   41 +
 .../PreloadFinishedMessage.h                  |   59 +
 .../PreloadRequestCompleteMessage.cpp         |   45 +
 .../PreloadRequestCompleteMessage.h           |   74 +
 .../ReleaseAuthoritativeMessage.cpp           |   55 +
 .../ReleaseAuthoritativeMessage.h             |   52 +
 .../centralGameServer/RequestChunkMessage.cpp |  100 +
 .../centralGameServer/RequestChunkMessage.h   |   69 +
 .../RequestObjectIdsMessage.cpp               |   46 +
 .../RequestObjectIdsMessage.h                 |   58 +
 .../RequestObjectMessage.cpp                  |   55 +
 .../centralGameServer/RequestObjectMessage.h  |   51 +
 .../RequestPlanetObjectIdMessage.cpp          |   46 +
 .../RequestPlanetObjectIdMessage.h            |   45 +
 .../RequestUnloadObjectMessage.cpp            |   54 +
 .../RequestUnloadObjectMessage.h              |   55 +
 .../SceneTransferMessages.cpp                 |  150 ++
 .../centralGameServer/SceneTransferMessages.h |  223 +++
 .../SetAuthoritativeMessage.cpp               |   66 +
 .../SetAuthoritativeMessage.h                 |  101 +
 .../SetObjectPositionMessage.cpp              |   62 +
 .../SetObjectPositionMessage.h                |   70 +
 .../SetPlanetServerMessage.cpp                |   45 +
 .../SetPlanetServerMessage.h                  |   52 +
 .../SetUniverseAuthoritativeMessage.cpp       |   46 +
 .../SetUniverseAuthoritativeMessage.h         |   54 +
 .../StructureListMessage.cpp                  |  110 ++
 .../centralGameServer/StructureListMessage.h  |   96 +
 .../ToggleAvatarLoginStatus.cpp               |   60 +
 .../ToggleAvatarLoginStatus.h                 |   74 +
 .../centralGameServer/UnloadObjectMessage.cpp |   49 +
 .../centralGameServer/UnloadObjectMessage.h   |   45 +
 .../UploadCharacterMessage.cpp                |   65 +
 .../UploadCharacterMessage.h                  |   82 +
 .../CentralPlanetServerConnect.cpp            |   37 +
 .../CentralPlanetServerConnect.h              |   70 +
 .../GameServerForLoginMessage.cpp             |   49 +
 .../GameServerForLoginMessage.h               |   70 +
 .../RequestGameServerForLoginMessage.cpp      |   60 +
 .../RequestGameServerForLoginMessage.h        |   98 +
 .../CentralTaskMessages.cpp                   |   69 +
 .../centralTaskManager/CentralTaskMessages.h  |   92 +
 .../TaskProcessDiedMessage.cpp                |   53 +
 .../TaskProcessDiedMessage.h                  |   55 +
 .../CMCreateAuctionBidMessage.cpp             |   38 +
 .../CMCreateAuctionBidMessage.h               |   37 +
 .../CMCreateAuctionMessage.cpp                |  105 ++
 .../CMCreateAuctionMessage.h                  |   76 +
 .../CMCreateLocationMessage.cpp               |   75 +
 .../CMCreateLocationMessage.h                 |   57 +
 .../CMDeleteAuctionMessage.cpp                |   23 +
 .../CMDeleteAuctionMessage.h                  |   28 +
 .../CMDeleteLocationMessage.cpp               |   23 +
 .../CMDeleteLocationMessage.h                 |   28 +
 .../CMUpdateAuctionMessage.cpp                |   33 +
 .../CMUpdateAuctionMessage.h                  |   34 +
 .../CMUpdateLocationMessage.cpp               |   75 +
 .../CMUpdateLocationMessage.h                 |   58 +
 .../CommoditiesLoadDoneMessage.cpp            |   38 +
 .../CommoditiesLoadDoneMessage.h              |   36 +
 .../GetAuctionLocationsMessage.cpp            |   53 +
 .../GetAuctionLocationsMessage.h              |   91 +
 .../GetMarketAuctionAttributesMessage.cpp     |   35 +
 .../GetMarketAuctionAttributesMessage.h       |   55 +
 .../GetMarketAuctionBidsMessage.cpp           |   37 +
 .../GetMarketAuctionBidsMessage.h             |   59 +
 .../GetMarketAuctionsMessage.cpp              |   65 +
 .../GetMarketAuctionsMessage.h                |  115 ++
 .../LoadCommoditiesMessage.cpp                |   23 +
 .../LoadCommoditiesMessage.h                  |   27 +
 .../shared/core/FirstServerNetworkMessages.h  |   13 +
 .../core/SetupServerNetworkMessages.cpp       | 1618 +++++++++++++++++
 .../shared/core/SetupServerNetworkMessages.h  |   38 +
 .../src/shared/core/TaskConsoleCommand.cpp    |   43 +
 .../src/shared/core/TaskConsoleCommand.h      |   34 +
 .../AcceptHighBidMessage.cpp                  |   41 +
 .../AcceptHighBidMessage.h                    |   32 +
 .../AddAuctionMessage.cpp                     |  123 ++
 .../gameCommoditiesServer/AddAuctionMessage.h |   91 +
 .../gameCommoditiesServer/AddBidMessage.cpp   |   53 +
 .../gameCommoditiesServer/AddBidMessage.h     |   45 +
 .../AddImmediateAuctionMessage.cpp            |  124 ++
 .../AddImmediateAuctionMessage.h              |   87 +
 .../gameCommoditiesServer/AuctionBase.h       |   76 +
 .../gameCommoditiesServer/AuctionData.cpp     |   54 +
 .../gameCommoditiesServer/AuctionData.h       |   45 +
 .../CancelAuctionMessage.cpp                  |   45 +
 .../CancelAuctionMessage.h                    |   32 +
 .../CleanupInvalidItemRetrievalMessage.cpp    |   30 +
 .../CleanupInvalidItemRetrievalMessage.h      |   29 +
 .../CreateVendorMarketMessage.cpp             |   48 +
 .../CreateVendorMarketMessage.h               |   41 +
 .../DeleteAuctionLocationMessage.cpp          |   38 +
 .../DeleteAuctionLocationMessage.h            |   37 +
 .../DestroyVendorMarketMessage.cpp            |   43 +
 .../DestroyVendorMarketMessage.h              |   40 +
 .../GetItemDetailsMessage.cpp                 |   41 +
 .../GetItemDetailsMessage.h                   |   33 +
 .../gameCommoditiesServer/GetItemMessage.cpp  |   42 +
 .../gameCommoditiesServer/GetItemMessage.h    |   39 +
 .../GetPlayerVendorCountMessage.cpp           |   33 +
 .../GetPlayerVendorCountMessage.h             |   30 +
 .../GetVendorOwnerMessage.cpp                 |   38 +
 .../GetVendorOwnerMessage.h                   |   36 +
 .../GetVendorValueMessage.cpp                 |   33 +
 .../GetVendorValueMessage.h                   |   31 +
 .../ItemMovedMessage.cpp                      |   33 +
 .../gameCommoditiesServer/ItemMovedMessage.h  |   32 +
 .../OnAcceptHighBidMessage.cpp                |   43 +
 .../OnAcceptHighBidMessage.h                  |   38 +
 .../OnAddAuctionMessage.cpp                   |   58 +
 .../OnAddAuctionMessage.h                     |   46 +
 .../gameCommoditiesServer/OnAddBidMessage.cpp |   93 +
 .../gameCommoditiesServer/OnAddBidMessage.h   |   70 +
 .../OnAuctionExpiredMessage.cpp               |   81 +
 .../OnAuctionExpiredMessage.h                 |   62 +
 .../OnCancelAuctionMessage.cpp                |   58 +
 .../OnCancelAuctionMessage.h                  |   48 +
 .../OnCleanupInvalidItemRetrievalMessage.cpp  |   48 +
 .../OnCleanupInvalidItemRetrievalMessage.h    |   41 +
 .../OnCreateVendorMarketMessage.cpp           |   42 +
 .../OnCreateVendorMarketMessage.h             |   34 +
 .../OnGetItemDetailsMessage.cpp               |   70 +
 .../OnGetItemDetailsMessage.h                 |   54 +
 .../OnGetItemMessage.cpp                      |   47 +
 .../gameCommoditiesServer/OnGetItemMessage.h  |   41 +
 .../OnGetPlayerVendorCountMessage.cpp         |   43 +
 .../OnGetPlayerVendorCountMessage.h           |   37 +
 .../OnGetVendorOwnerMessage.cpp               |   47 +
 .../OnGetVendorOwnerMessage.h                 |   42 +
 .../OnGetVendorValueMessage.cpp               |   33 +
 .../OnGetVendorValueMessage.h                 |   31 +
 .../OnItemExpiredMessage.cpp                  |   56 +
 .../OnItemExpiredMessage.h                    |   47 +
 .../OnPermanentAuctionPurchasedMessage.cpp    |   68 +
 .../OnPermanentAuctionPurchasedMessage.h      |   53 +
 .../OnQueryAuctionHeadersMessage.cpp          |   71 +
 .../OnQueryAuctionHeadersMessage.h            |  114 ++
 .../OnQueryVendorItemCountReplyMessage.cpp    |   38 +
 .../OnQueryVendorItemCountReplyMessage.h      |   35 +
 .../OnUpdateVendorSearchOptionMessage.cpp     |   28 +
 .../OnUpdateVendorSearchOptionMessage.h       |   30 +
 .../OnVendorRefuseItemMessage.cpp             |   48 +
 .../OnVendorRefuseItemMessage.h               |   42 +
 .../QueryAuctionHeadersMessage.cpp            |  124 ++
 .../QueryAuctionHeadersMessage.h              |   90 +
 .../QueryVendorItemCountMessage.cpp           |   33 +
 .../QueryVendorItemCountMessage.h             |   34 +
 .../SetEntranceChargeMessage.cpp              |   38 +
 .../SetEntranceChargeMessage.h                |   37 +
 .../SetGameTimeMessage.cpp                    |   32 +
 .../SetGameTimeMessage.h                      |   29 +
 .../SetSalesTaxMessage.cpp                    |   42 +
 .../SetSalesTaxMessage.h                      |   39 +
 .../UpdateVendorSearchOptionMessage.cpp       |   43 +
 .../UpdateVendorSearchOptionMessage.h         |   40 +
 .../UpdateVendorStatusMessage.cpp             |   33 +
 .../UpdateVendorStatusMessage.h               |   28 +
 .../VendorStatusChangeMessage.cpp             |   28 +
 .../VendorStatusChangeMessage.h               |   30 +
 .../GameConnectionServerMessages.cpp          |  269 +++
 .../GameConnectionServerMessages.h            |  327 ++++
 .../shared/gameConnectionServer/NewClient.cpp |  246 +++
 .../shared/gameConnectionServer/NewClient.h   |   77 +
 .../gameGameServer/AddResourceTypeMessage.cpp |   71 +
 .../gameGameServer/AddResourceTypeMessage.h   |   64 +
 .../gameGameServer/AiCreatureStateMessage.cpp |   66 +
 .../gameGameServer/AiCreatureStateMessage.h   |   45 +
 .../gameGameServer/AiMovementMessage.cpp      |   96 +
 .../shared/gameGameServer/AiMovementMessage.h |   72 +
 .../AuthTransferClientMessage.cpp             |  169 ++
 .../AuthTransferClientMessage.h               |  297 +++
 .../gameGameServer/BiographyMessage.cpp       |   42 +
 .../shared/gameGameServer/BiographyMessage.h  |   64 +
 .../BountyHunterTargetListMessage.cpp         |   34 +
 .../BountyHunterTargetListMessage.h           |   43 +
 .../BountyHunterTargetMessage.cpp             |   39 +
 .../BountyHunterTargetMessage.h               |   40 +
 .../gameGameServer/CharacterNamesMessage.cpp  |   63 +
 .../gameGameServer/CharacterNamesMessage.h    |   95 +
 .../CreateDynamicRegionCircleMessage.cpp      |   88 +
 .../CreateDynamicRegionCircleMessage.h        |  169 ++
 .../CreateDynamicRegionRectangleMessage.cpp   |   92 +
 .../CreateDynamicRegionRectangleMessage.h     |  178 ++
 .../CreateDynamicSpawnRegionCircleMessage.cpp |  100 +
 .../CreateDynamicSpawnRegionCircleMessage.h   |  195 ++
 .../gameGameServer/CreateGroupMessage.cpp     |   42 +
 .../gameGameServer/CreateGroupMessage.h       |   55 +
 .../gameGameServer/CreateObjectMessage.cpp    |   54 +
 .../gameGameServer/CreateObjectMessage.h      |   83 +
 .../gameGameServer/CreateSyncUiMessage.cpp    |   54 +
 .../gameGameServer/CreateSyncUiMessage.h      |   57 +
 .../EnableNewJediTrackingMessage.cpp          |   38 +
 .../EnableNewJediTrackingMessage.h            |   53 +
 .../gameGameServer/EndBaselinesMessage.cpp    |   40 +
 .../gameGameServer/EndBaselinesMessage.h      |   45 +
 .../ExchangeListCreditsMessage.cpp            |   46 +
 .../ExchangeListCreditsMessage.h              |   69 +
 .../gameGameServer/GameGameServerMessages.cpp |   57 +
 .../gameGameServer/GameGameServerMessages.h   |   62 +
 .../gameGameServer/GameServerConnectAck.cpp   |   33 +
 .../gameGameServer/GameServerConnectAck.h     |   37 +
 .../GameServerMessageInterface.cpp            |   75 +
 .../GameServerMessageInterface.h              |   60 +
 .../GetMoneyFromOfflineObjectMessage.cpp      |  110 ++
 .../GetMoneyFromOfflineObjectMessage.h        |   60 +
 .../gameGameServer/GroupMemberParam.cpp       |   52 +
 .../shared/gameGameServer/GroupMemberParam.h  |   38 +
 .../GroupMemberParamArchive.cpp               |   54 +
 .../gameGameServer/GroupMemberParamArchive.h  |   26 +
 .../LoadContainedObjectMessage.cpp            |   45 +
 .../LoadContainedObjectMessage.h              |   65 +
 .../gameGameServer/LoadContentsMessage.cpp    |   41 +
 .../gameGameServer/LoadContentsMessage.h      |   56 +
 .../gameGameServer/LoadStructureMessage.cpp   |   45 +
 .../gameGameServer/LoadStructureMessage.h     |   52 +
 .../LocateObjectResponseMessage.cpp           |  144 ++
 .../LocateObjectResponseMessage.h             |   57 +
 .../LocatePlayerResponseMessage.cpp           |  100 +
 .../LocatePlayerResponseMessage.h             |   49 +
 .../gameGameServer/LocateStructureMessage.cpp |   57 +
 .../gameGameServer/LocateStructureMessage.h   |   57 +
 .../MessageQueueAlterAttribute.cpp            |   72 +
 .../MessageQueueAlterAttribute.h              |   74 +
 .../MessageQueueCommandQueueEnqueueFwd.cpp    |  143 ++
 .../MessageQueueCommandQueueEnqueueFwd.h      |   59 +
 ...ueueCommandQueueForceExecuteCommandFwd.cpp |  117 ++
 ...eQueueCommandQueueForceExecuteCommandFwd.h |   51 +
 .../MessageQueueGrantOfflineXp.cpp            |   69 +
 .../MessageQueueGrantOfflineXp.h              |   63 +
 .../gameGameServer/MessageQueuePvpCommand.cpp |  114 ++
 .../gameGameServer/MessageQueuePvpCommand.h   |   52 +
 .../MessageQueueScriptTrigger.cpp             |   59 +
 .../MessageQueueScriptTrigger.h               |   55 +
 .../gameGameServer/MessageQueueSetState.cpp   |   78 +
 .../gameGameServer/MessageQueueSetState.h     |   46 +
 .../MessageQueueTeleportObject.cpp            |   74 +
 .../MessageQueueTeleportObject.h              |   86 +
 .../gameGameServer/PersistedPlayerMessage.cpp |   36 +
 .../gameGameServer/PersistedPlayerMessage.h   |   56 +
 .../gameGameServer/PlayedTimeAccumMessage.cpp |   36 +
 .../gameGameServer/PlayedTimeAccumMessage.h   |   56 +
 .../ProfilerOperationMessage.cpp              |   42 +
 .../gameGameServer/ProfilerOperationMessage.h |   54 +
 .../ReloadAdminTableMessage.cpp               |   34 +
 .../gameGameServer/ReloadAdminTableMessage.h  |   41 +
 .../ReloadCommandTableMessage.cpp             |   34 +
 .../ReloadCommandTableMessage.h               |   41 +
 .../gameGameServer/ReloadDatatableMessage.cpp |   40 +
 .../gameGameServer/ReloadDatatableMessage.h   |   57 +
 .../gameGameServer/ReloadScriptMessage.cpp    |   38 +
 .../gameGameServer/ReloadScriptMessage.h      |   53 +
 .../gameGameServer/ReloadTemplateMessage.cpp  |   38 +
 .../gameGameServer/ReloadTemplateMessage.h    |   53 +
 .../gameGameServer/RenameCharacterMessage.cpp |  114 ++
 .../gameGameServer/RenameCharacterMessage.h   |  159 ++
 .../RequestBiographyMessage.cpp               |   38 +
 .../gameGameServer/RequestBiographyMessage.h  |   50 +
 .../gameGameServer/RestartServerMessage.cpp   |   65 +
 .../gameGameServer/RestartServerMessage.h     |   42 +
 .../RetrievedItemLoadMessage.cpp              |   42 +
 .../gameGameServer/RetrievedItemLoadMessage.h |   60 +
 .../StructuresForPurgeMessage.cpp             |   78 +
 .../StructuresForPurgeMessage.h               |   51 +
 .../SynchronizeScriptVarDeltasMessage.cpp     |   36 +
 .../SynchronizeScriptVarDeltasMessage.h       |   54 +
 .../SynchronizeScriptVarsMessage.cpp          |   36 +
 .../SynchronizeScriptVarsMessage.h            |   54 +
 .../shared/gameGameServer/TeleportMessage.cpp |   54 +
 .../shared/gameGameServer/TeleportMessage.h   |   89 +
 .../gameGameServer/TeleportToMessage.cpp      |   46 +
 .../shared/gameGameServer/TeleportToMessage.h |   69 +
 .../gameGameServer/UnloadedPlayerMessage.cpp  |   36 +
 .../gameGameServer/UnloadedPlayerMessage.h    |   56 +
 .../UpdateObjectPositionMessage.cpp           |   62 +
 .../UpdateObjectPositionMessage.h             |  113 ++
 .../FactionalSystemMessage.cpp                |   55 +
 .../gamePlanetServer/FactionalSystemMessage.h |   79 +
 .../FirstPlanetGameServerIdMessage.cpp        |   39 +
 .../FirstPlanetGameServerIdMessage.h          |   51 +
 .../GameServerForceChangeAuthorityMessage.cpp |   61 +
 .../GameServerForceChangeAuthorityMessage.h   |   68 +
 .../gamePlanetServer/LocationRequest.cpp      |  136 ++
 .../shared/gamePlanetServer/LocationRequest.h |   59 +
 .../gamePlanetServer/LocationResponse.cpp     |  103 ++
 .../gamePlanetServer/LocationResponse.h       |   52 +
 .../PlanetLoadCharacterMessage.cpp            |   43 +
 .../PlanetLoadCharacterMessage.h              |   60 +
 .../gamePlanetServer/PlanetRemoveObject.cpp   |   39 +
 .../gamePlanetServer/PlanetRemoveObject.h     |   51 +
 .../gamePlanetServer/UnloadProxyMessage.cpp   |   43 +
 .../gamePlanetServer/UnloadProxyMessage.h     |   59 +
 .../UpdateObjectOnPlanetMessage.cpp           |   95 +
 .../UpdateObjectOnPlanetMessage.h             |  191 ++
 .../SPCharacterProfileMessage.cpp             |   99 +
 .../SPCharacterProfileMessage.h               |   71 +
 .../GameTaskManagerMessages.cpp               |  107 ++
 .../gameTaskManager/GameTaskManagerMessages.h |  114 ++
 .../loginCentralServer/CSToolRequest.cpp      |   51 +
 .../shared/loginCentralServer/CSToolRequest.h |   76 +
 .../loginCentralServer/CSToolResponse.cpp     |   46 +
 .../loginCentralServer/CSToolResponse.h       |   54 +
 .../ConnectionServerDown.cpp                  |   36 +
 .../loginCentralServer/ConnectionServerDown.h |   36 +
 .../loginCentralServer/LoginClusterName.cpp   |   40 +
 .../loginCentralServer/LoginClusterName.h     |   51 +
 .../loginCentralServer/LoginClusterName2.cpp  |   51 +
 .../loginCentralServer/LoginClusterName2.h    |   79 +
 .../LoginConnectionServerAddress.cpp          |   56 +
 .../LoginConnectionServerAddress.h            |   84 +
 .../LoginCreateCharacterAckMessage.cpp        |   41 +
 .../LoginCreateCharacterAckMessage.h          |   63 +
 .../LoginCreateCharacterMessage.cpp           |   53 +
 .../LoginCreateCharacterMessage.h             |   90 +
 .../loginCentralServer/LoginKeyPush.cpp       |   37 +
 .../shared/loginCentralServer/LoginKeyPush.h  |   39 +
 .../LoginRestoreCharacterMessage.cpp          |   57 +
 .../LoginRestoreCharacterMessage.h            |   98 +
 .../LoginUpgradeAccountMessage.cpp            |   65 +
 .../LoginUpgradeAccountMessage.h              |  120 ++
 .../ServerDeleteCharacterMessage.cpp          |   51 +
 .../ServerDeleteCharacterMessage.h            |   75 +
 .../UpdateLoginConnectionServerStatus.cpp     |   42 +
 .../UpdateLoginConnectionServerStatus.h       |   71 +
 .../ValidateAccountMessage.cpp                |   59 +
 .../ValidateAccountMessage.h                  |   62 +
 .../ValidateAccountReplyMessage.cpp           |  123 ++
 .../ValidateAccountReplyMessage.h             |   65 +
 .../metricsMessages/MetricsDataMessage.cpp    |   55 +
 .../metricsMessages/MetricsDataMessage.h      |   85 +
 .../MetricsInitiationMessage.cpp              |   47 +
 .../MetricsInitiationMessage.h                |   63 +
 .../transferServer/TransferAccountData.cpp    |  167 ++
 .../transferServer/TransferAccountData.h      |   63 +
 .../TransferAccountDataArchive.cpp            |   37 +
 .../TransferAccountDataArchive.h              |   31 +
 .../transferServer/TransferCharacterData.cpp  |  761 ++++++++
 .../transferServer/TransferCharacterData.h    |  151 ++
 .../TransferCharacterDataArchive.cpp          |   87 +
 .../TransferCharacterDataArchive.h            |   31 +
 .../TransferReplyCharacterList.cpp            |   64 +
 .../TransferReplyCharacterList.h              |   38 +
 .../TransferReplyMoveValidation.cpp           |  162 ++
 .../TransferReplyMoveValidation.h             |   59 +
 .../TransferRequestMoveValidation.cpp         |  152 ++
 .../TransferRequestMoveValidation.h           |   57 +
 .../src/win32/FirstServerNetworkMessages.cpp  |    3 +
 698 files changed, 35405 insertions(+), 2 deletions(-)
 create mode 100644 engine/server/library/serverNetworkMessages/CMakeLists.txt
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AcceptHighBidMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AccountFeatureIdRequest.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AccountFeatureIdResponse.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddBidMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddImmediateAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddObjectIdBlockMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddResourceTypeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AdjustAccountFeatureIdRequest.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AdjustAccountFeatureIdResponse.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AiCreatureStateMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AiMovementMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AuctionBase.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AuctionData.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AuthTransferClientMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AvatarList.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AvatarListArchive.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/BiographyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/BountyHunterTargetListMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/BountyHunterTargetMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMCreateAuctionBidMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMCreateAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMCreateLocationMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMDeleteAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMDeleteLocationMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMUpdateAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMUpdateLocationMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CSDBNetMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CSToolRequest.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CSToolResponse.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CancelAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralConnectionServerMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralGameServerMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralPingMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralPlanetServerConnect.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralTaskMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChangeUniverseProcessMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CharacterListMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CharacterNamesMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CharacterTransferStatusMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChatConnectAvatar.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChatDisconnectAvatar.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChatServerOnline.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChunkCompleteMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChunkObjectListMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ClaimRewardsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ClaimRewardsReplyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CleanupInvalidItemRetrievalMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CommoditiesLoadDoneMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ConnectionServerDown.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateDynamicRegionCircleMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateDynamicRegionRectangleMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateDynamicSpawnRegionCircleMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateGroupMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateNewObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateSyncUiMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateVendorMarketMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/DeleteAuctionLocationMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/DestroyVendorMarketMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/DownloadCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/EnableNewJediTrackingMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/EndBaselinesMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/EnumerateServers.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ExchangeListCreditsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ExcommunicateGameServerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FactionalSystemMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FailedToLoadObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FeatureIdTransactionRequest.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FeatureIdTransactionResponse.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FeatureIdTransactionSyncUpdate.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FirstPlanetGameServerIdMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FirstServerNetworkMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FlagObjectForDeleteMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ForceUnloadObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameConnectionServerMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameGameServerMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerCSRequestMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerCSResponseMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerConnectAck.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerForLoginMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerForceChangeAuthorityMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerMessageInterface.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerReadyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerUniverseLoadedMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameTaskManagerMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetAuctionLocationsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetItemDetailsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetItemMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMarketAuctionAttributesMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMarketAuctionBidsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMarketAuctionsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMoneyFromOfflineObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetPlayerVendorCountMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetVendorOwnerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetVendorValueMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GroupMemberParam.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GroupMemberParamArchive.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ItemMovedMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadCommoditiesMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadContainedObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadContentsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadStructureMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadUniverseMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocateObjectResponseMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocatePlayerResponseMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocateStructureMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocationRequest.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocationResponse.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginClusterName.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginClusterName2.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginConnectionServerAddress.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginCreateCharacterAckMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginCreateCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginKeyPush.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginRestoreCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginUpgradeAccountMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueAlterAttribute.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueCommandQueueEnqueueFwd.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueCommandQueueForceExecuteCommandFwd.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueGrantOfflineXp.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueuePvpCommand.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueScriptTrigger.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueSetState.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueTeleportObject.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageToAckMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageToMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageToPayload.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MetricsDataMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MetricsInitiationMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/NewClient.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAcceptHighBidMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAddAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAddBidMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAuctionExpiredMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnCancelAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnCleanupInvalidItemRetrievalMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnCreateVendorMarketMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetItemDetailsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetItemMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetPlayerVendorCountMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetVendorOwnerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetVendorValueMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnItemExpiredMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnPermanentAuctionPurchasedMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnQueryAuctionHeadersMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnQueryVendorItemCountReplyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnUpdateVendorSearchOptionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnVendorRefuseItemMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PersistedPlayerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlanetLoadCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlanetObjectIdMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlanetRemoveObject.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlayedTimeAccumMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PopulationListMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PreloadFinishedMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PreloadRequestCompleteMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ProfilerOperationMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/QueryAuctionHeadersMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/QueryVendorItemCountMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RandomName.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReleaseAuthoritativeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadAdminTableMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadCommandTableMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadDatatableMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadScriptMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadTemplateMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RenameCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestBiographyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestChunkMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestGameServerForLoginMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestObjectIdsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestPlanetObjectIdMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestUnloadObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RestartServerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RetrievedItemLoadMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SPCharacterProfileMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SceneTransferMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ServerDeleteCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetAuthoritativeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetConnectionServerPublic.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetEntranceChargeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetGameTimeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetObjectPositionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetPlanetServerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetSalesTaxMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetUniverseAuthoritativeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetupServerNetworkMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/StructureListMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/StructuresForPurgeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SynchronizeScriptVarDeltasMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SynchronizeScriptVarsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskConnectionIdMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskConsoleCommand.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskEnumCluster.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskEnumProcesses.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskKillProcess.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskProcessDiedMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskSpawnProcess.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskSpawnProcessAck.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskUtilization.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TeleportMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TeleportToMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ToggleAvatarLoginStatus.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferAccountData.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferAccountDataArchive.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferCharacterData.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferCharacterDataArchive.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferReplyCharacterList.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferReplyMoveValidation.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferRequestMoveValidation.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UnloadObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UnloadProxyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UnloadedPlayerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateConnectionServerStatus.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateLoginConnectionServerStatus.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateObjectOnPlanetMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateObjectPositionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdatePlayerCountMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateVendorSearchOptionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateVendorStatusMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UploadCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateAccountMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateAccountReplyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateCharacterForLoginMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateCharacterForLoginReplyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/VendorStatusChangeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/VerifyAndLockName.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/CMakeLists.txt
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/AvatarList.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/AvatarList.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/AvatarListArchive.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/AvatarListArchive.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/ChatConnectAvatar.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/ChatConnectAvatar.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/ChatDisconnectAvatar.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/ChatDisconnectAvatar.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/ChatServerOnline.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/ChatServerOnline.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/EnumerateServers.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/EnumerateServers.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/RandomName.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/RandomName.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskEnumCluster.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskEnumCluster.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskEnumProcesses.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskEnumProcesses.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskKillProcess.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskKillProcess.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcess.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcess.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcessAck.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcessAck.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskUtilization.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/TaskUtilization.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/VerifyAndLockName.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/VerifyAndLockName.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/CentralConnectionServerMessages.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/CentralConnectionServerMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/SetConnectionServerPublic.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/SetConnectionServerPublic.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdateConnectionServerStatus.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdateConnectionServerStatus.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdatePlayerCountMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdatePlayerCountMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginReplyMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginReplyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdRequest.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdRequest.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddCharacterMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddObjectIdBlockMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddObjectIdBlockMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdRequest.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdRequest.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CSDBNetMessages.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CSDBNetMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralGameServerMessages.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralGameServerMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralPingMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralPingMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChangeUniverseProcessMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChangeUniverseProcessMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterListMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterListMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterTransferStatusMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterTransferStatusMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkCompleteMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkCompleteMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkObjectListMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkObjectListMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsReplyMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsReplyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CreateNewObjectMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CreateNewObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/DownloadCharacterMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/DownloadCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ExcommunicateGameServerMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ExcommunicateGameServerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FailedToLoadObjectMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FailedToLoadObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionRequest.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionRequest.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionResponse.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionResponse.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionSyncUpdate.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionSyncUpdate.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FlagObjectForDeleteMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FlagObjectForDeleteMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ForceUnloadObjectMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ForceUnloadObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSRequestMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSRequestMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSResponseMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSResponseMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerReadyMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerReadyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerUniverseLoadedMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerUniverseLoadedMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadObjectMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadUniverseMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadUniverseMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToAckMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToAckMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PlanetObjectIdMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PlanetObjectIdMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PopulationListMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PopulationListMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadFinishedMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadFinishedMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadRequestCompleteMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadRequestCompleteMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ReleaseAuthoritativeMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ReleaseAuthoritativeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestChunkMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestChunkMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectIdsMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectIdsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestPlanetObjectIdMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestPlanetObjectIdMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestUnloadObjectMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestUnloadObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetAuthoritativeMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetAuthoritativeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetObjectPositionMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetObjectPositionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetPlanetServerMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetPlanetServerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetUniverseAuthoritativeMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetUniverseAuthoritativeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/StructureListMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/StructureListMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ToggleAvatarLoginStatus.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ToggleAvatarLoginStatus.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UnloadObjectMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UnloadObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UploadCharacterMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UploadCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/CentralPlanetServerConnect.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/CentralPlanetServerConnect.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/GameServerForLoginMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/GameServerForLoginMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/RequestGameServerForLoginMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/RequestGameServerForLoginMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/CentralTaskMessages.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/CentralTaskMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/TaskProcessDiedMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/TaskProcessDiedMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionBidMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionBidMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateLocationMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateLocationMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteAuctionMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteLocationMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteLocationMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateAuctionMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateLocationMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateLocationMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CommoditiesLoadDoneMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CommoditiesLoadDoneMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetAuctionLocationsMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetAuctionLocationsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionAttributesMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionAttributesMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionBidsMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionBidsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionsMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/LoadCommoditiesMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/LoadCommoditiesMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/core/FirstServerNetworkMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/core/SetupServerNetworkMessages.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/core/SetupServerNetworkMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/core/TaskConsoleCommand.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/core/TaskConsoleCommand.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AcceptHighBidMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AcceptHighBidMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddAuctionMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddBidMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddBidMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddImmediateAuctionMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddImmediateAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionBase.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionData.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionData.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CancelAuctionMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CancelAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CleanupInvalidItemRetrievalMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CleanupInvalidItemRetrievalMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CreateVendorMarketMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CreateVendorMarketMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DeleteAuctionLocationMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DeleteAuctionLocationMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DestroyVendorMarketMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DestroyVendorMarketMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemDetailsMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemDetailsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetPlayerVendorCountMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetPlayerVendorCountMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorOwnerMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorOwnerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorValueMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorValueMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/ItemMovedMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/ItemMovedMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAcceptHighBidMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAcceptHighBidMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddAuctionMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddBidMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddBidMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAuctionExpiredMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAuctionExpiredMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCancelAuctionMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCancelAuctionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCleanupInvalidItemRetrievalMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCleanupInvalidItemRetrievalMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCreateVendorMarketMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCreateVendorMarketMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemDetailsMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemDetailsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetPlayerVendorCountMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetPlayerVendorCountMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorOwnerMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorOwnerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorValueMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorValueMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnItemExpiredMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnItemExpiredMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnPermanentAuctionPurchasedMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnPermanentAuctionPurchasedMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryAuctionHeadersMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryAuctionHeadersMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryVendorItemCountReplyMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryVendorItemCountReplyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnUpdateVendorSearchOptionMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnUpdateVendorSearchOptionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnVendorRefuseItemMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnVendorRefuseItemMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryAuctionHeadersMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryAuctionHeadersMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryVendorItemCountMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryVendorItemCountMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetEntranceChargeMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetEntranceChargeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetGameTimeMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetGameTimeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetSalesTaxMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetSalesTaxMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorSearchOptionMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorSearchOptionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorStatusMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorStatusMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/VendorStatusChangeMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/VendorStatusChangeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/NewClient.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/NewClient.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AuthTransferClientMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AuthTransferClientMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BiographyMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BiographyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetListMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetListMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionCircleMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionCircleMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionRectangleMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionRectangleMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicSpawnRegionCircleMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicSpawnRegionCircleMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateObjectMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EnableNewJediTrackingMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EnableNewJediTrackingMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EndBaselinesMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EndBaselinesMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ExchangeListCreditsMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ExchangeListCreditsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameGameServerMessages.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameGameServerMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerConnectAck.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerConnectAck.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerMessageInterface.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerMessageInterface.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParam.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParam.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParamArchive.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParamArchive.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContainedObjectMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContainedObjectMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContentsMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContentsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadStructureMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadStructureMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateObjectResponseMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateObjectResponseMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocatePlayerResponseMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocatePlayerResponseMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateStructureMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateStructureMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueAlterAttribute.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueAlterAttribute.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueEnqueueFwd.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueEnqueueFwd.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueForceExecuteCommandFwd.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueForceExecuteCommandFwd.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueGrantOfflineXp.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueGrantOfflineXp.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueScriptTrigger.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueScriptTrigger.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueSetState.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueSetState.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueTeleportObject.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueTeleportObject.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PersistedPlayerMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PersistedPlayerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PlayedTimeAccumMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PlayedTimeAccumMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ProfilerOperationMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ProfilerOperationMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadAdminTableMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadAdminTableMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadCommandTableMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadCommandTableMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadDatatableMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadDatatableMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadScriptMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadScriptMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadTemplateMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadTemplateMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RenameCharacterMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RenameCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RequestBiographyMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RequestBiographyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RestartServerMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RestartServerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RetrievedItemLoadMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RetrievedItemLoadMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/StructuresForPurgeMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/StructuresForPurgeMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarDeltasMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarDeltasMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarsMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarsMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportToMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportToMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UnloadedPlayerMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UnloadedPlayerMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UpdateObjectPositionMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UpdateObjectPositionMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FactionalSystemMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FactionalSystemMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FirstPlanetGameServerIdMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FirstPlanetGameServerIdMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/GameServerForceChangeAuthorityMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/GameServerForceChangeAuthorityMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationRequest.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationRequest.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationResponse.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationResponse.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetLoadCharacterMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetLoadCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetRemoveObject.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetRemoveObject.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UnloadProxyMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UnloadProxyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UpdateObjectOnPlanetMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UpdateObjectOnPlanetMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameStationPlayersCollector/SPCharacterProfileMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameStationPlayersCollector/SPCharacterProfileMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameTaskManager/GameTaskManagerMessages.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/gameTaskManager/GameTaskManagerMessages.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolRequest.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolRequest.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolResponse.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolResponse.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ConnectionServerDown.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ConnectionServerDown.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName2.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName2.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginConnectionServerAddress.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginConnectionServerAddress.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterAckMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterAckMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginKeyPush.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginKeyPush.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginRestoreCharacterMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginRestoreCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginUpgradeAccountMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginUpgradeAccountMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ServerDeleteCharacterMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ServerDeleteCharacterMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/UpdateLoginConnectionServerStatus.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/UpdateLoginConnectionServerStatus.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountReplyMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountReplyMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsDataMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsDataMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsInitiationMessage.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsInitiationMessage.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountData.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountData.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountDataArchive.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountDataArchive.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterData.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterData.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterDataArchive.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterDataArchive.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyCharacterList.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyCharacterList.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyMoveValidation.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyMoveValidation.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferRequestMoveValidation.cpp
 create mode 100644 engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferRequestMoveValidation.h
 create mode 100644 engine/server/library/serverNetworkMessages/src/win32/FirstServerNetworkMessages.cpp

diff --git a/engine/server/library/CMakeLists.txt b/engine/server/library/CMakeLists.txt
index 6609f072..31e09722 100644
--- a/engine/server/library/CMakeLists.txt
+++ b/engine/server/library/CMakeLists.txt
@@ -1,4 +1,5 @@
 
 add_subdirectory(serverKeyShare)
 add_subdirectory(serverMetrics)
+add_subdirectory(serverNetworkMessages)
 add_subdirectory(serverUtility)
diff --git a/engine/server/library/serverMetrics/src/CMakeLists.txt b/engine/server/library/serverMetrics/src/CMakeLists.txt
index c6578d7d..84f5929b 100644
--- a/engine/server/library/serverMetrics/src/CMakeLists.txt
+++ b/engine/server/library/serverMetrics/src/CMakeLists.txt
@@ -25,11 +25,12 @@ include_directories(
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/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/sharedNetwork/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedNetworkMessages/include/public
 	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedUtility/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/serverNetworkMessages/include/public
-	${SWG_ENGINE_SOURCE_DIR}/shared/library/serverUtility/include/public
+	${SWG_ENGINE_SOURCE_DIR}/server/library/serverNetworkMessages/include/public
+	${SWG_ENGINE_SOURCE_DIR}/server/library/serverUtility/include/public
 	${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include
 	${SWG_EXTERNALS_SOURCE_DIR}/ours/library/singleton/include
 )
diff --git a/engine/server/library/serverNetworkMessages/CMakeLists.txt b/engine/server/library/serverNetworkMessages/CMakeLists.txt
new file mode 100644
index 00000000..abb2914b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(serverNetworkMessages)
+
+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/serverNetworkMessages/include/public/serverNetworkMessages/AcceptHighBidMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AcceptHighBidMessage.h
new file mode 100644
index 00000000..0719969c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AcceptHighBidMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/AcceptHighBidMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AccountFeatureIdRequest.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AccountFeatureIdRequest.h
new file mode 100644
index 00000000..74d75d21
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AccountFeatureIdRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/AccountFeatureIdRequest.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AccountFeatureIdResponse.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AccountFeatureIdResponse.h
new file mode 100644
index 00000000..22786bab
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AccountFeatureIdResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/AccountFeatureIdResponse.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddAuctionMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddAuctionMessage.h
new file mode 100644
index 00000000..7e458dd0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/AddAuctionMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddBidMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddBidMessage.h
new file mode 100644
index 00000000..ecf796cd
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddBidMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/AddBidMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddCharacterMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddCharacterMessage.h
new file mode 100644
index 00000000..d13a76f4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddCharacterMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/AddCharacterMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddImmediateAuctionMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddImmediateAuctionMessage.h
new file mode 100644
index 00000000..2ee0ba32
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddImmediateAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/AddImmediateAuctionMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddObjectIdBlockMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddObjectIdBlockMessage.h
new file mode 100644
index 00000000..aca98087
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddObjectIdBlockMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/AddObjectIdBlockMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddResourceTypeMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddResourceTypeMessage.h
new file mode 100644
index 00000000..7ce1cd30
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AddResourceTypeMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/AddResourceTypeMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AdjustAccountFeatureIdRequest.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AdjustAccountFeatureIdRequest.h
new file mode 100644
index 00000000..b3954c32
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AdjustAccountFeatureIdRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/AdjustAccountFeatureIdRequest.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AdjustAccountFeatureIdResponse.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AdjustAccountFeatureIdResponse.h
new file mode 100644
index 00000000..65958375
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AdjustAccountFeatureIdResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/AdjustAccountFeatureIdResponse.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AiCreatureStateMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AiCreatureStateMessage.h
new file mode 100644
index 00000000..046eeab6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AiCreatureStateMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/AiCreatureStateMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AiMovementMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AiMovementMessage.h
new file mode 100644
index 00000000..1e3f17a8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AiMovementMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/AiMovementMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AuctionBase.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AuctionBase.h
new file mode 100644
index 00000000..83c5b6a2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AuctionBase.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/AuctionBase.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AuctionData.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AuctionData.h
new file mode 100644
index 00000000..0a8e043f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AuctionData.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/AuctionData.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AuthTransferClientMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AuthTransferClientMessage.h
new file mode 100644
index 00000000..53cd993b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AuthTransferClientMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/AuthTransferClientMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AvatarList.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AvatarList.h
new file mode 100644
index 00000000..3e02b88a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AvatarList.h
@@ -0,0 +1 @@
+#include "../../src/shared/AvatarList.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AvatarListArchive.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AvatarListArchive.h
new file mode 100644
index 00000000..c9f8df5a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/AvatarListArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/AvatarListArchive.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/BiographyMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/BiographyMessage.h
new file mode 100644
index 00000000..55e0d54b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/BiographyMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/BiographyMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/BountyHunterTargetListMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/BountyHunterTargetListMessage.h
new file mode 100644
index 00000000..95b57c0c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/BountyHunterTargetListMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/BountyHunterTargetListMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/BountyHunterTargetMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/BountyHunterTargetMessage.h
new file mode 100644
index 00000000..7f779960
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/BountyHunterTargetMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/BountyHunterTargetMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMCreateAuctionBidMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMCreateAuctionBidMessage.h
new file mode 100644
index 00000000..c49d2b7a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMCreateAuctionBidMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/CMCreateAuctionBidMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMCreateAuctionMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMCreateAuctionMessage.h
new file mode 100644
index 00000000..8c45953a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMCreateAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/CMCreateAuctionMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMCreateLocationMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMCreateLocationMessage.h
new file mode 100644
index 00000000..b8ab3119
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMCreateLocationMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/CMCreateLocationMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMDeleteAuctionMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMDeleteAuctionMessage.h
new file mode 100644
index 00000000..9dc5ddd9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMDeleteAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/CMDeleteAuctionMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMDeleteLocationMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMDeleteLocationMessage.h
new file mode 100644
index 00000000..faff13eb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMDeleteLocationMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/CMDeleteLocationMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMUpdateAuctionMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMUpdateAuctionMessage.h
new file mode 100644
index 00000000..ca307115
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMUpdateAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/CMUpdateAuctionMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMUpdateLocationMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMUpdateLocationMessage.h
new file mode 100644
index 00000000..39b57e97
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CMUpdateLocationMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/CMUpdateLocationMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CSDBNetMessages.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CSDBNetMessages.h
new file mode 100644
index 00000000..4428429f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CSDBNetMessages.h
@@ -0,0 +1 @@
+#include "../../../src/shared/centralGameServer/CSDBNetMessages.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CSToolRequest.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CSToolRequest.h
new file mode 100644
index 00000000..e5787edc
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CSToolRequest.h
@@ -0,0 +1 @@
+#include "../../../src/shared/loginCentralServer/CSToolRequest.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CSToolResponse.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CSToolResponse.h
new file mode 100644
index 00000000..63b5f0d1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CSToolResponse.h
@@ -0,0 +1 @@
+#include "../../../src/shared/loginCentralServer/CSToolResponse.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CancelAuctionMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CancelAuctionMessage.h
new file mode 100644
index 00000000..b732f545
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CancelAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/CancelAuctionMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralConnectionServerMessages.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralConnectionServerMessages.h
new file mode 100644
index 00000000..37c4da9e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralConnectionServerMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralConnectionServer/CentralConnectionServerMessages.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralGameServerMessages.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralGameServerMessages.h
new file mode 100644
index 00000000..aff2cec5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralGameServerMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/CentralGameServerMessages.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralPingMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralPingMessage.h
new file mode 100644
index 00000000..59d8b68e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralPingMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/CentralPingMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralPlanetServerConnect.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralPlanetServerConnect.h
new file mode 100644
index 00000000..ddb4bba3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralPlanetServerConnect.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralPlanetServer/CentralPlanetServerConnect.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralTaskMessages.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralTaskMessages.h
new file mode 100644
index 00000000..0f645fec
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CentralTaskMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralTaskManager/CentralTaskMessages.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChangeUniverseProcessMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChangeUniverseProcessMessage.h
new file mode 100644
index 00000000..5f15d3d6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChangeUniverseProcessMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/ChangeUniverseProcessMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CharacterListMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CharacterListMessage.h
new file mode 100644
index 00000000..6dcf4ae8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CharacterListMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/CharacterListMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CharacterNamesMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CharacterNamesMessage.h
new file mode 100644
index 00000000..c861aa89
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CharacterNamesMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/CharacterNamesMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CharacterTransferStatusMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CharacterTransferStatusMessage.h
new file mode 100644
index 00000000..34dd8e00
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CharacterTransferStatusMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/CharacterTransferStatusMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChatConnectAvatar.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChatConnectAvatar.h
new file mode 100644
index 00000000..fe29dc35
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChatConnectAvatar.h
@@ -0,0 +1 @@
+#include "../../src/shared/ChatConnectAvatar.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChatDisconnectAvatar.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChatDisconnectAvatar.h
new file mode 100644
index 00000000..3d036a9f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChatDisconnectAvatar.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/ChatDisconnectAvatar.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChatServerOnline.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChatServerOnline.h
new file mode 100644
index 00000000..8926de9e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChatServerOnline.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/ChatServerOnline.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChunkCompleteMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChunkCompleteMessage.h
new file mode 100644
index 00000000..70f43432
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChunkCompleteMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/ChunkCompleteMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChunkObjectListMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChunkObjectListMessage.h
new file mode 100644
index 00000000..c334d158
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ChunkObjectListMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/ChunkObjectListMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ClaimRewardsMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ClaimRewardsMessage.h
new file mode 100644
index 00000000..e5148091
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ClaimRewardsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/ClaimRewardsMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ClaimRewardsReplyMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ClaimRewardsReplyMessage.h
new file mode 100644
index 00000000..c79c216a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ClaimRewardsReplyMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/ClaimRewardsReplyMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CleanupInvalidItemRetrievalMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CleanupInvalidItemRetrievalMessage.h
new file mode 100644
index 00000000..a32dcf2f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CleanupInvalidItemRetrievalMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/CleanupInvalidItemRetrievalMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CommoditiesLoadDoneMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CommoditiesLoadDoneMessage.h
new file mode 100644
index 00000000..6e3c4c0b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CommoditiesLoadDoneMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/CommoditiesLoadDoneMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ConnectionServerDown.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ConnectionServerDown.h
new file mode 100644
index 00000000..e2a3ec3e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ConnectionServerDown.h
@@ -0,0 +1 @@
+#include "../../src/shared/loginCentralServer/ConnectionServerDown.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateDynamicRegionCircleMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateDynamicRegionCircleMessage.h
new file mode 100644
index 00000000..645afe61
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateDynamicRegionCircleMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/CreateDynamicRegionCircleMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateDynamicRegionRectangleMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateDynamicRegionRectangleMessage.h
new file mode 100644
index 00000000..1df1fb41
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateDynamicRegionRectangleMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/CreateDynamicRegionRectangleMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateDynamicSpawnRegionCircleMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateDynamicSpawnRegionCircleMessage.h
new file mode 100644
index 00000000..48a5edc2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateDynamicSpawnRegionCircleMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/CreateDynamicSpawnRegionCircleMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateGroupMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateGroupMessage.h
new file mode 100644
index 00000000..0c67c874
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateGroupMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/CreateGroupMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateNewObjectMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateNewObjectMessage.h
new file mode 100644
index 00000000..989009f2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateNewObjectMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/CreateNewObjectMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateObjectMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateObjectMessage.h
new file mode 100644
index 00000000..4663cfba
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateObjectMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/CreateObjectMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateSyncUiMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateSyncUiMessage.h
new file mode 100644
index 00000000..a336c5a4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateSyncUiMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/CreateSyncUiMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateVendorMarketMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateVendorMarketMessage.h
new file mode 100644
index 00000000..3549fcf0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/CreateVendorMarketMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/CreateVendorMarketMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/DeleteAuctionLocationMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/DeleteAuctionLocationMessage.h
new file mode 100644
index 00000000..d5fc6225
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/DeleteAuctionLocationMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/DeleteAuctionLocationMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/DestroyVendorMarketMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/DestroyVendorMarketMessage.h
new file mode 100644
index 00000000..ce3348bf
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/DestroyVendorMarketMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/DestroyVendorMarketMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/DownloadCharacterMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/DownloadCharacterMessage.h
new file mode 100644
index 00000000..a910ed3b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/DownloadCharacterMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/DownloadCharacterMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/EnableNewJediTrackingMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/EnableNewJediTrackingMessage.h
new file mode 100644
index 00000000..b49ba2f6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/EnableNewJediTrackingMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/EnableNewJediTrackingMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/EndBaselinesMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/EndBaselinesMessage.h
new file mode 100644
index 00000000..df7628dc
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/EndBaselinesMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/EndBaselinesMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/EnumerateServers.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/EnumerateServers.h
new file mode 100644
index 00000000..d3d90df5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/EnumerateServers.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/EnumerateServers.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ExchangeListCreditsMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ExchangeListCreditsMessage.h
new file mode 100644
index 00000000..518e801e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ExchangeListCreditsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/ExchangeListCreditsMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ExcommunicateGameServerMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ExcommunicateGameServerMessage.h
new file mode 100644
index 00000000..bef5982a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ExcommunicateGameServerMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/ExcommunicateGameServerMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FactionalSystemMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FactionalSystemMessage.h
new file mode 100644
index 00000000..a5aedc31
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FactionalSystemMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gamePlanetServer/FactionalSystemMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FailedToLoadObjectMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FailedToLoadObjectMessage.h
new file mode 100644
index 00000000..87210ac5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FailedToLoadObjectMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/FailedToLoadObjectMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FeatureIdTransactionRequest.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FeatureIdTransactionRequest.h
new file mode 100644
index 00000000..2fe98b33
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FeatureIdTransactionRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/FeatureIdTransactionRequest.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FeatureIdTransactionResponse.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FeatureIdTransactionResponse.h
new file mode 100644
index 00000000..ce1942d4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FeatureIdTransactionResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/FeatureIdTransactionResponse.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FeatureIdTransactionSyncUpdate.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FeatureIdTransactionSyncUpdate.h
new file mode 100644
index 00000000..41a22e7d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FeatureIdTransactionSyncUpdate.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/FeatureIdTransactionSyncUpdate.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FirstPlanetGameServerIdMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FirstPlanetGameServerIdMessage.h
new file mode 100644
index 00000000..0567428e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FirstPlanetGameServerIdMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gamePlanetServer/FirstPlanetGameServerIdMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FirstServerNetworkMessages.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FirstServerNetworkMessages.h
new file mode 100644
index 00000000..d16a4238
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FirstServerNetworkMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/FirstServerNetworkMessages.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FlagObjectForDeleteMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FlagObjectForDeleteMessage.h
new file mode 100644
index 00000000..95882447
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/FlagObjectForDeleteMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/FlagObjectForDeleteMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ForceUnloadObjectMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ForceUnloadObjectMessage.h
new file mode 100644
index 00000000..84bdc846
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ForceUnloadObjectMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/ForceUnloadObjectMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameConnectionServerMessages.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameConnectionServerMessages.h
new file mode 100644
index 00000000..8210fa89
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameConnectionServerMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameConnectionServer/GameConnectionServerMessages.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameGameServerMessages.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameGameServerMessages.h
new file mode 100644
index 00000000..03aa339f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameGameServerMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/GameGameServerMessages.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerCSRequestMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerCSRequestMessage.h
new file mode 100644
index 00000000..be49e25e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerCSRequestMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/GameServerCSRequestMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerCSResponseMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerCSResponseMessage.h
new file mode 100644
index 00000000..82168c02
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerCSResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/GameServerCSResponseMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerConnectAck.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerConnectAck.h
new file mode 100644
index 00000000..72a67597
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerConnectAck.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/GameServerConnectAck.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerForLoginMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerForLoginMessage.h
new file mode 100644
index 00000000..bebd0e9a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerForLoginMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralPlanetServer/GameServerForLoginMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerForceChangeAuthorityMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerForceChangeAuthorityMessage.h
new file mode 100644
index 00000000..722ab332
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerForceChangeAuthorityMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gamePlanetServer/GameServerForceChangeAuthorityMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerMessageInterface.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerMessageInterface.h
new file mode 100644
index 00000000..effb1df4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerMessageInterface.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/GameServerMessageInterface.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerReadyMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerReadyMessage.h
new file mode 100644
index 00000000..cc2d329f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerReadyMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/GameServerReadyMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerUniverseLoadedMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerUniverseLoadedMessage.h
new file mode 100644
index 00000000..864d6e0b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameServerUniverseLoadedMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/GameServerUniverseLoadedMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameTaskManagerMessages.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameTaskManagerMessages.h
new file mode 100644
index 00000000..867f9289
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GameTaskManagerMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameTaskManager/GameTaskManagerMessages.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetAuctionLocationsMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetAuctionLocationsMessage.h
new file mode 100644
index 00000000..8d0d4439
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetAuctionLocationsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/GetAuctionLocationsMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetItemDetailsMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetItemDetailsMessage.h
new file mode 100644
index 00000000..3e0471c3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetItemDetailsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/GetItemDetailsMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetItemMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetItemMessage.h
new file mode 100644
index 00000000..6c86f214
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetItemMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/GetItemMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMarketAuctionAttributesMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMarketAuctionAttributesMessage.h
new file mode 100644
index 00000000..0057c837
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMarketAuctionAttributesMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/GetMarketAuctionAttributesMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMarketAuctionBidsMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMarketAuctionBidsMessage.h
new file mode 100644
index 00000000..78dac5bd
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMarketAuctionBidsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/GetMarketAuctionBidsMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMarketAuctionsMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMarketAuctionsMessage.h
new file mode 100644
index 00000000..666847d7
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMarketAuctionsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/GetMarketAuctionsMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMoneyFromOfflineObjectMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMoneyFromOfflineObjectMessage.h
new file mode 100644
index 00000000..1e93e897
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetMoneyFromOfflineObjectMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetPlayerVendorCountMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetPlayerVendorCountMessage.h
new file mode 100644
index 00000000..cbcf4e26
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetPlayerVendorCountMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameCommoditiesServer/GetPlayerVendorCountMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetVendorOwnerMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetVendorOwnerMessage.h
new file mode 100644
index 00000000..0cb38bfe
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetVendorOwnerMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/GetVendorOwnerMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetVendorValueMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetVendorValueMessage.h
new file mode 100644
index 00000000..05e45033
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GetVendorValueMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/GetVendorValueMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GroupMemberParam.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GroupMemberParam.h
new file mode 100644
index 00000000..ac6bf902
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GroupMemberParam.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/GroupMemberParam.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GroupMemberParamArchive.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GroupMemberParamArchive.h
new file mode 100644
index 00000000..02f4a2c3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/GroupMemberParamArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/GroupMemberParamArchive.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ItemMovedMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ItemMovedMessage.h
new file mode 100644
index 00000000..27f083c0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ItemMovedMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/ItemMovedMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadCommoditiesMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadCommoditiesMessage.h
new file mode 100644
index 00000000..f4b0594e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadCommoditiesMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/commoditiesSwgDatabase/LoadCommoditiesMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadContainedObjectMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadContainedObjectMessage.h
new file mode 100644
index 00000000..c994960d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadContainedObjectMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/LoadContainedObjectMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadContentsMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadContentsMessage.h
new file mode 100644
index 00000000..d064adf8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadContentsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/LoadContentsMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadObjectMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadObjectMessage.h
new file mode 100644
index 00000000..ad11b33d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadObjectMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/LoadObjectMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadStructureMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadStructureMessage.h
new file mode 100644
index 00000000..2eedf06c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadStructureMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/LoadStructureMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadUniverseMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadUniverseMessage.h
new file mode 100644
index 00000000..a6c17a34
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoadUniverseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/LoadUniverseMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocateObjectResponseMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocateObjectResponseMessage.h
new file mode 100644
index 00000000..ec08e933
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocateObjectResponseMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/LocateObjectResponseMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocatePlayerResponseMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocatePlayerResponseMessage.h
new file mode 100644
index 00000000..3a2d4bfc
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocatePlayerResponseMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/LocatePlayerResponseMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocateStructureMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocateStructureMessage.h
new file mode 100644
index 00000000..915a1042
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocateStructureMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/LocateStructureMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocationRequest.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocationRequest.h
new file mode 100644
index 00000000..e6574166
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocationRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/gamePlanetServer/LocationRequest.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocationResponse.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocationResponse.h
new file mode 100644
index 00000000..9596eae9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LocationResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/gamePlanetServer/LocationResponse.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginClusterName.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginClusterName.h
new file mode 100644
index 00000000..8a6d1584
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginClusterName.h
@@ -0,0 +1 @@
+#include "../../src/shared/loginCentralServer/LoginClusterName.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginClusterName2.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginClusterName2.h
new file mode 100644
index 00000000..fa03427a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginClusterName2.h
@@ -0,0 +1 @@
+#include "../../src/shared/loginCentralServer/LoginClusterName2.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginConnectionServerAddress.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginConnectionServerAddress.h
new file mode 100644
index 00000000..d38ba8f2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginConnectionServerAddress.h
@@ -0,0 +1 @@
+#include "../../src/shared/loginCentralServer/LoginConnectionServerAddress.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginCreateCharacterAckMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginCreateCharacterAckMessage.h
new file mode 100644
index 00000000..d27763f5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginCreateCharacterAckMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/loginCentralServer/LoginCreateCharacterAckMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginCreateCharacterMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginCreateCharacterMessage.h
new file mode 100644
index 00000000..23961534
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginCreateCharacterMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/loginCentralServer/LoginCreateCharacterMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginKeyPush.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginKeyPush.h
new file mode 100644
index 00000000..2543c951
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginKeyPush.h
@@ -0,0 +1 @@
+#include "../../src/shared/loginCentralServer/LoginKeyPush.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginRestoreCharacterMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginRestoreCharacterMessage.h
new file mode 100644
index 00000000..af337575
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginRestoreCharacterMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/loginCentralServer/LoginRestoreCharacterMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginUpgradeAccountMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginUpgradeAccountMessage.h
new file mode 100644
index 00000000..97fabe8a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/LoginUpgradeAccountMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/loginCentralServer/LoginUpgradeAccountMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueAlterAttribute.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueAlterAttribute.h
new file mode 100644
index 00000000..d982da5e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueAlterAttribute.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/MessageQueueAlterAttribute.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueCommandQueueEnqueueFwd.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueCommandQueueEnqueueFwd.h
new file mode 100644
index 00000000..37c73a73
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueCommandQueueEnqueueFwd.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/MessageQueueCommandQueueEnqueueFwd.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueCommandQueueForceExecuteCommandFwd.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueCommandQueueForceExecuteCommandFwd.h
new file mode 100644
index 00000000..306edb21
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueCommandQueueForceExecuteCommandFwd.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/MessageQueueCommandQueueForceExecuteCommandFwd.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueGrantOfflineXp.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueGrantOfflineXp.h
new file mode 100644
index 00000000..0ac8b076
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueGrantOfflineXp.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/MessageQueueGrantOfflineXp.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueuePvpCommand.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueuePvpCommand.h
new file mode 100644
index 00000000..7d046b37
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueuePvpCommand.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/MessageQueuePvpCommand.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueScriptTrigger.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueScriptTrigger.h
new file mode 100644
index 00000000..01d22465
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueScriptTrigger.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/MessageQueueScriptTrigger.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueSetState.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueSetState.h
new file mode 100644
index 00000000..1ebe8f63
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueSetState.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/MessageQueueSetState.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueTeleportObject.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueTeleportObject.h
new file mode 100644
index 00000000..a3afc933
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageQueueTeleportObject.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/MessageQueueTeleportObject.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageToAckMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageToAckMessage.h
new file mode 100644
index 00000000..5cd6b960
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageToAckMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/MessageToAckMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageToMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageToMessage.h
new file mode 100644
index 00000000..25903410
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageToMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/MessageToMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageToPayload.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageToPayload.h
new file mode 100644
index 00000000..8f43bfa6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MessageToPayload.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/MessageToPayload.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MetricsDataMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MetricsDataMessage.h
new file mode 100644
index 00000000..08a8e194
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MetricsDataMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/metricsMessages/MetricsDataMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MetricsInitiationMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MetricsInitiationMessage.h
new file mode 100644
index 00000000..bad87112
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/MetricsInitiationMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/metricsMessages/MetricsInitiationMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/NewClient.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/NewClient.h
new file mode 100644
index 00000000..f090ecf6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/NewClient.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameConnectionServer/NewClient.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAcceptHighBidMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAcceptHighBidMessage.h
new file mode 100644
index 00000000..4326435d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAcceptHighBidMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnAcceptHighBidMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAddAuctionMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAddAuctionMessage.h
new file mode 100644
index 00000000..68df0cb9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAddAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnAddAuctionMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAddBidMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAddBidMessage.h
new file mode 100644
index 00000000..fb0ba979
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAddBidMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnAddBidMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAuctionExpiredMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAuctionExpiredMessage.h
new file mode 100644
index 00000000..52c2fd32
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnAuctionExpiredMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnAuctionExpiredMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnCancelAuctionMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnCancelAuctionMessage.h
new file mode 100644
index 00000000..76a98387
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnCancelAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnCancelAuctionMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnCleanupInvalidItemRetrievalMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnCleanupInvalidItemRetrievalMessage.h
new file mode 100644
index 00000000..ced68e94
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnCleanupInvalidItemRetrievalMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnCleanupInvalidItemRetrievalMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnCreateVendorMarketMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnCreateVendorMarketMessage.h
new file mode 100644
index 00000000..a2c16c33
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnCreateVendorMarketMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnCreateVendorMarketMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetItemDetailsMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetItemDetailsMessage.h
new file mode 100644
index 00000000..6845e04b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetItemDetailsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnGetItemDetailsMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetItemMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetItemMessage.h
new file mode 100644
index 00000000..5a416d87
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetItemMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnGetItemMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetPlayerVendorCountMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetPlayerVendorCountMessage.h
new file mode 100644
index 00000000..85de3feb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetPlayerVendorCountMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameCommoditiesServer/OnGetPlayerVendorCountMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetVendorOwnerMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetVendorOwnerMessage.h
new file mode 100644
index 00000000..76385025
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetVendorOwnerMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnGetVendorOwnerMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetVendorValueMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetVendorValueMessage.h
new file mode 100644
index 00000000..d2c356b9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnGetVendorValueMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnGetVendorValueMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnItemExpiredMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnItemExpiredMessage.h
new file mode 100644
index 00000000..bf8f7009
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnItemExpiredMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnItemExpiredMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnPermanentAuctionPurchasedMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnPermanentAuctionPurchasedMessage.h
new file mode 100644
index 00000000..e7c7357f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnPermanentAuctionPurchasedMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnPermanentAuctionPurchasedMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnQueryAuctionHeadersMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnQueryAuctionHeadersMessage.h
new file mode 100644
index 00000000..4274b712
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnQueryAuctionHeadersMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnQueryAuctionHeadersMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnQueryVendorItemCountReplyMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnQueryVendorItemCountReplyMessage.h
new file mode 100644
index 00000000..aabbf337
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnQueryVendorItemCountReplyMessage.h
@@ -0,0 +1,2 @@
+#include "../../../src/shared/gameCommoditiesServer/OnQueryVendorItemCountReplyMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnUpdateVendorSearchOptionMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnUpdateVendorSearchOptionMessage.h
new file mode 100644
index 00000000..498b189e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnUpdateVendorSearchOptionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnUpdateVendorSearchOptionMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnVendorRefuseItemMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnVendorRefuseItemMessage.h
new file mode 100644
index 00000000..da0806c9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/OnVendorRefuseItemMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/OnVendorRefuseItemMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PersistedPlayerMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PersistedPlayerMessage.h
new file mode 100644
index 00000000..67d940f0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PersistedPlayerMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/PersistedPlayerMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlanetLoadCharacterMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlanetLoadCharacterMessage.h
new file mode 100644
index 00000000..b01d9630
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlanetLoadCharacterMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gamePlanetServer/PlanetLoadCharacterMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlanetObjectIdMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlanetObjectIdMessage.h
new file mode 100644
index 00000000..12bec928
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlanetObjectIdMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/PlanetObjectIdMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlanetRemoveObject.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlanetRemoveObject.h
new file mode 100644
index 00000000..9f5205e2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlanetRemoveObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/gamePlanetServer/PlanetRemoveObject.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlayedTimeAccumMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlayedTimeAccumMessage.h
new file mode 100644
index 00000000..62d002ab
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PlayedTimeAccumMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/PlayedTimeAccumMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PopulationListMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PopulationListMessage.h
new file mode 100644
index 00000000..281adc18
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PopulationListMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/PopulationListMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PreloadFinishedMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PreloadFinishedMessage.h
new file mode 100644
index 00000000..35fa8f50
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PreloadFinishedMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/PreloadFinishedMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PreloadRequestCompleteMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PreloadRequestCompleteMessage.h
new file mode 100644
index 00000000..a5bda037
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/PreloadRequestCompleteMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/PreloadRequestCompleteMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ProfilerOperationMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ProfilerOperationMessage.h
new file mode 100644
index 00000000..2d578106
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ProfilerOperationMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/ProfilerOperationMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/QueryAuctionHeadersMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/QueryAuctionHeadersMessage.h
new file mode 100644
index 00000000..e4f51b9e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/QueryAuctionHeadersMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/QueryAuctionHeadersMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/QueryVendorItemCountMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/QueryVendorItemCountMessage.h
new file mode 100644
index 00000000..847e5655
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/QueryVendorItemCountMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/QueryVendorItemCountMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RandomName.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RandomName.h
new file mode 100644
index 00000000..41423eb3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RandomName.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/RandomName.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReleaseAuthoritativeMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReleaseAuthoritativeMessage.h
new file mode 100644
index 00000000..5b2f1793
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReleaseAuthoritativeMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/ReleaseAuthoritativeMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadAdminTableMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadAdminTableMessage.h
new file mode 100644
index 00000000..572c0444
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadAdminTableMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/ReloadAdminTableMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadCommandTableMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadCommandTableMessage.h
new file mode 100644
index 00000000..c3f51fe4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadCommandTableMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/ReloadCommandTableMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadDatatableMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadDatatableMessage.h
new file mode 100644
index 00000000..1e5235dd
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadDatatableMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/ReloadDatatableMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadScriptMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadScriptMessage.h
new file mode 100644
index 00000000..0c77ca5e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadScriptMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/ReloadScriptMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadTemplateMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadTemplateMessage.h
new file mode 100644
index 00000000..6879d000
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ReloadTemplateMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/ReloadTemplateMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RenameCharacterMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RenameCharacterMessage.h
new file mode 100644
index 00000000..ebca3154
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RenameCharacterMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/RenameCharacterMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestBiographyMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestBiographyMessage.h
new file mode 100644
index 00000000..c7dc007c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestBiographyMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/RequestBiographyMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestChunkMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestChunkMessage.h
new file mode 100644
index 00000000..c1f219cb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestChunkMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/RequestChunkMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestGameServerForLoginMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestGameServerForLoginMessage.h
new file mode 100644
index 00000000..6325944a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestGameServerForLoginMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralPlanetServer/RequestGameServerForLoginMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestObjectIdsMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestObjectIdsMessage.h
new file mode 100644
index 00000000..4476ac3b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestObjectIdsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/RequestObjectIdsMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestObjectMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestObjectMessage.h
new file mode 100644
index 00000000..88aea044
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestObjectMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/RequestObjectMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestPlanetObjectIdMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestPlanetObjectIdMessage.h
new file mode 100644
index 00000000..9ab0f2aa
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestPlanetObjectIdMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/RequestPlanetObjectIdMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestUnloadObjectMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestUnloadObjectMessage.h
new file mode 100644
index 00000000..c16b03e8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RequestUnloadObjectMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/RequestUnloadObjectMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RestartServerMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RestartServerMessage.h
new file mode 100644
index 00000000..3adbeaf1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RestartServerMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/RestartServerMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RetrievedItemLoadMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RetrievedItemLoadMessage.h
new file mode 100644
index 00000000..9b5c069e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/RetrievedItemLoadMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/RetrievedItemLoadMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SPCharacterProfileMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SPCharacterProfileMessage.h
new file mode 100644
index 00000000..2046214a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SPCharacterProfileMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameStationPlayersCollector/SPCharacterProfileMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SceneTransferMessages.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SceneTransferMessages.h
new file mode 100644
index 00000000..004944b4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SceneTransferMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/SceneTransferMessages.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ServerDeleteCharacterMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ServerDeleteCharacterMessage.h
new file mode 100644
index 00000000..c344ca6e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ServerDeleteCharacterMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/loginCentralServer/ServerDeleteCharacterMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetAuthoritativeMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetAuthoritativeMessage.h
new file mode 100644
index 00000000..c9729cf5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetAuthoritativeMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/SetAuthoritativeMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetConnectionServerPublic.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetConnectionServerPublic.h
new file mode 100644
index 00000000..e3f9811f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetConnectionServerPublic.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralConnectionServer/SetConnectionServerPublic.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetEntranceChargeMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetEntranceChargeMessage.h
new file mode 100644
index 00000000..bf1e383c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetEntranceChargeMessage.h
@@ -0,0 +1 @@
+#include "../../../src/shared/gameCommoditiesServer/SetEntranceChargeMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetGameTimeMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetGameTimeMessage.h
new file mode 100644
index 00000000..8ecb2a31
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetGameTimeMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/SetGameTimeMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetObjectPositionMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetObjectPositionMessage.h
new file mode 100644
index 00000000..5fb5019a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetObjectPositionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/SetObjectPositionMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetPlanetServerMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetPlanetServerMessage.h
new file mode 100644
index 00000000..d30755f3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetPlanetServerMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/SetPlanetServerMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetSalesTaxMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetSalesTaxMessage.h
new file mode 100644
index 00000000..733b2f4d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetSalesTaxMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/SetSalesTaxMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetUniverseAuthoritativeMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetUniverseAuthoritativeMessage.h
new file mode 100644
index 00000000..93970ac1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetUniverseAuthoritativeMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/SetUniverseAuthoritativeMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetupServerNetworkMessages.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetupServerNetworkMessages.h
new file mode 100644
index 00000000..a5c6219a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SetupServerNetworkMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/SetupServerNetworkMessages.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/StructureListMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/StructureListMessage.h
new file mode 100644
index 00000000..a8561a48
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/StructureListMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/StructureListMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/StructuresForPurgeMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/StructuresForPurgeMessage.h
new file mode 100644
index 00000000..138cc082
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/StructuresForPurgeMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/StructuresForPurgeMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SynchronizeScriptVarDeltasMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SynchronizeScriptVarDeltasMessage.h
new file mode 100644
index 00000000..b3b98195
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SynchronizeScriptVarDeltasMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/SynchronizeScriptVarDeltasMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SynchronizeScriptVarsMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SynchronizeScriptVarsMessage.h
new file mode 100644
index 00000000..644f8ab9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/SynchronizeScriptVarsMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/SynchronizeScriptVarsMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskConnectionIdMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskConnectionIdMessage.h
new file mode 100644
index 00000000..e9a9b511
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskConnectionIdMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/TaskConnectionIdMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskConsoleCommand.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskConsoleCommand.h
new file mode 100644
index 00000000..13cd72ac
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskConsoleCommand.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/TaskConsoleCommand.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskEnumCluster.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskEnumCluster.h
new file mode 100644
index 00000000..6f4d5bcc
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskEnumCluster.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/TaskEnumCluster.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskEnumProcesses.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskEnumProcesses.h
new file mode 100644
index 00000000..d855f98b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskEnumProcesses.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/TaskEnumProcesses.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskKillProcess.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskKillProcess.h
new file mode 100644
index 00000000..c694c5f4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskKillProcess.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/TaskKillProcess.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskProcessDiedMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskProcessDiedMessage.h
new file mode 100644
index 00000000..1c7dc3ab
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskProcessDiedMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralTaskManager/TaskProcessDiedMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskSpawnProcess.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskSpawnProcess.h
new file mode 100644
index 00000000..2d248dd8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskSpawnProcess.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/TaskSpawnProcess.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskSpawnProcessAck.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskSpawnProcessAck.h
new file mode 100644
index 00000000..20e218fc
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskSpawnProcessAck.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/TaskSpawnProcessAck.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskUtilization.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskUtilization.h
new file mode 100644
index 00000000..fdd5b3f5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TaskUtilization.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/TaskUtilization.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TeleportMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TeleportMessage.h
new file mode 100644
index 00000000..ade2f1a3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TeleportMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/TeleportMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TeleportToMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TeleportToMessage.h
new file mode 100644
index 00000000..982a1566
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TeleportToMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/TeleportToMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ToggleAvatarLoginStatus.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ToggleAvatarLoginStatus.h
new file mode 100644
index 00000000..78c1259d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ToggleAvatarLoginStatus.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/ToggleAvatarLoginStatus.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferAccountData.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferAccountData.h
new file mode 100644
index 00000000..338eef65
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferAccountData.h
@@ -0,0 +1 @@
+#include "../../src/shared/transferServer/TransferAccountData.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferAccountDataArchive.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferAccountDataArchive.h
new file mode 100644
index 00000000..bdea30fb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferAccountDataArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/transferServer/TransferAccountDataArchive.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferCharacterData.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferCharacterData.h
new file mode 100644
index 00000000..ce950ef0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferCharacterData.h
@@ -0,0 +1 @@
+#include "../../src/shared/transferServer/TransferCharacterData.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferCharacterDataArchive.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferCharacterDataArchive.h
new file mode 100644
index 00000000..91210e7a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferCharacterDataArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/transferServer/TransferCharacterDataArchive.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferReplyCharacterList.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferReplyCharacterList.h
new file mode 100644
index 00000000..0cc5d8af
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferReplyCharacterList.h
@@ -0,0 +1 @@
+#include "../../src/shared/transferServer/TransferReplyCharacterList.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferReplyMoveValidation.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferReplyMoveValidation.h
new file mode 100644
index 00000000..3beee793
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferReplyMoveValidation.h
@@ -0,0 +1 @@
+#include "../../src/shared/transferServer/TransferReplyMoveValidation.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferRequestMoveValidation.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferRequestMoveValidation.h
new file mode 100644
index 00000000..302dadb5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/TransferRequestMoveValidation.h
@@ -0,0 +1 @@
+#include "../../src/shared/transferServer/TransferRequestMoveValidation.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UnloadObjectMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UnloadObjectMessage.h
new file mode 100644
index 00000000..b777de59
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UnloadObjectMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/UnloadObjectMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UnloadProxyMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UnloadProxyMessage.h
new file mode 100644
index 00000000..6031d15f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UnloadProxyMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gamePlanetServer/UnloadProxyMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UnloadedPlayerMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UnloadedPlayerMessage.h
new file mode 100644
index 00000000..22724435
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UnloadedPlayerMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameGameServer/UnloadedPlayerMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateConnectionServerStatus.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateConnectionServerStatus.h
new file mode 100644
index 00000000..7207973e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateConnectionServerStatus.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralConnectionServer/UpdateConnectionServerStatus.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateLoginConnectionServerStatus.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateLoginConnectionServerStatus.h
new file mode 100644
index 00000000..0fe67996
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateLoginConnectionServerStatus.h
@@ -0,0 +1 @@
+#include "../../src/shared/loginCentralServer/UpdateLoginConnectionServerStatus.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateObjectOnPlanetMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateObjectOnPlanetMessage.h
new file mode 100644
index 00000000..f534340b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateObjectOnPlanetMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gamePlanetServer/UpdateObjectOnPlanetMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateObjectPositionMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateObjectPositionMessage.h
new file mode 100644
index 00000000..cf732857
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateObjectPositionMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/gameGameServer/UpdateObjectPositionMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdatePlayerCountMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdatePlayerCountMessage.h
new file mode 100644
index 00000000..a3b6e794
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdatePlayerCountMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralConnectionServer/UpdatePlayerCountMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateVendorSearchOptionMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateVendorSearchOptionMessage.h
new file mode 100644
index 00000000..99c59316
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateVendorSearchOptionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/UpdateVendorSearchOptionMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateVendorStatusMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateVendorStatusMessage.h
new file mode 100644
index 00000000..706f48f0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UpdateVendorStatusMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/gameCommoditiesServer/UpdateVendorStatusMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UploadCharacterMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UploadCharacterMessage.h
new file mode 100644
index 00000000..f5867ee4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/UploadCharacterMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralGameServer/UploadCharacterMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateAccountMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateAccountMessage.h
new file mode 100644
index 00000000..cbf8d09a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateAccountMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/loginCentralServer/ValidateAccountMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateAccountReplyMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateAccountReplyMessage.h
new file mode 100644
index 00000000..2bfa3f16
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateAccountReplyMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/loginCentralServer/ValidateAccountReplyMessage.h"
+
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateCharacterForLoginMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateCharacterForLoginMessage.h
new file mode 100644
index 00000000..bcb6458a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateCharacterForLoginMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralConnectionServer/ValidateCharacterForLoginMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateCharacterForLoginReplyMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateCharacterForLoginReplyMessage.h
new file mode 100644
index 00000000..454f74f8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/ValidateCharacterForLoginReplyMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/centralConnectionServer/ValidateCharacterForLoginReplyMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/VendorStatusChangeMessage.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/VendorStatusChangeMessage.h
new file mode 100644
index 00000000..1f4bb8f1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/VendorStatusChangeMessage.h
@@ -0,0 +1 @@
+#include "../../../src/shared/gameCommoditiesServer/VendorStatusChangeMessage.h"
diff --git a/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/VerifyAndLockName.h b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/VerifyAndLockName.h
new file mode 100644
index 00000000..c7e7feca
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/include/public/serverNetworkMessages/VerifyAndLockName.h
@@ -0,0 +1 @@
+#include "../../src/shared/VerifyAndLockName.h"
diff --git a/engine/server/library/serverNetworkMessages/src/CMakeLists.txt b/engine/server/library/serverNetworkMessages/src/CMakeLists.txt
new file mode 100644
index 00000000..b40ed82f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/CMakeLists.txt
@@ -0,0 +1,516 @@
+
+set(SHARED_SOURCES
+	shared/AvatarList.cpp
+	shared/AvatarList.h
+	shared/AvatarListArchive.cpp
+	shared/AvatarListArchive.h
+	shared/ChatConnectAvatar.cpp
+	shared/ChatConnectAvatar.h
+	shared/ChatDisconnectAvatar.cpp
+	shared/ChatDisconnectAvatar.h
+	shared/ChatServerOnline.cpp
+	shared/ChatServerOnline.h
+	shared/EnumerateServers.cpp
+	shared/EnumerateServers.h
+	shared/RandomName.cpp
+	shared/RandomName.h
+	shared/TaskConnectionIdMessage.cpp
+	shared/TaskConnectionIdMessage.h
+	shared/TaskEnumCluster.cpp
+	shared/TaskEnumCluster.h
+	shared/TaskEnumProcesses.cpp
+	shared/TaskEnumProcesses.h
+	shared/TaskKillProcess.cpp
+	shared/TaskKillProcess.h
+	shared/TaskSpawnProcess.cpp
+	shared/TaskSpawnProcess.h
+	shared/TaskSpawnProcessAck.cpp
+	shared/TaskSpawnProcessAck.h
+	shared/TaskUtilization.cpp
+	shared/TaskUtilization.h
+	shared/VerifyAndLockName.cpp
+	shared/VerifyAndLockName.h
+
+	shared/centralConnectionServer/CentralConnectionServerMessages.cpp
+	shared/centralConnectionServer/CentralConnectionServerMessages.h
+	shared/centralConnectionServer/SetConnectionServerPublic.cpp
+	shared/centralConnectionServer/SetConnectionServerPublic.h
+	shared/centralConnectionServer/UpdateConnectionServerStatus.cpp
+	shared/centralConnectionServer/UpdateConnectionServerStatus.h
+	shared/centralConnectionServer/UpdatePlayerCountMessage.cpp
+	shared/centralConnectionServer/UpdatePlayerCountMessage.h
+	shared/centralConnectionServer/ValidateCharacterForLoginMessage.cpp
+	shared/centralConnectionServer/ValidateCharacterForLoginMessage.h
+	shared/centralConnectionServer/ValidateCharacterForLoginReplyMessage.cpp
+	shared/centralConnectionServer/ValidateCharacterForLoginReplyMessage.h
+
+	shared/centralGameServer/AccountFeatureIdRequest.cpp
+	shared/centralGameServer/AccountFeatureIdRequest.h
+	shared/centralGameServer/AccountFeatureIdResponse.cpp
+	shared/centralGameServer/AccountFeatureIdResponse.h
+	shared/centralGameServer/AddCharacterMessage.cpp
+	shared/centralGameServer/AddCharacterMessage.h
+	shared/centralGameServer/AddObjectIdBlockMessage.cpp
+	shared/centralGameServer/AddObjectIdBlockMessage.h
+	shared/centralGameServer/AdjustAccountFeatureIdRequest.cpp
+	shared/centralGameServer/AdjustAccountFeatureIdRequest.h
+	shared/centralGameServer/AdjustAccountFeatureIdResponse.cpp
+	shared/centralGameServer/AdjustAccountFeatureIdResponse.h
+	shared/centralGameServer/CentralGameServerMessages.cpp
+	shared/centralGameServer/CentralGameServerMessages.h
+	shared/centralGameServer/CentralPingMessage.cpp
+	shared/centralGameServer/CentralPingMessage.h
+	shared/centralGameServer/ChangeUniverseProcessMessage.cpp
+	shared/centralGameServer/ChangeUniverseProcessMessage.h
+	shared/centralGameServer/CharacterListMessage.cpp
+	shared/centralGameServer/CharacterListMessage.h
+	shared/centralGameServer/CharacterTransferStatusMessage.cpp
+	shared/centralGameServer/CharacterTransferStatusMessage.h
+	shared/centralGameServer/ChunkCompleteMessage.cpp
+	shared/centralGameServer/ChunkCompleteMessage.h
+	shared/centralGameServer/ChunkObjectListMessage.cpp
+	shared/centralGameServer/ChunkObjectListMessage.h
+	shared/centralGameServer/ClaimRewardsMessage.cpp
+	shared/centralGameServer/ClaimRewardsMessage.h
+	shared/centralGameServer/ClaimRewardsReplyMessage.cpp
+	shared/centralGameServer/ClaimRewardsReplyMessage.h
+	shared/centralGameServer/CreateNewObjectMessage.cpp
+	shared/centralGameServer/CreateNewObjectMessage.h
+	shared/centralGameServer/CSDBNetMessages.cpp
+	shared/centralGameServer/CSDBNetMessages.h
+	shared/centralGameServer/DownloadCharacterMessage.cpp
+	shared/centralGameServer/DownloadCharacterMessage.h
+	shared/centralGameServer/ExcommunicateGameServerMessage.cpp
+	shared/centralGameServer/ExcommunicateGameServerMessage.h
+	shared/centralGameServer/FailedToLoadObjectMessage.cpp
+	shared/centralGameServer/FailedToLoadObjectMessage.h
+	shared/centralGameServer/FeatureIdTransactionRequest.cpp
+	shared/centralGameServer/FeatureIdTransactionRequest.h
+	shared/centralGameServer/FeatureIdTransactionResponse.cpp
+	shared/centralGameServer/FeatureIdTransactionResponse.h
+	shared/centralGameServer/FeatureIdTransactionSyncUpdate.cpp
+	shared/centralGameServer/FeatureIdTransactionSyncUpdate.h
+	shared/centralGameServer/FlagObjectForDeleteMessage.cpp
+	shared/centralGameServer/FlagObjectForDeleteMessage.h
+	shared/centralGameServer/ForceUnloadObjectMessage.cpp
+	shared/centralGameServer/ForceUnloadObjectMessage.h
+	shared/centralGameServer/GameServerCSRequestMessage.cpp
+	shared/centralGameServer/GameServerCSRequestMessage.h
+	shared/centralGameServer/GameServerCSResponseMessage.cpp
+	shared/centralGameServer/GameServerCSResponseMessage.h
+	shared/centralGameServer/GameServerReadyMessage.cpp
+	shared/centralGameServer/GameServerReadyMessage.h
+	shared/centralGameServer/GameServerUniverseLoadedMessage.cpp
+	shared/centralGameServer/GameServerUniverseLoadedMessage.h
+	shared/centralGameServer/LoadObjectMessage.cpp
+	shared/centralGameServer/LoadObjectMessage.h
+	shared/centralGameServer/LoadUniverseMessage.cpp
+	shared/centralGameServer/LoadUniverseMessage.h
+	shared/centralGameServer/MessageToAckMessage.cpp
+	shared/centralGameServer/MessageToAckMessage.h
+	shared/centralGameServer/MessageToMessage.cpp
+	shared/centralGameServer/MessageToMessage.h
+	shared/centralGameServer/MessageToPayload.cpp
+	shared/centralGameServer/MessageToPayload.h
+	shared/centralGameServer/MessageToPayloadImpl.cpp
+	shared/centralGameServer/MessageToPayloadImpl.h
+	shared/centralGameServer/PlanetObjectIdMessage.cpp
+	shared/centralGameServer/PlanetObjectIdMessage.h
+	shared/centralGameServer/PopulationListMessage.cpp
+	shared/centralGameServer/PopulationListMessage.h
+	shared/centralGameServer/PreloadFinishedMessage.cpp
+	shared/centralGameServer/PreloadFinishedMessage.h
+	shared/centralGameServer/PreloadRequestCompleteMessage.cpp
+	shared/centralGameServer/PreloadRequestCompleteMessage.h
+	shared/centralGameServer/ReleaseAuthoritativeMessage.cpp
+	shared/centralGameServer/ReleaseAuthoritativeMessage.h
+	shared/centralGameServer/RequestChunkMessage.cpp
+	shared/centralGameServer/RequestChunkMessage.h
+	shared/centralGameServer/RequestObjectIdsMessage.cpp
+	shared/centralGameServer/RequestObjectIdsMessage.h
+	shared/centralGameServer/RequestObjectMessage.cpp
+	shared/centralGameServer/RequestObjectMessage.h
+	shared/centralGameServer/RequestPlanetObjectIdMessage.cpp
+	shared/centralGameServer/RequestPlanetObjectIdMessage.h
+	shared/centralGameServer/RequestUnloadObjectMessage.cpp
+	shared/centralGameServer/RequestUnloadObjectMessage.h
+	shared/centralGameServer/SceneTransferMessages.cpp
+	shared/centralGameServer/SceneTransferMessages.h
+	shared/centralGameServer/SetAuthoritativeMessage.cpp
+	shared/centralGameServer/SetAuthoritativeMessage.h
+	shared/centralGameServer/SetObjectPositionMessage.cpp
+	shared/centralGameServer/SetObjectPositionMessage.h
+	shared/centralGameServer/SetPlanetServerMessage.cpp
+	shared/centralGameServer/SetPlanetServerMessage.h
+	shared/centralGameServer/SetUniverseAuthoritativeMessage.cpp
+	shared/centralGameServer/SetUniverseAuthoritativeMessage.h
+	shared/centralGameServer/StructureListMessage.cpp
+	shared/centralGameServer/StructureListMessage.h
+	shared/centralGameServer/ToggleAvatarLoginStatus.cpp
+	shared/centralGameServer/ToggleAvatarLoginStatus.h
+	shared/centralGameServer/UploadCharacterMessage.cpp
+	shared/centralGameServer/UploadCharacterMessage.h
+	shared/centralGameServer/UnloadObjectMessage.cpp
+	shared/centralGameServer/UnloadObjectMessage.h
+
+	shared/centralPlanetServer/CentralPlanetServerConnect.cpp
+	shared/centralPlanetServer/CentralPlanetServerConnect.h
+	shared/centralPlanetServer/GameServerForLoginMessage.cpp
+	shared/centralPlanetServer/GameServerForLoginMessage.h
+	shared/centralPlanetServer/RequestGameServerForLoginMessage.cpp
+	shared/centralPlanetServer/RequestGameServerForLoginMessage.h
+
+	shared/centralTaskManager/CentralTaskMessages.cpp
+	shared/centralTaskManager/CentralTaskMessages.h
+	shared/centralTaskManager/TaskProcessDiedMessage.cpp
+	shared/centralTaskManager/TaskProcessDiedMessage.h
+
+	shared/commoditiesSwgDatabase/CommoditiesLoadDoneMessage.cpp
+	shared/commoditiesSwgDatabase/CommoditiesLoadDoneMessage.h
+	shared/commoditiesSwgDatabase/CMCreateAuctionMessage.cpp
+	shared/commoditiesSwgDatabase/CMCreateAuctionMessage.h
+	shared/commoditiesSwgDatabase/CMUpdateAuctionMessage.cpp
+	shared/commoditiesSwgDatabase/CMUpdateAuctionMessage.h
+	shared/commoditiesSwgDatabase/CMDeleteAuctionMessage.cpp
+	shared/commoditiesSwgDatabase/CMDeleteAuctionMessage.h
+	shared/commoditiesSwgDatabase/CMCreateAuctionBidMessage.cpp
+	shared/commoditiesSwgDatabase/CMCreateAuctionBidMessage.h
+	shared/commoditiesSwgDatabase/CMCreateLocationMessage.cpp
+	shared/commoditiesSwgDatabase/CMCreateLocationMessage.h
+	shared/commoditiesSwgDatabase/CMUpdateLocationMessage.cpp
+	shared/commoditiesSwgDatabase/CMUpdateLocationMessage.h
+	shared/commoditiesSwgDatabase/CMDeleteLocationMessage.cpp
+	shared/commoditiesSwgDatabase/CMDeleteLocationMessage.h
+	shared/commoditiesSwgDatabase/GetAuctionLocationsMessage.cpp
+	shared/commoditiesSwgDatabase/GetAuctionLocationsMessage.h
+	shared/commoditiesSwgDatabase/GetMarketAuctionAttributesMessage.cpp
+	shared/commoditiesSwgDatabase/GetMarketAuctionAttributesMessage.h
+	shared/commoditiesSwgDatabase/GetMarketAuctionBidsMessage.cpp
+	shared/commoditiesSwgDatabase/GetMarketAuctionBidsMessage.h
+	shared/commoditiesSwgDatabase/GetMarketAuctionsMessage.cpp
+	shared/commoditiesSwgDatabase/GetMarketAuctionsMessage.h
+	shared/commoditiesSwgDatabase/LoadCommoditiesMessage.cpp
+	shared/commoditiesSwgDatabase/LoadCommoditiesMessage.h
+
+	shared/core/FirstServerNetworkMessages.h
+	shared/core/SetupServerNetworkMessages.cpp
+	shared/core/SetupServerNetworkMessages.h
+	shared/core/TaskConsoleCommand.cpp
+	shared/core/TaskConsoleCommand.h
+
+	shared/gameCommoditiesServer/AcceptHighBidMessage.cpp
+	shared/gameCommoditiesServer/AcceptHighBidMessage.h
+	shared/gameCommoditiesServer/AddAuctionMessage.cpp
+	shared/gameCommoditiesServer/AddAuctionMessage.h
+	shared/gameCommoditiesServer/AddBidMessage.cpp
+	shared/gameCommoditiesServer/AddBidMessage.h
+	shared/gameCommoditiesServer/AddImmediateAuctionMessage.cpp
+	shared/gameCommoditiesServer/AddImmediateAuctionMessage.h
+	shared/gameCommoditiesServer/AuctionBase.h
+	shared/gameCommoditiesServer/AuctionData.cpp
+	shared/gameCommoditiesServer/AuctionData.h
+	shared/gameCommoditiesServer/CancelAuctionMessage.cpp
+	shared/gameCommoditiesServer/CancelAuctionMessage.h
+	shared/gameCommoditiesServer/CleanupInvalidItemRetrievalMessage.cpp
+	shared/gameCommoditiesServer/CleanupInvalidItemRetrievalMessage.h
+	shared/gameCommoditiesServer/CreateVendorMarketMessage.cpp
+	shared/gameCommoditiesServer/CreateVendorMarketMessage.h
+	shared/gameCommoditiesServer/DeleteAuctionLocationMessage.cpp
+	shared/gameCommoditiesServer/DeleteAuctionLocationMessage.h
+	shared/gameCommoditiesServer/DestroyVendorMarketMessage.cpp
+	shared/gameCommoditiesServer/DestroyVendorMarketMessage.h
+	shared/gameCommoditiesServer/GetItemDetailsMessage.cpp
+	shared/gameCommoditiesServer/GetItemDetailsMessage.h
+	shared/gameCommoditiesServer/GetItemMessage.cpp
+	shared/gameCommoditiesServer/GetItemMessage.h
+	shared/gameCommoditiesServer/GetPlayerVendorCountMessage.cpp
+	shared/gameCommoditiesServer/GetPlayerVendorCountMessage.h
+	shared/gameCommoditiesServer/GetVendorOwnerMessage.cpp
+	shared/gameCommoditiesServer/GetVendorOwnerMessage.h
+	shared/gameCommoditiesServer/GetVendorValueMessage.cpp
+	shared/gameCommoditiesServer/GetVendorValueMessage.h
+	shared/gameCommoditiesServer/ItemMovedMessage.cpp
+	shared/gameCommoditiesServer/ItemMovedMessage.h
+	shared/gameCommoditiesServer/OnAcceptHighBidMessage.cpp
+	shared/gameCommoditiesServer/OnAcceptHighBidMessage.h
+	shared/gameCommoditiesServer/OnAddAuctionMessage.cpp
+	shared/gameCommoditiesServer/OnAddAuctionMessage.h
+	shared/gameCommoditiesServer/OnAddBidMessage.cpp
+	shared/gameCommoditiesServer/OnAddBidMessage.h
+	shared/gameCommoditiesServer/OnAuctionExpiredMessage.cpp
+	shared/gameCommoditiesServer/OnAuctionExpiredMessage.h
+	shared/gameCommoditiesServer/OnCancelAuctionMessage.cpp
+	shared/gameCommoditiesServer/OnCancelAuctionMessage.h
+	shared/gameCommoditiesServer/OnCleanupInvalidItemRetrievalMessage.cpp
+	shared/gameCommoditiesServer/OnCleanupInvalidItemRetrievalMessage.h
+	shared/gameCommoditiesServer/OnCreateVendorMarketMessage.cpp
+	shared/gameCommoditiesServer/OnCreateVendorMarketMessage.h
+	shared/gameCommoditiesServer/OnGetItemDetailsMessage.cpp
+	shared/gameCommoditiesServer/OnGetItemDetailsMessage.h
+	shared/gameCommoditiesServer/OnGetItemMessage.cpp
+	shared/gameCommoditiesServer/OnGetItemMessage.h
+	shared/gameCommoditiesServer/OnGetPlayerVendorCountMessage.cpp
+	shared/gameCommoditiesServer/OnGetPlayerVendorCountMessage.h
+	shared/gameCommoditiesServer/OnGetVendorOwnerMessage.cpp
+	shared/gameCommoditiesServer/OnGetVendorOwnerMessage.h
+	shared/gameCommoditiesServer/OnGetVendorValueMessage.cpp
+	shared/gameCommoditiesServer/OnGetVendorValueMessage.h
+	shared/gameCommoditiesServer/OnItemExpiredMessage.cpp
+	shared/gameCommoditiesServer/OnItemExpiredMessage.h
+	shared/gameCommoditiesServer/OnPermanentAuctionPurchasedMessage.cpp
+	shared/gameCommoditiesServer/OnPermanentAuctionPurchasedMessage.h
+	shared/gameCommoditiesServer/OnQueryAuctionHeadersMessage.cpp
+	shared/gameCommoditiesServer/OnQueryAuctionHeadersMessage.h
+	shared/gameCommoditiesServer/OnQueryVendorItemCountReplyMessage.cpp
+	shared/gameCommoditiesServer/OnQueryVendorItemCountReplyMessage.h
+	shared/gameCommoditiesServer/OnUpdateVendorSearchOptionMessage.cpp
+	shared/gameCommoditiesServer/OnUpdateVendorSearchOptionMessage.h
+	shared/gameCommoditiesServer/OnVendorRefuseItemMessage.cpp
+	shared/gameCommoditiesServer/OnVendorRefuseItemMessage.h
+	shared/gameCommoditiesServer/QueryAuctionHeadersMessage.cpp
+	shared/gameCommoditiesServer/QueryAuctionHeadersMessage.h
+	shared/gameCommoditiesServer/QueryVendorItemCountMessage.cpp
+	shared/gameCommoditiesServer/QueryVendorItemCountMessage.h
+	shared/gameCommoditiesServer/SetEntranceChargeMessage.cpp
+	shared/gameCommoditiesServer/SetEntranceChargeMessage.h
+	shared/gameCommoditiesServer/SetGameTimeMessage.cpp
+	shared/gameCommoditiesServer/SetGameTimeMessage.h
+	shared/gameCommoditiesServer/SetSalesTaxMessage.cpp
+	shared/gameCommoditiesServer/SetSalesTaxMessage.h
+	shared/gameCommoditiesServer/UpdateVendorSearchOptionMessage.cpp
+	shared/gameCommoditiesServer/UpdateVendorSearchOptionMessage.h
+	shared/gameCommoditiesServer/UpdateVendorStatusMessage.cpp
+	shared/gameCommoditiesServer/UpdateVendorStatusMessage.h
+	shared/gameCommoditiesServer/VendorStatusChangeMessage.cpp
+	shared/gameCommoditiesServer/VendorStatusChangeMessage.h
+
+	shared/gameConnectionServer/GameConnectionServerMessages.cpp
+	shared/gameConnectionServer/GameConnectionServerMessages.h
+	shared/gameConnectionServer/NewClient.cpp
+	shared/gameConnectionServer/NewClient.h
+
+	shared/gameGameServer/AddResourceTypeMessage.cpp
+	shared/gameGameServer/AddResourceTypeMessage.h
+	shared/gameGameServer/AiCreatureStateMessage.cpp
+	shared/gameGameServer/AiCreatureStateMessage.h
+	shared/gameGameServer/AiMovementMessage.cpp
+	shared/gameGameServer/AiMovementMessage.h
+	shared/gameGameServer/AuthTransferClientMessage.cpp
+	shared/gameGameServer/AuthTransferClientMessage.h
+	shared/gameGameServer/BiographyMessage.cpp
+	shared/gameGameServer/BiographyMessage.h
+	shared/gameGameServer/BountyHunterTargetListMessage.cpp
+	shared/gameGameServer/BountyHunterTargetListMessage.h
+	shared/gameGameServer/BountyHunterTargetMessage.cpp
+	shared/gameGameServer/BountyHunterTargetMessage.h
+	shared/gameGameServer/CharacterNamesMessage.cpp
+	shared/gameGameServer/CharacterNamesMessage.h
+	shared/gameGameServer/CreateDynamicSpawnRegionCircleMessage.cpp
+	shared/gameGameServer/CreateDynamicSpawnRegionCircleMessage.h
+	shared/gameGameServer/CreateDynamicRegionCircleMessage.cpp
+	shared/gameGameServer/CreateDynamicRegionCircleMessage.h
+	shared/gameGameServer/CreateDynamicRegionRectangleMessage.cpp
+	shared/gameGameServer/CreateDynamicRegionRectangleMessage.h
+	shared/gameGameServer/CreateGroupMessage.cpp
+	shared/gameGameServer/CreateGroupMessage.h
+	shared/gameGameServer/CreateObjectMessage.cpp
+	shared/gameGameServer/CreateObjectMessage.h
+	shared/gameGameServer/CreateSyncUiMessage.cpp
+	shared/gameGameServer/CreateSyncUiMessage.h
+	shared/gameGameServer/EnableNewJediTrackingMessage.cpp
+	shared/gameGameServer/EnableNewJediTrackingMessage.h
+	shared/gameGameServer/EndBaselinesMessage.cpp
+	shared/gameGameServer/EndBaselinesMessage.h
+	shared/gameGameServer/ExchangeListCreditsMessage.cpp
+	shared/gameGameServer/ExchangeListCreditsMessage.h
+	shared/gameGameServer/GameGameServerMessages.cpp
+	shared/gameGameServer/GameGameServerMessages.h
+	shared/gameGameServer/GameServerConnectAck.cpp
+	shared/gameGameServer/GameServerConnectAck.h
+	shared/gameGameServer/GameServerMessageInterface.cpp
+	shared/gameGameServer/GameServerMessageInterface.h
+	shared/gameGameServer/GetMoneyFromOfflineObjectMessage.cpp
+	shared/gameGameServer/GetMoneyFromOfflineObjectMessage.h
+	shared/gameGameServer/GroupMemberParam.cpp
+	shared/gameGameServer/GroupMemberParam.h
+	shared/gameGameServer/GroupMemberParamArchive.cpp
+	shared/gameGameServer/GroupMemberParamArchive.h
+	shared/gameGameServer/LoadContainedObjectMessage.cpp
+	shared/gameGameServer/LoadContainedObjectMessage.h
+	shared/gameGameServer/LoadContentsMessage.cpp
+	shared/gameGameServer/LoadContentsMessage.h
+	shared/gameGameServer/LoadStructureMessage.cpp
+	shared/gameGameServer/LoadStructureMessage.h
+	shared/gameGameServer/LocateObjectResponseMessage.cpp
+	shared/gameGameServer/LocateObjectResponseMessage.h
+	shared/gameGameServer/LocatePlayerResponseMessage.cpp
+	shared/gameGameServer/LocatePlayerResponseMessage.h
+	shared/gameGameServer/LocateStructureMessage.cpp
+	shared/gameGameServer/LocateStructureMessage.h
+	shared/gameGameServer/MessageQueueAlterAttribute.cpp
+	shared/gameGameServer/MessageQueueAlterAttribute.h
+	shared/gameGameServer/MessageQueueCommandQueueEnqueueFwd.cpp
+	shared/gameGameServer/MessageQueueCommandQueueEnqueueFwd.h
+	shared/gameGameServer/MessageQueueCommandQueueForceExecuteCommandFwd.cpp
+	shared/gameGameServer/MessageQueueCommandQueueForceExecuteCommandFwd.h
+	shared/gameGameServer/MessageQueueGrantOfflineXp.cpp
+	shared/gameGameServer/MessageQueueGrantOfflineXp.h
+	shared/gameGameServer/MessageQueuePvpCommand.cpp
+	shared/gameGameServer/MessageQueuePvpCommand.h
+	shared/gameGameServer/MessageQueueScriptTrigger.cpp
+	shared/gameGameServer/MessageQueueScriptTrigger.h
+	shared/gameGameServer/MessageQueueSetState.cpp
+	shared/gameGameServer/MessageQueueSetState.h
+	shared/gameGameServer/MessageQueueTeleportObject.cpp
+	shared/gameGameServer/MessageQueueTeleportObject.h
+	shared/gameGameServer/PersistedPlayerMessage.cpp
+	shared/gameGameServer/PersistedPlayerMessage.h
+	shared/gameGameServer/PlayedTimeAccumMessage.cpp
+	shared/gameGameServer/PlayedTimeAccumMessage.h
+	shared/gameGameServer/ProfilerOperationMessage.cpp
+	shared/gameGameServer/ProfilerOperationMessage.h
+	shared/gameGameServer/ReloadAdminTableMessage.cpp
+	shared/gameGameServer/ReloadAdminTableMessage.h
+	shared/gameGameServer/ReloadCommandTableMessage.cpp
+	shared/gameGameServer/ReloadCommandTableMessage.h
+	shared/gameGameServer/ReloadDatatableMessage.cpp
+	shared/gameGameServer/ReloadDatatableMessage.h
+	shared/gameGameServer/ReloadScriptMessage.cpp
+	shared/gameGameServer/ReloadScriptMessage.h
+	shared/gameGameServer/ReloadTemplateMessage.cpp
+	shared/gameGameServer/ReloadTemplateMessage.h
+	shared/gameGameServer/RenameCharacterMessage.cpp
+	shared/gameGameServer/RenameCharacterMessage.h
+	shared/gameGameServer/RequestBiographyMessage.cpp
+	shared/gameGameServer/RequestBiographyMessage.h
+	shared/gameGameServer/RestartServerMessage.cpp
+	shared/gameGameServer/RestartServerMessage.h
+	shared/gameGameServer/RetrievedItemLoadMessage.cpp
+	shared/gameGameServer/RetrievedItemLoadMessage.h
+	shared/gameGameServer/StructuresForPurgeMessage.cpp
+	shared/gameGameServer/StructuresForPurgeMessage.h
+	shared/gameGameServer/SynchronizeScriptVarDeltasMessage.cpp
+	shared/gameGameServer/SynchronizeScriptVarDeltasMessage.h
+	shared/gameGameServer/SynchronizeScriptVarsMessage.cpp
+	shared/gameGameServer/SynchronizeScriptVarsMessage.h
+	shared/gameGameServer/TeleportMessage.cpp
+	shared/gameGameServer/TeleportMessage.h
+	shared/gameGameServer/TeleportToMessage.cpp
+	shared/gameGameServer/TeleportToMessage.h
+	shared/gameGameServer/UnloadedPlayerMessage.cpp
+	shared/gameGameServer/UnloadedPlayerMessage.h
+	shared/gameGameServer/UpdateObjectPositionMessage.cpp
+	shared/gameGameServer/UpdateObjectPositionMessage.h
+
+	shared/gamePlanetServer/FactionalSystemMessage.cpp
+	shared/gamePlanetServer/FactionalSystemMessage.h
+	shared/gamePlanetServer/FirstPlanetGameServerIdMessage.cpp
+	shared/gamePlanetServer/FirstPlanetGameServerIdMessage.h
+	shared/gamePlanetServer/GameServerForceChangeAuthorityMessage.cpp
+	shared/gamePlanetServer/GameServerForceChangeAuthorityMessage.h
+	shared/gamePlanetServer/LocationRequest.cpp
+	shared/gamePlanetServer/LocationRequest.h
+	shared/gamePlanetServer/LocationResponse.cpp
+	shared/gamePlanetServer/LocationResponse.h
+	shared/gamePlanetServer/PlanetLoadCharacterMessage.cpp
+	shared/gamePlanetServer/PlanetLoadCharacterMessage.h
+	shared/gamePlanetServer/PlanetRemoveObject.cpp
+	shared/gamePlanetServer/PlanetRemoveObject.h
+	shared/gamePlanetServer/UnloadProxyMessage.cpp
+	shared/gamePlanetServer/UnloadProxyMessage.h
+	shared/gamePlanetServer/UpdateObjectOnPlanetMessage.cpp
+	shared/gamePlanetServer/UpdateObjectOnPlanetMessage.h
+
+	shared/gameStationPlayersCollector/SPCharacterProfileMessage.cpp
+	shared/gameStationPlayersCollector/SPCharacterProfileMessage.h
+
+	shared/gameTaskManager/GameTaskManagerMessages.cpp
+	shared/gameTaskManager/GameTaskManagerMessages.h
+
+	shared/loginCentralServer/ConnectionServerDown.cpp
+	shared/loginCentralServer/ConnectionServerDown.h
+	shared/loginCentralServer/CSToolRequest.cpp
+	shared/loginCentralServer/CSToolRequest.h
+	shared/loginCentralServer/CSToolResponse.cpp
+	shared/loginCentralServer/CSToolResponse.h
+	shared/loginCentralServer/LoginClusterName.cpp
+	shared/loginCentralServer/LoginClusterName.h
+	shared/loginCentralServer/LoginClusterName2.cpp
+	shared/loginCentralServer/LoginClusterName2.h
+	shared/loginCentralServer/LoginConnectionServerAddress.cpp
+	shared/loginCentralServer/LoginConnectionServerAddress.h
+	shared/loginCentralServer/LoginCreateCharacterAckMessage.cpp
+	shared/loginCentralServer/LoginCreateCharacterAckMessage.h
+	shared/loginCentralServer/LoginCreateCharacterMessage.cpp
+	shared/loginCentralServer/LoginCreateCharacterMessage.h
+	shared/loginCentralServer/LoginKeyPush.cpp
+	shared/loginCentralServer/LoginKeyPush.h
+	shared/loginCentralServer/LoginRestoreCharacterMessage.cpp
+	shared/loginCentralServer/LoginRestoreCharacterMessage.h
+	shared/loginCentralServer/LoginUpgradeAccountMessage.cpp
+	shared/loginCentralServer/LoginUpgradeAccountMessage.h
+	shared/loginCentralServer/ServerDeleteCharacterMessage.cpp
+	shared/loginCentralServer/ServerDeleteCharacterMessage.h
+	shared/loginCentralServer/UpdateLoginConnectionServerStatus.cpp
+	shared/loginCentralServer/UpdateLoginConnectionServerStatus.h
+	shared/loginCentralServer/ValidateAccountMessage.cpp
+	shared/loginCentralServer/ValidateAccountMessage.h
+	shared/loginCentralServer/ValidateAccountReplyMessage.cpp
+	shared/loginCentralServer/ValidateAccountReplyMessage.h
+
+	shared/metricsMessages/MetricsDataMessage.cpp
+	shared/metricsMessages/MetricsDataMessage.h
+	shared/metricsMessages/MetricsInitiationMessage.cpp
+	shared/metricsMessages/MetricsInitiationMessage.h
+
+	shared/transferServer/TransferReplyCharacterList.cpp
+	shared/transferServer/TransferReplyCharacterList.h
+	shared/transferServer/TransferRequestMoveValidation.cpp
+	shared/transferServer/TransferRequestMoveValidation.h
+	shared/transferServer/TransferCharacterData.cpp
+	shared/transferServer/TransferCharacterDataArchive.cpp
+	shared/transferServer/TransferReplyMoveValidation.cpp
+	shared/transferServer/TransferReplyMoveValidation.h
+	shared/transferServer/TransferAccountData.cpp
+	shared/transferServer/TransferAccountDataArchive.cpp
+)
+
+if(WIN32)
+	set(PLATFORM_SOURCES
+		win32/FirstServerNetworkMessages.cpp
+	)
+else()
+	set(PLATFORM_SOURCES "")
+endif()
+
+include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}/shared
+	${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/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/sharedNetwork/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/sharedUtility/include/public
+	${SWG_ENGINE_SOURCE_DIR}/server/library/serverGame/include/public
+	${SWG_ENGINE_SOURCE_DIR}/server/library/serverKeyShare/include/public
+	${SWG_ENGINE_SOURCE_DIR}/server/library/serverUtility/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
+)
+
+add_library(serverNetworkMessages STATIC
+	${SHARED_SOURCES}
+	${PLATFORM_SOURCES}
+)
diff --git a/engine/server/library/serverNetworkMessages/src/shared/AvatarList.cpp b/engine/server/library/serverNetworkMessages/src/shared/AvatarList.cpp
new file mode 100644
index 00000000..ab9f2921
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/AvatarList.cpp
@@ -0,0 +1,13 @@
+// ======================================================================
+//
+// AvatarList.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "AvatarList.h"
+
+// ======================================================================
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/AvatarList.h b/engine/server/library/serverNetworkMessages/src/shared/AvatarList.h
new file mode 100644
index 00000000..41e8883d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/AvatarList.h
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// AvatarList.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AvatarList_H
+#define INCLUDED_AvatarList_H
+
+// ======================================================================
+
+#include "Unicode.h"
+#include "sharedFoundation/NetworkId.h"
+
+// ======================================================================
+
+/**
+ * Data structures for passing around the list of avatars for an account.
+ */
+struct AvatarRecord
+{
+	Unicode::String m_name;
+	int m_objectTemplateId;
+	NetworkId m_networkId;
+	uint32 m_clusterId;
+	int m_characterType;
+};
+
+// ======================================================================
+
+typedef stdvector<AvatarRecord>::fwd AvatarList;
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/AvatarListArchive.cpp b/engine/server/library/serverNetworkMessages/src/shared/AvatarListArchive.cpp
new file mode 100644
index 00000000..a21c92ce
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/AvatarListArchive.cpp
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// AvatarList.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "Archive/Archive.h"
+#include "serverNetworkMessages/AvatarList.h"
+
+// ======================================================================
+
+namespace Archive
+{
+	void get (ReadIterator & source, AvatarRecord & target)
+	{
+		get(source, target.m_name);
+		get(source, target.m_objectTemplateId);
+		get(source, target.m_networkId);
+		get(source, target.m_clusterId);
+		get(source, target.m_characterType);
+	}
+	
+	void put (ByteStream & target, const AvatarRecord & source)
+	{
+		put(target, source.m_name);
+		put(target, source.m_objectTemplateId);
+		put(target, source.m_networkId);
+		put(target, source.m_clusterId);
+		put(target, source.m_characterType);
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/AvatarListArchive.h b/engine/server/library/serverNetworkMessages/src/shared/AvatarListArchive.h
new file mode 100644
index 00000000..c0891f65
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/AvatarListArchive.h
@@ -0,0 +1,31 @@
+// ======================================================================
+//
+// AvatarList.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AvatarListArchive_H
+#define INCLUDED_AvatarListArchive_H
+
+// ======================================================================
+
+#include "serverNetworkMessages/AvatarList.h"
+#include "sharedFoundation/NetworkId.h"
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	void get (ReadIterator & source, AvatarRecord & target);
+	void put (ByteStream & target, const AvatarRecord & source);
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/ChatConnectAvatar.cpp b/engine/server/library/serverNetworkMessages/src/shared/ChatConnectAvatar.cpp
new file mode 100644
index 00000000..77ce03c5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/ChatConnectAvatar.cpp
@@ -0,0 +1,51 @@
+// ChatConnectAvatar.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "ChatConnectAvatar.h"
+
+//-----------------------------------------------------------------------
+
+ChatConnectAvatar::ChatConnectAvatar(const std::string & n, const NetworkId & i, const unsigned int s, bool secure, bool subscribed) :
+GameNetworkMessage("ChatConnectAvatar"),
+characterId(i),
+characterName(n),
+stationId(s),
+isSecure(secure),
+isSubscribed(subscribed)
+{
+	addVariable(characterId);
+	addVariable(characterName);
+	addVariable(stationId);
+	addVariable(isSecure);
+	addVariable(isSubscribed);
+}
+
+//-----------------------------------------------------------------------
+
+ChatConnectAvatar::ChatConnectAvatar(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatConnectAvatar"),
+characterId(),
+characterName(),
+stationId(),
+isSecure(false),
+isSubscribed(false)
+{
+	addVariable(characterId);
+	addVariable(characterName);
+	addVariable(stationId);
+	addVariable(isSecure);
+	addVariable(isSubscribed);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatConnectAvatar::~ChatConnectAvatar()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/ChatConnectAvatar.h b/engine/server/library/serverNetworkMessages/src/shared/ChatConnectAvatar.h
new file mode 100644
index 00000000..0dca1324
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/ChatConnectAvatar.h
@@ -0,0 +1,77 @@
+// ChatConnectAvatar.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatConnectAvatar_H
+#define	_INCLUDED_ChatConnectAvatar_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class ChatConnectAvatar : public GameNetworkMessage
+{
+public:
+	ChatConnectAvatar(const std::string & characterName, const NetworkId & characterId, const unsigned int stationId, bool isSecure, bool isSubscribed);
+	explicit ChatConnectAvatar(Archive::ReadIterator & source);
+	~ChatConnectAvatar();
+
+	const NetworkId &    getCharacterId    () const;
+	const std::string &  getCharacterName  () const;
+	const bool           getIsSecure       () const;
+	const bool           getIsSubscribed   () const;
+	const unsigned int   getStationId      () const;
+
+private:
+	ChatConnectAvatar & operator = (const ChatConnectAvatar & rhs);
+	ChatConnectAvatar(const ChatConnectAvatar & source);
+
+	Archive::AutoVariable<NetworkId>    characterId;
+	Archive::AutoVariable<std::string>  characterName;
+	Archive::AutoVariable<unsigned int> stationId;
+	Archive::AutoVariable<bool>         isSecure;
+	Archive::AutoVariable<bool>         isSubscribed;
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & ChatConnectAvatar::getCharacterId() const
+{
+	return characterId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatConnectAvatar::getCharacterName() const
+{
+	return characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ChatConnectAvatar::getIsSecure() const
+{
+	return isSecure.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ChatConnectAvatar::getIsSubscribed() const
+{
+	return isSubscribed.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatConnectAvatar::getStationId() const
+{
+	return stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatConnectAvatar_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/ChatDisconnectAvatar.cpp b/engine/server/library/serverNetworkMessages/src/shared/ChatDisconnectAvatar.cpp
new file mode 100644
index 00000000..bc09a8ea
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/ChatDisconnectAvatar.cpp
@@ -0,0 +1,36 @@
+// ChatDisconnectAvatar.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "ChatDisconnectAvatar.h"
+
+//-----------------------------------------------------------------------
+
+ChatDisconnectAvatar::ChatDisconnectAvatar(const NetworkId & i) :
+GameNetworkMessage("ChatDisconnectAvatar"),
+characterId(i)
+{
+	addVariable(characterId);
+}
+
+//-----------------------------------------------------------------------
+
+ChatDisconnectAvatar::ChatDisconnectAvatar(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatDisconnectAvatar"),
+characterId()
+{
+	addVariable(characterId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatDisconnectAvatar::~ChatDisconnectAvatar()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/ChatDisconnectAvatar.h b/engine/server/library/serverNetworkMessages/src/shared/ChatDisconnectAvatar.h
new file mode 100644
index 00000000..3b30b4c8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/ChatDisconnectAvatar.h
@@ -0,0 +1,39 @@
+// ChatDisconnectAvatar.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatDisconnectAvatar_H
+#define	_INCLUDED_ChatDisconnectAvatar_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatDisconnectAvatar : public GameNetworkMessage
+{
+public:
+	explicit ChatDisconnectAvatar(const NetworkId & characterId);
+	explicit ChatDisconnectAvatar(Archive::ReadIterator & source);
+	~ChatDisconnectAvatar();
+
+	const NetworkId &  getCharacterId  () const;
+
+private:
+	ChatDisconnectAvatar & operator = (const ChatDisconnectAvatar & rhs);
+	ChatDisconnectAvatar(const ChatDisconnectAvatar & source);
+
+	Archive::AutoVariable<NetworkId>  characterId;
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & ChatDisconnectAvatar::getCharacterId() const
+{
+	return characterId.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatDisconnectAvatar_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/ChatServerOnline.cpp b/engine/server/library/serverNetworkMessages/src/shared/ChatServerOnline.cpp
new file mode 100644
index 00000000..7e75b914
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/ChatServerOnline.cpp
@@ -0,0 +1,40 @@
+// ChatServerOnline.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ChatServerOnline.h"
+
+//-----------------------------------------------------------------------
+
+ChatServerOnline::ChatServerOnline(const std::string & a, const unsigned short p) :
+GameNetworkMessage("ChatServerOnline"),
+address(a),
+port(p)
+{
+	addVariable(address);
+	addVariable(port);
+}
+
+//-----------------------------------------------------------------------
+
+ChatServerOnline::ChatServerOnline(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatServerOnline"),
+address(),
+port()
+{
+	addVariable(address);
+	addVariable(port);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatServerOnline::~ChatServerOnline()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/ChatServerOnline.h b/engine/server/library/serverNetworkMessages/src/shared/ChatServerOnline.h
new file mode 100644
index 00000000..809339f9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/ChatServerOnline.h
@@ -0,0 +1,46 @@
+// ChatServerOnline.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatServerOnline_H
+#define	_INCLUDED_ChatServerOnline_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatServerOnline : public GameNetworkMessage
+{
+public:
+	ChatServerOnline(const std::string & address, const unsigned short port);
+	ChatServerOnline(Archive::ReadIterator & source);
+	~ChatServerOnline();
+
+	const std::string &   getAddress  () const;
+	const unsigned short  getPort     () const;
+
+private:
+	ChatServerOnline & operator = (const ChatServerOnline & rhs);
+	ChatServerOnline(const ChatServerOnline & source);
+
+	Archive::AutoVariable<std::string>     address;
+	Archive::AutoVariable<unsigned short>  port;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatServerOnline::getAddress() const
+{
+	return address.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned short ChatServerOnline::getPort() const
+{
+	return port.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatServerOnline_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/EnumerateServers.cpp b/engine/server/library/serverNetworkMessages/src/shared/EnumerateServers.cpp
new file mode 100644
index 00000000..6b424dd8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/EnumerateServers.cpp
@@ -0,0 +1,48 @@
+// EnumerateServers.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "EnumerateServers.h"
+
+//-----------------------------------------------------------------------
+
+EnumerateServers::EnumerateServers(const bool a, const std::string addr, const unsigned short p, const int t) :
+GameNetworkMessage("EnumerateServers"),
+add(a),
+address(addr),
+port(p),
+serverType(t)
+{
+	addVariable(add);
+	addVariable(address);
+	addVariable(port);
+	addVariable(serverType);
+}
+
+//-----------------------------------------------------------------------
+
+EnumerateServers::EnumerateServers(Archive::ReadIterator & source) :
+GameNetworkMessage("EnumerateServers"),
+add(),
+address(),
+port(),
+serverType()
+{
+	addVariable(add);
+	addVariable(address);
+	addVariable(port);
+	addVariable(serverType);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+EnumerateServers::~EnumerateServers()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/EnumerateServers.h b/engine/server/library/serverNetworkMessages/src/shared/EnumerateServers.h
new file mode 100644
index 00000000..9d860570
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/EnumerateServers.h
@@ -0,0 +1,73 @@
+// EnumerateServers.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_EnumerateServers_H
+#define	_INCLUDED_EnumerateServers_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class EnumerateServers : public GameNetworkMessage
+{
+public:
+	enum ServerTypes
+	{
+		CONNECTION_SERVER,
+		GAME_SERVER,
+		PLANET_SERVER
+	};
+
+	EnumerateServers(const bool add, const std::string address, const unsigned short port, const int serverType);
+	explicit EnumerateServers(Archive::ReadIterator & source);
+	~EnumerateServers();
+
+	const bool             getAdd         () const;
+	const std::string &    getAddress     () const;
+	const unsigned short   getPort        () const;
+	const int              getServerType  () const;
+
+private:
+	EnumerateServers & operator = (const EnumerateServers & rhs);
+	EnumerateServers(const EnumerateServers & source);
+
+	Archive::AutoVariable<bool>            add;
+	Archive::AutoVariable<std::string>     address;
+	Archive::AutoVariable<unsigned short>  port;
+	Archive::AutoVariable<int>             serverType;
+};
+
+//-----------------------------------------------------------------------
+
+inline const bool EnumerateServers::getAdd() const
+{
+	return add.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & EnumerateServers::getAddress() const
+{
+	return address.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned short EnumerateServers::getPort() const
+{
+	return port.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const int EnumerateServers::getServerType() const
+{
+	return serverType.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_EnumerateServers_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/RandomName.cpp b/engine/server/library/serverNetworkMessages/src/shared/RandomName.cpp
new file mode 100644
index 00000000..2bd0366b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/RandomName.cpp
@@ -0,0 +1,82 @@
+//------------------------------------------
+// CentralConnectionServerMessages.cpp
+// copyright 2001 Sony Online Entertainment
+//------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/RandomName.h"
+
+//====================================================================
+
+RandomNameRequest::RandomNameRequest(uint32 stationId, const std::string & creatureTemplate) :
+GameNetworkMessage("RandomNameRequest"),
+m_stationId(stationId),
+m_creatureTemplate(creatureTemplate)
+{
+	addVariable(m_stationId);
+	addVariable(m_creatureTemplate);
+}
+
+//-----------------------------------------------------------------------
+
+RandomNameRequest::RandomNameRequest(Archive::ReadIterator & source) :
+GameNetworkMessage("RandomNameRequest"),
+m_stationId(),
+m_creatureTemplate()
+{
+	addVariable(m_stationId);
+	addVariable(m_creatureTemplate);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RandomNameRequest::~RandomNameRequest()
+{
+}
+
+//-----------------------------------------------------------------------
+
+RandomNameResponse::RandomNameResponse(uint32 stationId, const std::string & creatureTemplate, const Unicode::String &name, const StringId &errorMessage) :
+GameNetworkMessage("RandomNameResponse"),
+m_stationId(stationId),
+m_creatureTemplate(creatureTemplate),
+m_name(name),
+m_errorMessage(errorMessage)
+{
+	addVariable(m_stationId);
+	addVariable(m_creatureTemplate);
+	addVariable(m_name);
+	addVariable(m_errorMessage);
+}
+
+//-----------------------------------------------------------------------
+
+RandomNameResponse::RandomNameResponse(Archive::ReadIterator & source) :
+GameNetworkMessage("RandomNameResponse"),
+m_stationId(),
+m_creatureTemplate(),
+m_name(),
+m_errorMessage()
+{
+	addVariable(m_stationId);
+	addVariable(m_creatureTemplate);
+	addVariable(m_name);
+	addVariable(m_errorMessage);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RandomNameResponse::~RandomNameResponse()
+{
+}
+
+// ======================================================================
+
+
+
+
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/RandomName.h b/engine/server/library/serverNetworkMessages/src/shared/RandomName.h
new file mode 100644
index 00000000..e36b4734
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/RandomName.h
@@ -0,0 +1,94 @@
+// RandomName.h
+// copyright 2001 Verant Interactive
+
+#ifndef	_INCLUDED_RandomName_H
+#define	_INCLUDED_RandomName_H
+
+//-----------------------------------------------------------------------
+
+class RandomNameRequest: public GameNetworkMessage
+{
+public:
+	explicit RandomNameRequest(uint32 stationId, const std::string &creatureTemplate);
+	explicit RandomNameRequest(Archive::ReadIterator & source);
+	~RandomNameRequest();
+
+	const uint32 getStationId() const;
+	const std::string &getCreatureTemplate() const;
+private:
+	Archive::AutoVariable<uint32> m_stationId;
+	Archive::AutoVariable<std::string> m_creatureTemplate;
+
+	RandomNameRequest(const RandomNameRequest & source);
+	RandomNameRequest & operator = (const RandomNameRequest & other);
+};
+
+//--------------------------------------------------------------------
+
+inline const uint32 RandomNameRequest::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const std::string &RandomNameRequest::getCreatureTemplate() const
+{
+	return m_creatureTemplate.get();
+}
+
+//-----------------------------------------------------------------------
+
+class RandomNameResponse: public GameNetworkMessage
+{
+public:
+	explicit RandomNameResponse(uint32 stationId, const std::string &creatureTemplate, const Unicode::String &name, const StringId &errorMessage);
+	explicit RandomNameResponse(Archive::ReadIterator & source);
+	~RandomNameResponse();
+
+	const uint32 getStationId() const;
+	const std::string &getCreatureTemplate() const;
+	const Unicode::String &getName() const;
+	const StringId &getErrorMessage() const;
+private:
+	Archive::AutoVariable<uint32> m_stationId;
+	Archive::AutoVariable<std::string> m_creatureTemplate;
+	Archive::AutoVariable<Unicode::String> m_name;
+	Archive::AutoVariable<StringId> m_errorMessage;
+
+	RandomNameResponse(const RandomNameRequest & source);
+	RandomNameResponse & operator = (const RandomNameRequest & other);
+};
+
+//--------------------------------------------------------------------
+
+inline const std::string &RandomNameResponse::getCreatureTemplate() const
+{
+	return m_creatureTemplate.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const uint32 RandomNameResponse::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const Unicode::String &RandomNameResponse::getName() const
+{
+	return m_name.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const StringId &RandomNameResponse::getErrorMessage() const
+{
+	return m_errorMessage.get();
+}
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.cpp
new file mode 100644
index 00000000..525fc1b6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.cpp
@@ -0,0 +1,58 @@
+// TaskConnectionIdMessage.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "TaskConnectionIdMessage.h"
+
+//-----------------------------------------------------------------------
+
+TaskConnectionIdMessage::TaskConnectionIdMessage(enum Id id, const std::string & pCommandLine, const std::string & pClusterName) :
+GameNetworkMessage("TaskConnectionIdMessage"),
+serverType(static_cast<unsigned char>(id)),
+commandLine(pCommandLine),
+clusterName(pClusterName),
+currentEpochTime(static_cast<long>(::time(NULL)))
+{
+	addVariable(serverType);
+	addVariable(commandLine);
+	addVariable(clusterName);
+	addVariable(currentEpochTime);
+}
+
+//-----------------------------------------------------------------------
+
+TaskConnectionIdMessage::TaskConnectionIdMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("TaskConnectionIdMessage"),
+serverType(0),
+commandLine(),
+clusterName(),
+currentEpochTime(0)
+{
+	addVariable(serverType);
+	addVariable(commandLine);
+	addVariable(clusterName);
+	addVariable(currentEpochTime);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TaskConnectionIdMessage::~TaskConnectionIdMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+TaskConnectionIdMessage & TaskConnectionIdMessage::operator = (const TaskConnectionIdMessage & rhs)
+{
+	if(this != &rhs)
+	{
+		// make assignments if right hand side is not this instance
+	}
+	return *this;
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.h b/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.h
new file mode 100644
index 00000000..ce5e5735
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskConnectionIdMessage.h
@@ -0,0 +1,78 @@
+// TaskConnectionIdMessage.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_TaskConnectionIdMessage_H
+#define	_INCLUDED_TaskConnectionIdMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class TaskConnectionIdMessage : public GameNetworkMessage
+{
+public:
+	enum Id
+	{
+		Login,
+		Central,
+		Connection,
+		Database,
+		Metrics,
+		Planet,
+		Game,
+		ServerManager,
+		TaskManager
+	};
+public:
+	TaskConnectionIdMessage(enum Id id, const std::string & pCommandLine, const std::string & pClusterName);
+	TaskConnectionIdMessage(Archive::ReadIterator & source);
+	~TaskConnectionIdMessage();
+
+	const unsigned char  getServerType   () const;
+	const std::string &  getCommandLine  () const;
+	const std::string &  getClusterName  () const;
+	const long           getCurrentEpochTime() const;
+private:
+	TaskConnectionIdMessage & operator = (const TaskConnectionIdMessage & rhs);
+	TaskConnectionIdMessage(const TaskConnectionIdMessage & source);
+
+	Archive::AutoVariable<unsigned char> serverType;
+	Archive::AutoVariable<std::string>   commandLine;
+	Archive::AutoVariable<std::string>   clusterName;
+	Archive::AutoVariable<long>          currentEpochTime;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & TaskConnectionIdMessage::getCommandLine() const
+{
+	return commandLine.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & TaskConnectionIdMessage::getClusterName() const
+{
+	return clusterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned char TaskConnectionIdMessage::getServerType() const
+{
+	return serverType.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const long TaskConnectionIdMessage::getCurrentEpochTime() const
+{
+	return currentEpochTime.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_TaskConnectionIdMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskEnumCluster.cpp b/engine/server/library/serverNetworkMessages/src/shared/TaskEnumCluster.cpp
new file mode 100644
index 00000000..aed208ca
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskEnumCluster.cpp
@@ -0,0 +1,37 @@
+// TaskEnumCluster.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "TaskEnumCluster.h"
+
+//-----------------------------------------------------------------------
+
+TaskEnumCluster::TaskEnumCluster(const std::vector<std::string> & n) :
+GameNetworkMessage("TaskEnumCluster"),
+clusterNames()
+{
+	clusterNames.set(n);
+	addVariable(clusterNames);
+}
+
+//-----------------------------------------------------------------------
+
+TaskEnumCluster::TaskEnumCluster(Archive::ReadIterator & source) :
+GameNetworkMessage("TaskEnumCluster"),
+clusterNames()
+{
+	addVariable(clusterNames);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TaskEnumCluster::~TaskEnumCluster()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskEnumCluster.h b/engine/server/library/serverNetworkMessages/src/shared/TaskEnumCluster.h
new file mode 100644
index 00000000..78a5ffa6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskEnumCluster.h
@@ -0,0 +1,40 @@
+// TaskEnumCluster.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_TaskEnumCluster_H
+#define	_INCLUDED_TaskEnumCluster_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class TaskEnumCluster : public GameNetworkMessage
+{
+public:
+	explicit TaskEnumCluster(const std::vector<std::string> & clusterNames);
+	explicit TaskEnumCluster(Archive::ReadIterator & s);
+	~TaskEnumCluster();
+
+	const std::vector<std::string> & getClusterNames() const;
+
+private:
+	TaskEnumCluster & operator = (const TaskEnumCluster & rhs);
+	TaskEnumCluster(const TaskEnumCluster & source);
+
+private:
+	Archive::AutoArray<std::string>  clusterNames;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::vector<std::string> & TaskEnumCluster::getClusterNames() const
+{
+	return clusterNames.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_TaskEnumCluster_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskEnumProcesses.cpp b/engine/server/library/serverNetworkMessages/src/shared/TaskEnumProcesses.cpp
new file mode 100644
index 00000000..0f390d2c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskEnumProcesses.cpp
@@ -0,0 +1,50 @@
+// TaskEnumProcesses.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "TaskEnumProcesses.h"
+
+//-----------------------------------------------------------------------
+
+TaskEnumProcesses::TaskEnumProcesses(const std::string & h, const std::vector<std::string> & c, const std::vector<uint32> & p, const std::vector<bool> & l) :
+GameNetworkMessage("TaskEnumProcesses"),
+commandLines(),
+hostAddress(h),
+loadedOnStartup(),
+pids()
+{
+	commandLines.set(c);
+	loadedOnStartup.set(l);
+	pids.set(p);
+	addVariable(hostAddress);
+	addVariable(commandLines);
+	addVariable(loadedOnStartup);
+	addVariable(pids);
+}
+
+//-----------------------------------------------------------------------
+
+TaskEnumProcesses::TaskEnumProcesses(Archive::ReadIterator & source) :
+GameNetworkMessage("TaskEnumProcesses"),
+commandLines(),
+hostAddress(),
+pids()
+{
+	addVariable(hostAddress);
+	addVariable(commandLines);
+	addVariable(loadedOnStartup);
+	addVariable(pids);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TaskEnumProcesses::~TaskEnumProcesses()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskEnumProcesses.h b/engine/server/library/serverNetworkMessages/src/shared/TaskEnumProcesses.h
new file mode 100644
index 00000000..7375eddc
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskEnumProcesses.h
@@ -0,0 +1,68 @@
+// TaskEnumProcesses.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_TaskEnumProcesses_H
+#define	_INCLUDED_TaskEnumProcesses_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/NetworkMessageFactory.h"
+
+//-----------------------------------------------------------------------
+
+class TaskEnumProcesses : public GameNetworkMessage
+{
+public:
+	TaskEnumProcesses(const std::string & hostAddress, const std::vector<std::string> & commandLines, const std::vector<uint32> & pids, const std::vector<bool> & loadedOnStartup);
+	TaskEnumProcesses(Archive::ReadIterator & source);
+	~TaskEnumProcesses();
+
+	const std::vector<std::string> &    getCommandLines     () const;
+	const std::string  &                getHostAddress      () const;
+	const std::vector<bool> &           getLoadedOnStartup  () const;
+	const std::vector<uint32> &         getPids             () const;
+
+private:
+	TaskEnumProcesses & operator = (const TaskEnumProcesses & rhs);
+	TaskEnumProcesses(const TaskEnumProcesses & source);
+
+private:
+	Archive::AutoArray<std::string>     commandLines;
+	Archive::AutoVariable<std::string>  hostAddress;
+	Archive::AutoArray<bool>            loadedOnStartup;
+	Archive::AutoArray<uint32>          pids;
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const std::vector<std::string> & TaskEnumProcesses::getCommandLines() const
+{
+	return commandLines.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & TaskEnumProcesses::getHostAddress() const
+{
+	return hostAddress.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::vector<bool> & TaskEnumProcesses::getLoadedOnStartup() const
+{
+	return loadedOnStartup.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::vector<uint32> & TaskEnumProcesses::getPids() const
+{
+	return pids.get();
+}
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_TaskEnumProcesses_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskKillProcess.cpp b/engine/server/library/serverNetworkMessages/src/shared/TaskKillProcess.cpp
new file mode 100644
index 00000000..5a12e725
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskKillProcess.cpp
@@ -0,0 +1,44 @@
+// TaskKillProcess.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "TaskKillProcess.h"
+
+//-----------------------------------------------------------------------
+
+TaskKillProcess::TaskKillProcess(const std::string & h, const unsigned int p, bool f) :
+GameNetworkMessage("TaskKillProcess"),
+m_hostName(h),
+m_pid(p),
+m_forceCore(f)
+{
+	addVariable(m_hostName);
+	addVariable(m_pid);
+	addVariable(m_forceCore);
+}
+
+//-----------------------------------------------------------------------
+
+TaskKillProcess::TaskKillProcess(Archive::ReadIterator & source) :
+GameNetworkMessage("TaskKillProcess"),
+m_hostName(),
+m_pid(),
+m_forceCore()
+{
+	addVariable(m_hostName);
+	addVariable(m_pid);
+	addVariable(m_forceCore);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TaskKillProcess::~TaskKillProcess()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskKillProcess.h b/engine/server/library/serverNetworkMessages/src/shared/TaskKillProcess.h
new file mode 100644
index 00000000..36bdec07
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskKillProcess.h
@@ -0,0 +1,59 @@
+// TaskKillProcess.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_TaskKillProcess_H
+#define	_INCLUDED_TaskKillProcess_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/NetworkMessageFactory.h"
+
+//-----------------------------------------------------------------------
+
+class TaskKillProcess : public GameNetworkMessage
+{
+public:
+	TaskKillProcess(const std::string & hostName, const unsigned int pid, bool forceCore);
+	TaskKillProcess(Archive::ReadIterator & source);
+	~TaskKillProcess();
+
+	const std::string &  getHostName     () const;
+	const unsigned int   getPid          () const;
+	const bool           getForceCore    () const;
+
+private:
+	TaskKillProcess & operator = (const TaskKillProcess & rhs);
+	TaskKillProcess(const TaskKillProcess & source);
+
+	Archive::AutoVariable<std::string>   m_hostName;
+	Archive::AutoVariable<unsigned int>  m_pid;
+	Archive::AutoVariable<bool>          m_forceCore;
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const std::string & TaskKillProcess::getHostName() const
+{
+	return m_hostName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int TaskKillProcess::getPid() const
+{
+	return m_pid.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool TaskKillProcess::getForceCore() const
+{
+	return m_forceCore.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_TaskKillProcess_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcess.cpp b/engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcess.cpp
new file mode 100644
index 00000000..d1cfd1cb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcess.cpp
@@ -0,0 +1,73 @@
+// TaskSpawnProcess.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "TaskSpawnProcess.h"
+
+//-----------------------------------------------------------------------
+
+namespace TaskSpawnProcessNamespace
+{
+	int  s_transactionId = 0;
+}
+using namespace TaskSpawnProcessNamespace;
+
+//-----------------------------------------------------------------------
+
+TaskSpawnProcess::TaskSpawnProcess(const std::string & h, const std::string & p, const std::string & o, const unsigned int d/* = 0*/) :
+GameNetworkMessage("TaskSpawnProcess"),
+options(o),
+processName(p),
+targetHostAddress(h),
+transactionId(++s_transactionId),
+spawnDelay(d)
+{
+	addVariable(options);
+	addVariable(processName);
+	addVariable(targetHostAddress);
+	addVariable(transactionId);
+	addVariable(spawnDelay);
+}
+
+//-----------------------------------------------------------------------
+
+TaskSpawnProcess::TaskSpawnProcess(Archive::ReadIterator & source) :
+GameNetworkMessage("TaskSpawnProcess"),
+options(),
+processName(),
+targetHostAddress(),
+transactionId(),
+spawnDelay(0)
+{
+	addVariable(options);
+	addVariable(processName);
+	addVariable(targetHostAddress);
+	addVariable(transactionId);
+	addVariable(spawnDelay);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TaskSpawnProcess::~TaskSpawnProcess()
+{
+}
+
+//-----------------------------------------------------------------------
+
+int TaskSpawnProcess::getTransactionId() const
+{
+	return transactionId.get();
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TaskSpawnProcess::getSpawnDelay() const
+{
+	return spawnDelay.get();
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcess.h b/engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcess.h
new file mode 100644
index 00000000..840f44c5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcess.h
@@ -0,0 +1,61 @@
+// TaskSpawnProcess.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_TaskSpawnProcess_H
+#define	_INCLUDED_TaskSpawnProcess_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class TaskSpawnProcess : public GameNetworkMessage
+{
+public:
+	TaskSpawnProcess(const std::string & targetHostAddress, const std::string & processName, const std::string & options, unsigned int spawnDelay = 0);
+	TaskSpawnProcess(Archive::ReadIterator & r);
+	~TaskSpawnProcess();
+
+	const std::string &              getOptions            () const;
+	const std::string &              getProcessName        () const;
+	const std::string &              getTargetHostAddress  () const;
+	int                              getTransactionId      () const;
+	unsigned int                     getSpawnDelay         () const;
+
+private:
+	TaskSpawnProcess & operator = (const TaskSpawnProcess & rhs);
+	TaskSpawnProcess(const TaskSpawnProcess & source);
+
+	Archive::AutoVariable<std::string>    options;
+	Archive::AutoVariable<std::string>    processName;
+	Archive::AutoVariable<std::string>    targetHostAddress;
+	Archive::AutoVariable<int>            transactionId;
+	Archive::AutoVariable<unsigned int>   spawnDelay;	// seconds
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & TaskSpawnProcess::getOptions() const
+{
+	return options.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & TaskSpawnProcess::getProcessName() const
+{
+	return processName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & TaskSpawnProcess::getTargetHostAddress() const
+{
+	return targetHostAddress.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_TaskSpawnProcess_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcessAck.cpp b/engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcessAck.cpp
new file mode 100644
index 00000000..acf5e832
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcessAck.cpp
@@ -0,0 +1,43 @@
+// TaskSpawnProcessAck.cpp
+// Copyright 2000-04, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "TaskSpawnProcessAck.h"
+
+//-----------------------------------------------------------------------
+
+TaskSpawnProcessAck::TaskSpawnProcessAck(const int transactionId) :
+GameNetworkMessage("TaskSpawnProcessAck"),
+m_transactionId(transactionId)
+{
+	addVariable(m_transactionId);
+}
+
+//-----------------------------------------------------------------------
+
+TaskSpawnProcessAck::TaskSpawnProcessAck(Archive::ReadIterator & source) :
+GameNetworkMessage("TaskSpawnProcessAck"),
+m_transactionId()
+{
+	addVariable(m_transactionId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TaskSpawnProcessAck::~TaskSpawnProcessAck()
+{
+}
+
+//-----------------------------------------------------------------------
+
+int TaskSpawnProcessAck::getTransactionId() const
+{
+	return m_transactionId.get();
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcessAck.h b/engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcessAck.h
new file mode 100644
index 00000000..02bd78a1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskSpawnProcessAck.h
@@ -0,0 +1,32 @@
+// TaskSpawnProcessAck.h
+// Copyright 2000-04, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_TaskSpawnProcessAck_H
+#define	_INCLUDED_TaskSpawnProcessAck_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class TaskSpawnProcessAck : public GameNetworkMessage
+{
+public:
+	TaskSpawnProcessAck(int transactionId);
+	TaskSpawnProcessAck(Archive::ReadIterator & r);
+	~TaskSpawnProcessAck();
+
+	int  getTransactionId  () const;
+
+private:
+	TaskSpawnProcessAck & operator = (const TaskSpawnProcessAck & rhs);
+	TaskSpawnProcessAck(const TaskSpawnProcessAck & source);
+
+	Archive::AutoVariable<int>            m_transactionId;
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_TaskSpawnProcessAck_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskUtilization.cpp b/engine/server/library/serverNetworkMessages/src/shared/TaskUtilization.cpp
new file mode 100644
index 00000000..561e2853
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskUtilization.cpp
@@ -0,0 +1,51 @@
+// TaskUtilization.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "TaskUtilization.h"
+
+//-----------------------------------------------------------------------
+
+TaskUtilization::TaskUtilization(const unsigned char t, const float a) :
+GameNetworkMessage("TaskUtilization"),
+utilType(t),
+utilAmount(a)
+{
+	addVariable(utilType);
+	addVariable(utilAmount);
+}
+
+//-----------------------------------------------------------------------
+
+TaskUtilization::TaskUtilization(Archive::ReadIterator & source) :
+GameNetworkMessage("TaskUtilization"),
+utilType(0),
+utilAmount(0)
+{
+	addVariable(utilType);
+	addVariable(utilAmount);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TaskUtilization::~TaskUtilization()
+{
+}
+
+//-----------------------------------------------------------------------
+
+TaskUtilization & TaskUtilization::operator = (const TaskUtilization & rhs)
+{
+	if(this != &rhs)
+	{
+		// make assignments if right hand side is not this instance
+	}
+	return *this;
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/TaskUtilization.h b/engine/server/library/serverNetworkMessages/src/shared/TaskUtilization.h
new file mode 100644
index 00000000..11e7a93c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/TaskUtilization.h
@@ -0,0 +1,58 @@
+// TaskUtilization.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_TaskUtilization_H
+#define	_INCLUDED_TaskUtilization_H
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+      
+class TaskUtilization : public GameNetworkMessage
+{
+public:
+	enum UtilTypes
+	{
+		SYSTEM_CPU,
+		SYSTEM_MEMORY,
+		SYSTEM_NETWORK_IO,
+		SYSTEM_AVG,
+		PROCESS_CPU,
+		PROCESS_MEMORY,
+		PROCESS_NETWORK_IO
+	};
+
+	TaskUtilization(const unsigned char utilType, const float utilAmount);
+	TaskUtilization(Archive::ReadIterator & source);
+	~TaskUtilization();
+
+	const unsigned char  getUtilType() const;
+	const float          getUtilAmount() const;
+
+private:
+	TaskUtilization & operator = (const TaskUtilization & rhs);
+	TaskUtilization(const TaskUtilization & source);
+
+	Archive::AutoVariable<unsigned char>  utilType;
+	Archive::AutoVariable<float>          utilAmount;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned char TaskUtilization::getUtilType() const
+{
+	return utilType.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const float TaskUtilization::getUtilAmount() const
+{
+	return utilAmount.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_TaskUtilization_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/VerifyAndLockName.cpp b/engine/server/library/serverNetworkMessages/src/shared/VerifyAndLockName.cpp
new file mode 100644
index 00000000..f25e6579
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/VerifyAndLockName.cpp
@@ -0,0 +1,94 @@
+// ======================================================================
+//
+// FileManifest.h
+// Copyright 2005 Sony Online Entertainment
+// All Rights Reserved.
+// Author: Vijay Thakkar
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/VerifyAndLockName.h"
+
+//====================================================================
+
+VerifyAndLockNameRequest::VerifyAndLockNameRequest(uint32 stationId, const NetworkId & characterId, const std::string& templateName, const Unicode::String& characterName, uint32 gameFeatures) :
+GameNetworkMessage("VerifyAndLockNameRequest"),
+m_stationId(stationId),
+m_characterId(characterId),
+m_templateName(templateName),
+m_characterName(characterName),
+m_gameFeatures(gameFeatures)
+{
+	addVariable(m_stationId);
+	addVariable(m_characterId);
+	addVariable(m_templateName);
+	addVariable(m_characterName);
+	addVariable(m_gameFeatures);
+}
+
+//-----------------------------------------------------------------------
+
+VerifyAndLockNameRequest::VerifyAndLockNameRequest(Archive::ReadIterator & source) :
+GameNetworkMessage("VerifyAndLockNameRequest"),
+m_stationId(),
+m_characterId(),
+m_templateName(),
+m_characterName(),
+m_gameFeatures()
+{
+	addVariable(m_stationId);
+	addVariable(m_characterId);
+	addVariable(m_templateName);
+	addVariable(m_characterName);
+	addVariable(m_gameFeatures);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+VerifyAndLockNameRequest::~VerifyAndLockNameRequest()
+{
+}
+
+//-----------------------------------------------------------------------
+
+VerifyAndLockNameResponse::VerifyAndLockNameResponse(uint32 stationId, const Unicode::String& characterName, const StringId &errorMessage) :
+GameNetworkMessage("VerifyAndLockNameResponse"),
+m_stationId(stationId),
+m_characterName(characterName),
+m_errorMessage(errorMessage)
+{
+	addVariable(m_stationId);
+	addVariable(m_characterName);
+	addVariable(m_errorMessage);
+}
+
+//-----------------------------------------------------------------------
+
+VerifyAndLockNameResponse::VerifyAndLockNameResponse(Archive::ReadIterator & source) :
+GameNetworkMessage("VerifyAndLockNameResponse"),
+m_stationId(),
+m_characterName(),
+m_errorMessage()
+{
+	addVariable(m_stationId);
+	addVariable(m_characterName);
+	addVariable(m_errorMessage);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+VerifyAndLockNameResponse::~VerifyAndLockNameResponse()
+{
+}
+
+// ======================================================================
+
+
+
+
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/VerifyAndLockName.h b/engine/server/library/serverNetworkMessages/src/shared/VerifyAndLockName.h
new file mode 100644
index 00000000..459ad045
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/VerifyAndLockName.h
@@ -0,0 +1,123 @@
+// ======================================================================
+//
+// FileManifest.h
+// Copyright 2005 Sony Online Entertainment
+// All Rights Reserved.
+// Author: Vijay Thakkar
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_VerifyAnyLockName_H
+#define	_INCLUDED_VerifyAnyLockName_H
+
+//-----------------------------------------------------------------------
+
+#include "StringId.h"
+#include "Unicode.h"
+
+//-----------------------------------------------------------------------
+
+class VerifyAndLockNameRequest: public GameNetworkMessage
+{
+public:
+	explicit VerifyAndLockNameRequest(uint32 stationId, const NetworkId & characterId, const std::string& templateName, const Unicode::String& characterName, uint32 gameFeatures);
+	explicit VerifyAndLockNameRequest(Archive::ReadIterator & source);
+	~VerifyAndLockNameRequest();
+
+	const uint32                           getStationId() const;
+	const NetworkId &                      getCharacterId() const;
+	const std::string&                     getTemplateName() const;
+	const Unicode::String&                 getCharacterName() const;
+	const uint32                           getGameFeatures() const;
+private:
+	Archive::AutoVariable<uint32>           m_stationId;
+	Archive::AutoVariable<NetworkId>        m_characterId;
+	Archive::AutoVariable<std::string>      m_templateName;
+	Archive::AutoVariable<Unicode::String>  m_characterName;
+	Archive::AutoVariable<uint32>           m_gameFeatures;
+
+	VerifyAndLockNameRequest(const VerifyAndLockNameRequest & source);
+	VerifyAndLockNameRequest & operator = (const VerifyAndLockNameRequest & other);
+};
+
+//--------------------------------------------------------------------
+
+inline const uint32 VerifyAndLockNameRequest::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const NetworkId & VerifyAndLockNameRequest::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const std::string& VerifyAndLockNameRequest::getTemplateName() const
+{
+	return m_templateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String& VerifyAndLockNameRequest::getCharacterName() const
+{
+	return m_characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint32 VerifyAndLockNameRequest::getGameFeatures() const
+{
+	return m_gameFeatures.get();
+}
+
+//-----------------------------------------------------------------------
+
+class VerifyAndLockNameResponse: public GameNetworkMessage
+{
+public:
+	explicit VerifyAndLockNameResponse(uint32 stationId, const Unicode::String &characterName, const StringId& errorMessage);
+	explicit VerifyAndLockNameResponse(Archive::ReadIterator & source);
+	~VerifyAndLockNameResponse();
+
+	const uint32                            getStationId() const;
+	const Unicode::String&                  getCharacterName() const;
+	const StringId&                         getErrorMessage() const;
+private:
+	Archive::AutoVariable<uint32>           m_stationId;
+	Archive::AutoVariable<Unicode::String>  m_characterName;
+	Archive::AutoVariable<StringId>         m_errorMessage;
+
+	VerifyAndLockNameResponse(const VerifyAndLockNameRequest & source);
+	VerifyAndLockNameResponse & operator = (const VerifyAndLockNameRequest & other);
+};
+
+//--------------------------------------------------------------------
+
+inline const uint32 VerifyAndLockNameResponse::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const Unicode::String &VerifyAndLockNameResponse::getCharacterName() const
+{
+	return m_characterName.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const StringId &VerifyAndLockNameResponse::getErrorMessage() const
+{
+	return m_errorMessage.get();
+}
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/CentralConnectionServerMessages.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/CentralConnectionServerMessages.cpp
new file mode 100644
index 00000000..529bdee9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/CentralConnectionServerMessages.cpp
@@ -0,0 +1,350 @@
+//------------------------------------------
+// CentralConnectionServerMessages.cpp
+// copyright 2001 Sony Online Entertainment
+//------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CentralConnectionServerMessages.h"
+
+//-----------------------------------------------------------------------
+
+NewCentralConnectionServer::NewCentralConnectionServer(const std::string & address, const std::string & csa, const std::string & chatAddr, const std::string & customerAddr, const uint16 clientPortPrivate, const uint16 clientPortPublic, const uint16 gamePort, const uint16 chatPort, const uint16 _customerServicePort, const uint16 pingPort, const int connectionServerNumber) : 
+GameNetworkMessage        ("NewCentralConnectionServer"),
+chatServicePort           (chatPort),
+customerServicePort       (_customerServicePort),
+clientServicePortPrivate  (clientPortPrivate),
+clientServicePortPublic   (clientPortPublic),
+gameServicePort           (gamePort),
+m_pingPort                (pingPort),
+m_connectionServerNumber  (connectionServerNumber),
+serviceAddress            (address),
+clientServiceAddress      (csa),
+chatServiceAddress        (chatAddr),
+customerServiceAddress    (customerAddr)
+{
+	addVariable(chatServicePort);
+	addVariable(customerServicePort);
+	addVariable(clientServicePortPrivate);
+	addVariable(clientServicePortPublic);
+	addVariable(gameServicePort);
+	addVariable(m_pingPort);
+	addVariable(m_connectionServerNumber);
+	addVariable(serviceAddress);
+	addVariable(clientServiceAddress);
+	addVariable(chatServiceAddress);
+	addVariable(customerServiceAddress);
+}
+
+//-----------------------------------------------------------------------
+
+NewCentralConnectionServer::NewCentralConnectionServer(Archive::ReadIterator & source) : 
+GameNetworkMessage        ("NewCentralConnectionServer"),
+chatServicePort           (0),
+customerServicePort(0),
+clientServicePortPrivate  (0),
+clientServicePortPublic   (0),
+gameServicePort           (0),
+m_pingPort                (0),
+m_connectionServerNumber  (0),
+serviceAddress            (),
+clientServiceAddress      (),
+chatServiceAddress        (),
+customerServiceAddress    ()
+{
+	addVariable(chatServicePort);
+	addVariable(customerServicePort);
+	addVariable(clientServicePortPrivate);
+	addVariable(clientServicePortPublic);
+	addVariable(gameServicePort);
+	addVariable(m_pingPort);
+	addVariable(m_connectionServerNumber);
+	addVariable(serviceAddress);
+	addVariable(clientServiceAddress);
+	addVariable(chatServiceAddress);
+	addVariable(customerServiceAddress);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+NewCentralConnectionServer::~NewCentralConnectionServer()
+{
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionServerId::ConnectionServerId(int newId) :
+		GameNetworkMessage("ConnectionServerId"),
+		m_id(newId)
+{
+	addVariable(m_id);
+}
+
+//-----------------------------------------------------------------------
+ConnectionServerId::ConnectionServerId(Archive::ReadIterator & source) :
+		GameNetworkMessage("ConnectionServerId"),
+		m_id(0)
+{
+	addVariable(m_id);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionServerId::~ConnectionServerId()
+{
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionKeyPush::ConnectionKeyPush(const KeyShare::Key & sourceKey) :
+GameNetworkMessage("ConnectionKeyPush"),
+key(sourceKey)
+{
+	addVariable(key);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionKeyPush::ConnectionKeyPush(Archive::ReadIterator & source) :
+GameNetworkMessage("ConnectionKeyPush"),
+key()
+{
+	addVariable(key);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionKeyPush::~ConnectionKeyPush()
+{
+}
+//-----------------------------------------------------------------------
+
+LoggedInMessage::LoggedInMessage(uint32 accountNumber) :
+	GameNetworkMessage("LoggedInMessage"),
+	m_accountNumber(accountNumber)
+{
+	addVariable(m_accountNumber);
+}
+
+//-----------------------------------------------------------------------
+
+LoggedInMessage::LoggedInMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("LoggedInMessage"),
+		m_accountNumber()
+{
+	addVariable(m_accountNumber);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoggedInMessage::~LoggedInMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+ConnEnumerateCharacterId::ConnEnumerateCharacterId(uint32 newAccountNumber, const Unicode::String & newName, const std::string & newLocation, const std::string & newObjectTemplate) :
+GameNetworkMessage("ConnEnumerateCharacterId"),
+accountNumber(newAccountNumber),
+location(newLocation),
+name(newName),
+objectTemplate(newObjectTemplate)
+{
+    addVariable(accountNumber);
+    addVariable(location);
+    addVariable(name);
+    addVariable(objectTemplate);
+}
+
+//-----------------------------------------------------------------------
+
+ConnEnumerateCharacterId::ConnEnumerateCharacterId(Archive::ReadIterator & source) :
+GameNetworkMessage("ConnEnumerateCharacterId"),
+accountNumber(0),
+location(),
+name(),
+objectTemplate()
+{
+    addVariable(accountNumber);
+    addVariable(location);
+    addVariable(name);
+    addVariable(objectTemplate);
+    unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ConnEnumerateCharacterId::~ConnEnumerateCharacterId()
+{
+}
+
+//-----------------------------------------------------------------------
+ConnectionCreateCharacter::ConnectionCreateCharacter(const uint32 newStationId, const Unicode::String & newCharacterName, const std::string & newTemplateName, float scaleFactor, const std::string & newStartingLocation, const std::string & newAppearanceData, const std::string & newHairTemplateName, const std::string & hairAppearanceData, const std::string & profession, bool jedi, const Unicode::String & biography, bool useNewbieTutorial, const std::string & skillTemplate, const std::string & workingSkill, bool noRateLimit, bool isForCharacterTransfer, uint32 gameFeatures) :
+		GameNetworkMessage("ConnectionCreateCharacter"),
+		m_appearanceData(newAppearanceData),
+		m_characterName(newCharacterName),
+		m_templateName(newTemplateName),
+		m_startingLocation(newStartingLocation),
+		m_hairTemplateName(newHairTemplateName),
+		m_hairAppearanceData (hairAppearanceData),
+		m_stationId(newStationId),
+		m_profession(profession),
+		m_jedi(jedi),
+		m_scaleFactor(scaleFactor),
+		m_biography(biography),
+		m_useNewbieTutorial(useNewbieTutorial),
+		m_skillTemplate(skillTemplate),
+		m_workingSkill(workingSkill),
+		m_noRateLimit(noRateLimit),
+		m_isForCharacterTransfer(isForCharacterTransfer),
+		m_gameFeatures(gameFeatures)
+{
+	addVariable(m_appearanceData);
+	addVariable(m_characterName);
+	addVariable(m_templateName);
+	addVariable(m_startingLocation);
+	addVariable(m_hairTemplateName);
+	addVariable(m_hairAppearanceData);
+	addVariable(m_stationId);
+	addVariable(m_profession);
+	addVariable(m_jedi);
+	addVariable(m_scaleFactor);
+	addVariable(m_biography);
+	addVariable(m_useNewbieTutorial);
+	addVariable(m_skillTemplate);
+	addVariable(m_workingSkill);
+	addVariable(m_noRateLimit);
+	addVariable(m_isForCharacterTransfer);
+	addVariable(m_gameFeatures);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionCreateCharacter::ConnectionCreateCharacter(Archive::ReadIterator & source) :
+		GameNetworkMessage("ConnectionCreateCharacter"),
+		m_appearanceData(),
+		m_characterName(),
+		m_templateName(),
+		m_startingLocation(),
+		m_hairTemplateName(),
+		m_hairAppearanceData (),
+		m_stationId(0),
+		m_profession(),
+		m_jedi(),
+		m_scaleFactor(1.0f),
+		m_biography(),
+		m_useNewbieTutorial(false),
+		m_skillTemplate(),
+		m_workingSkill(),
+		m_noRateLimit(false),
+		m_isForCharacterTransfer(),
+		m_gameFeatures(0)
+{
+	addVariable(m_appearanceData);
+	addVariable(m_characterName);
+	addVariable(m_templateName);
+	addVariable(m_startingLocation);
+	addVariable(m_hairTemplateName);
+	addVariable(m_hairAppearanceData);
+	addVariable(m_stationId);
+	addVariable(m_profession);
+	addVariable(m_jedi);
+	addVariable(m_scaleFactor);
+	addVariable(m_biography);
+	addVariable(m_useNewbieTutorial);
+	addVariable(m_skillTemplate);
+	addVariable(m_workingSkill);
+	addVariable(m_noRateLimit);
+	addVariable(m_isForCharacterTransfer);
+	addVariable(m_gameFeatures);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionCreateCharacter::~ConnectionCreateCharacter()
+{
+}
+
+//----------------------------------------------------------------------
+
+const float ConnectionCreateCharacter::getScaleFactor        () const
+{
+	return m_scaleFactor.get ();
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionCreateCharacterSuccess::ConnectionCreateCharacterSuccess(uint32 suid, const NetworkId & networkId) :
+        GameNetworkMessage("ConnectionCreateCharacterSuccess"),
+        stationId(suid),
+		m_networkId (networkId)
+{
+    addVariable(stationId);
+    addVariable(m_networkId);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionCreateCharacterSuccess::ConnectionCreateCharacterSuccess(Archive::ReadIterator & source) :
+        GameNetworkMessage("ConnectionCreateCharacterSuccess"),
+        stationId(0),
+		m_networkId ()
+{
+    addVariable(stationId);
+    addVariable(m_networkId);
+    unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionCreateCharacterSuccess::~ConnectionCreateCharacterSuccess()
+{
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionCreateCharacterFailed::ConnectionCreateCharacterFailed(uint32 newStationId, const Unicode::String &name, const StringId &errorMessage, const std::string &optionalDetailedErrorMessage) :
+        GameNetworkMessage("ConnectionCreateCharacterFailed"),
+				m_name(name),
+				m_errorMessage(errorMessage),
+				m_optionalDetailedErrorMessage(optionalDetailedErrorMessage),
+        stationId(newStationId)
+{
+    addVariable(stationId);
+		addVariable(m_name);
+		addVariable(m_errorMessage);
+		addVariable(m_optionalDetailedErrorMessage);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionCreateCharacterFailed::ConnectionCreateCharacterFailed(Archive::ReadIterator & source) :
+        GameNetworkMessage("ConnectionCreateCharacterFailed"),
+				m_name(),
+				m_errorMessage(),
+				m_optionalDetailedErrorMessage(),
+        stationId(0)
+{
+    addVariable(stationId);
+		addVariable(m_name);
+		addVariable(m_errorMessage);
+		addVariable(m_optionalDetailedErrorMessage);
+    unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionCreateCharacterFailed::~ConnectionCreateCharacterFailed()
+{
+}
+
+// ======================================================================
+
+
+
+
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/CentralConnectionServerMessages.h b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/CentralConnectionServerMessages.h
new file mode 100644
index 00000000..dfd76b57
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/CentralConnectionServerMessages.h
@@ -0,0 +1,590 @@
+
+// CentralConnectionServerMessages.h
+// copyright 2001 Verant Interactive
+
+#ifndef	_INCLUDED_CentralConnectionServerMessages_H
+#define	_INCLUDED_CentralConnectionServerMessages_H
+
+#include "StringId.h"
+#include "Unicode.h"
+#include "localizationArchive/StringIdArchive.h"
+#include "serverKeyShare/KeyShare.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+class NewCentralConnectionServer : public GameNetworkMessage
+{
+public:
+	NewCentralConnectionServer  (const std::string & address, const std::string & clientServiceAddress, const std::string & chatServiceAddress, const std::string & customerServiceAddress, const uint16 clientPortPrivate, const uint16 clientPortPublic, const uint16 gamePort, const uint16 chatPort, const uint16 customerServicePort, const uint16 pingPort, const int connectionServerNumber);
+	NewCentralConnectionServer  (Archive::ReadIterator & source);
+	~NewCentralConnectionServer ();
+
+	const uint16                         getChatServicePort           () const;
+	const uint16                         getCustomerServicePort       () const;
+	const uint16                         getClientServicePortPrivate  () const;
+	const uint16                         getClientServicePortPublic   () const;
+	const uint16                         getGameServicePort           () const;
+	const uint16                         getPingPort                  () const;
+	const int                            getConnectionServerNumber    () const;
+	const std::string &                  getChatServiceAddress        () const;
+	const std::string &                  getClientServiceAddress      () const;
+	const std::string &                  getGameServiceAddress        () const;
+	const std::string &                  getCustomerServiceAddress    () const;
+
+private:
+	Archive::AutoVariable<uint16>          chatServicePort;
+	Archive::AutoVariable<uint16>          customerServicePort;
+	Archive::AutoVariable<uint16>          clientServicePortPrivate;
+	Archive::AutoVariable<uint16>          clientServicePortPublic;
+	Archive::AutoVariable<uint16>          gameServicePort;
+	Archive::AutoVariable<uint16>          m_pingPort;
+	Archive::AutoVariable<int>             m_connectionServerNumber;
+	Archive::AutoVariable<std::string>     serviceAddress;
+	Archive::AutoVariable<std::string>     clientServiceAddress;
+	Archive::AutoVariable<std::string>     chatServiceAddress;
+	Archive::AutoVariable<std::string>     customerServiceAddress;
+	
+
+	NewCentralConnectionServer();
+	NewCentralConnectionServer(const NewCentralConnectionServer&);
+	NewCentralConnectionServer& operator= (const NewCentralConnectionServer&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const uint16 NewCentralConnectionServer::getChatServicePort() const
+{
+	return chatServicePort.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & NewCentralConnectionServer::getCustomerServiceAddress() const
+{
+	return customerServiceAddress.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & NewCentralConnectionServer::getClientServiceAddress() const
+{
+	return clientServiceAddress.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 NewCentralConnectionServer::getCustomerServicePort() const
+{
+	return customerServicePort.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & NewCentralConnectionServer::getGameServiceAddress () const
+{
+	return serviceAddress.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 NewCentralConnectionServer::getClientServicePortPrivate() const
+{
+	return clientServicePortPrivate.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 NewCentralConnectionServer::getClientServicePortPublic() const
+{
+	return clientServicePortPublic.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & NewCentralConnectionServer::getChatServiceAddress() const
+{
+	return chatServiceAddress.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 NewCentralConnectionServer::getGameServicePort () const
+{
+	return gameServicePort.get();
+}
+
+//----------------------------------------------------------------------
+
+inline const uint16 NewCentralConnectionServer::getPingPort          () const
+{
+	return m_pingPort.get ();
+}
+
+
+//----------------------------------------------------------------------
+
+inline const int NewCentralConnectionServer::getConnectionServerNumber() const
+{
+	return m_connectionServerNumber.get();
+}
+
+//-----------------------------------------------------------------------
+
+//This message is sent from Central to the conenction server when they establish a connection
+//To give it an id to pass around to servers that need it.
+class ConnectionServerId: public GameNetworkMessage
+{
+public:
+	explicit ConnectionServerId(int newId);
+	ConnectionServerId(Archive::ReadIterator & source);
+	~ConnectionServerId();
+
+	int getId() const;
+
+private:
+	Archive::AutoVariable<int> m_id;
+
+	ConnectionServerId();
+	ConnectionServerId(const ConnectionServerId&);
+	ConnectionServerId& operator= (const ConnectionServerId&);
+};
+
+//-----------------------------------------------------------------------
+
+inline int ConnectionServerId::getId() const
+{
+	return m_id.get();
+}
+
+//-----------------------------------------------------------------------
+
+class ConnectionKeyPush : public GameNetworkMessage
+{
+public:
+	explicit ConnectionKeyPush	(const KeyShare::Key& sourceKey);
+	ConnectionKeyPush             (Archive::ReadIterator & source);
+	~ConnectionKeyPush();
+	const KeyShare::Key&		getKey(void) const;
+private:
+	AutoVariableKeyShare		key;
+
+	ConnectionKeyPush();
+	ConnectionKeyPush(const ConnectionKeyPush&);
+	ConnectionKeyPush& operator= (const ConnectionKeyPush&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const KeyShare::Key & ConnectionKeyPush::getKey(void) const
+{
+	return key;
+}
+//-----------------------------------------------------------------------
+
+class LoggedInMessage : public GameNetworkMessage
+{
+  public:
+    LoggedInMessage  (uint32 accountNumber);
+    LoggedInMessage  (Archive::ReadIterator & source);
+    ~LoggedInMessage ();
+
+    uint32 getAccountNumber(void) const;
+
+  private:
+    Archive::AutoVariable<uint32> m_accountNumber;
+	
+    LoggedInMessage();
+    LoggedInMessage(const LoggedInMessage&);
+    LoggedInMessage& operator= (const LoggedInMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline uint32 LoggedInMessage::getAccountNumber(void) const
+{
+    return m_accountNumber.get();
+}
+
+//-----------------------------------------------------------------------
+
+class ConnEnumerateCharacterId : public GameNetworkMessage
+{
+public:
+	ConnEnumerateCharacterId(uint32 newAccountNumber, const Unicode::String & newName, const std::string & newLocation, const std::string & newObjectTemplate);
+	explicit ConnEnumerateCharacterId(Archive::ReadIterator & source);
+	~ConnEnumerateCharacterId();
+        
+        
+        const uint32            getAccountNumber  (void) const;
+        const std::string &     getLocation       (void) const;
+	const Unicode::String & getName           (void) const;
+	const std::string &     getObjectTemplate (void) const;
+
+private:
+        Archive::AutoVariable<uint32>          accountNumber;
+	Archive::AutoVariable<std::string>     location;
+	Archive::AutoVariable<Unicode::String> name;
+	Archive::AutoVariable<std::string>     objectTemplate;
+
+	ConnEnumerateCharacterId();
+	ConnEnumerateCharacterId(const ConnEnumerateCharacterId&);
+	ConnEnumerateCharacterId& operator= (const ConnEnumerateCharacterId&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const uint32 ConnEnumerateCharacterId::getAccountNumber(void) const
+{
+    return accountNumber.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ConnEnumerateCharacterId::getLocation(void) const
+{
+	return location.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ConnEnumerateCharacterId::getName(void) const
+{
+	return name.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ConnEnumerateCharacterId::getObjectTemplate(void) const
+{
+	return objectTemplate.get();
+}
+
+//-----------------------------------------------------------------------
+
+class ConnectionCreateCharacter : public GameNetworkMessage
+{
+public:
+	ConnectionCreateCharacter(uint32 stationId, const Unicode::String & characterName, const std::string & templateName, float scaleFactor, const std::string & startingLocation, const std::string & newAppeareanceData, const std::string & hairTemplateName, const std::string & hairAppearanceData, const std::string & profession, bool jedi, const Unicode::String & biography, bool useNewbieTutorial, const std::string & skillTemplate, const std::string & workingSkill, bool noRateLimit, bool isForCharacterTransfer, uint32 gameFeatures);
+	explicit ConnectionCreateCharacter(Archive::ReadIterator & source);
+	~ConnectionCreateCharacter();
+	
+	const float             getScaleFactor        () const;
+	const std::string &     getAppearanceData()   const;
+	const Unicode::String & getCharacterName()    const;
+	const std::string &     getHairTemplateName() const;
+	const std::string &     getHairAppearanceData () const;
+	const std::string &     getStartingLocation() const;
+	const uint32            getStationId()        const;
+	const std::string &     getTemplateName()     const;
+	const std::string &     getProfession()       const;
+	const bool              getJedi()             const;
+	const Unicode::String & getBiography()        const;
+	const bool              getUseNewbieTutorial() const;
+	const std::string &     getSkillTemplate()     const;
+	const std::string &     getWorkingSkill()      const;
+	const bool              getNoRateLimit()      const;
+	const bool              getIsForCharacterTransfer() const;
+	const uint32            getGameFeatures() const;
+	
+private:
+	
+	Archive::AutoVariable<std::string>           m_appearanceData;
+	Archive::AutoVariable<Unicode::String>       m_characterName;
+	Archive::AutoVariable<std::string>           m_templateName;
+	Archive::AutoVariable<std::string>           m_startingLocation;
+	Archive::AutoVariable<std::string>           m_hairTemplateName;
+	Archive::AutoVariable<std::string>           m_hairAppearanceData;
+	Archive::AutoVariable<uint32>                m_stationId;
+	Archive::AutoVariable<std::string>           m_profession;
+	Archive::AutoVariable<bool>                  m_jedi;
+	Archive::AutoVariable<float>                 m_scaleFactor;
+	Archive::AutoVariable<Unicode::String>       m_biography;
+	Archive::AutoVariable<bool>                  m_useNewbieTutorial;
+	Archive::AutoVariable<std::string>           m_skillTemplate;
+	Archive::AutoVariable<std::string>           m_workingSkill;
+	Archive::AutoVariable<bool>                  m_noRateLimit;
+	Archive::AutoVariable<bool>                  m_isForCharacterTransfer;
+	Archive::AutoVariable<uint32>                m_gameFeatures;
+
+	ConnectionCreateCharacter();
+	ConnectionCreateCharacter(const ConnectionCreateCharacter&);
+	ConnectionCreateCharacter& operator= (const ConnectionCreateCharacter&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const bool ConnectionCreateCharacter::getIsForCharacterTransfer() const
+{
+	return m_isForCharacterTransfer.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ConnectionCreateCharacter::getAppearanceData(void) const
+{
+	return m_appearanceData.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ConnectionCreateCharacter::getCharacterName(void) const
+{
+	return m_characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ConnectionCreateCharacter::getHairTemplateName() const
+{
+	return m_hairTemplateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ConnectionCreateCharacter::getHairAppearanceData() const
+{
+	return m_hairAppearanceData.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ConnectionCreateCharacter::getStartingLocation(void) const
+{
+	return m_startingLocation.get();
+}
+
+//-----------------------------------------------------------------------
+inline const uint32 ConnectionCreateCharacter::getStationId(void) const
+{
+    return m_stationId.get();
+}
+//-----------------------------------------------------------------------
+inline const std::string & ConnectionCreateCharacter::getTemplateName(void) const
+{
+	return m_templateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ConnectionCreateCharacter::getProfession() const
+{
+	return m_profession.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ConnectionCreateCharacter::getJedi() const
+{
+	return m_jedi.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ConnectionCreateCharacter::getBiography() const
+{
+	return m_biography.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ConnectionCreateCharacter::getUseNewbieTutorial() const
+{
+	return m_useNewbieTutorial.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string & ConnectionCreateCharacter::getSkillTemplate() const
+{
+	return m_skillTemplate.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ConnectionCreateCharacter::getWorkingSkill() const
+{
+	return m_workingSkill.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ConnectionCreateCharacter::getNoRateLimit() const
+{
+	return m_noRateLimit.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const uint32 ConnectionCreateCharacter::getGameFeatures() const
+{
+	return m_gameFeatures.get();
+}
+
+//-----------------------------------------------------------------------
+
+class ConnectionCreateCharacterSuccess : public GameNetworkMessage
+{
+public:
+	ConnectionCreateCharacterSuccess (uint32 stationId, const NetworkId & id);
+	explicit ConnectionCreateCharacterSuccess(Archive::ReadIterator & source);
+	~ConnectionCreateCharacterSuccess();
+	
+	uint32                   getStationId () const;
+	const NetworkId &        getNetworkId () const;
+	
+private:
+	Archive::AutoVariable<uint32>                stationId;
+	Archive::AutoVariable<NetworkId>             m_networkId;
+	
+	ConnectionCreateCharacterSuccess();
+	ConnectionCreateCharacterSuccess(const ConnectionCreateCharacterSuccess & source);
+	ConnectionCreateCharacterSuccess & operator = (const ConnectionCreateCharacterSuccess & rhs);
+};
+//-----------------------------------------------------------------------
+
+inline uint32 ConnectionCreateCharacterSuccess::getStationId() const
+{
+    return stationId.get();
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & ConnectionCreateCharacterSuccess::getNetworkId () const
+{
+	return m_networkId.get ();
+}
+
+//-----------------------------------------------------------------------
+
+class ConnectionCreateCharacterFailed : public GameNetworkMessage
+{
+public:
+	ConnectionCreateCharacterFailed(uint32 stationId, const Unicode::String &name, const StringId &errorMessage, const std::string &optionalDetailedErrorMessage);
+	explicit ConnectionCreateCharacterFailed(Archive::ReadIterator & source);
+	~ConnectionCreateCharacterFailed();
+	
+	const Unicode::String &getName() const;
+	const StringId &getErrorMessage() const;
+	const std::string &getOptionalDetailedErrorMessage() const;
+	uint32      getStationId() const;
+	
+private:
+	
+	Archive::AutoVariable<Unicode::String> m_name;
+	Archive::AutoVariable<StringId> m_errorMessage;
+	Archive::AutoVariable<std::string> m_optionalDetailedErrorMessage;
+	Archive::AutoVariable<uint32>                stationId;
+	
+	ConnectionCreateCharacterFailed();
+	ConnectionCreateCharacterFailed(const ConnectionCreateCharacterFailed & source);
+	ConnectionCreateCharacterFailed & operator = (const ConnectionCreateCharacterFailed & rhs);
+};
+
+//--------------------------------------------------------------------
+
+inline const Unicode::String &ConnectionCreateCharacterFailed::getName() const
+{
+	return m_name.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const StringId &ConnectionCreateCharacterFailed::getErrorMessage() const
+{
+	return m_errorMessage.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const std::string &ConnectionCreateCharacterFailed::getOptionalDetailedErrorMessage() const
+{
+	return m_optionalDetailedErrorMessage.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline uint32 ConnectionCreateCharacterFailed::getStationId() const
+{
+	return stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+class ConnectionRandomNameRequest: public GameNetworkMessage
+{
+public:
+	explicit ConnectionRandomNameRequest(uint32 stationId, const std::string &creatureTemplate);
+	explicit ConnectionRandomNameRequest(Archive::ReadIterator & source);
+	~ConnectionRandomNameRequest();
+
+	const uint32 getStationId() const;
+	const std::string &getCreatureTemplate() const;
+private:
+	Archive::AutoVariable<uint32> m_stationId;
+	Archive::AutoVariable<std::string> m_creatureTemplate;
+
+	ConnectionRandomNameRequest(const ConnectionRandomNameRequest & source);
+	ConnectionRandomNameRequest & operator = (const ConnectionRandomNameRequest & other);
+};
+
+//--------------------------------------------------------------------
+
+inline const uint32 ConnectionRandomNameRequest::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const std::string &ConnectionRandomNameRequest::getCreatureTemplate() const
+{
+	return m_creatureTemplate.get();
+}
+
+//-----------------------------------------------------------------------
+
+class ConnectionRandomNameResponse: public GameNetworkMessage
+{
+public:
+	explicit ConnectionRandomNameResponse(uint32 stationId, const std::string &creatureTemplate, const Unicode::String &name);
+	explicit ConnectionRandomNameResponse(Archive::ReadIterator & source);
+	~ConnectionRandomNameResponse();
+
+	const uint32 getStationId() const;
+	const std::string &getCreatureTemplate() const;
+	const Unicode::String &getName() const;
+private:
+	Archive::AutoVariable<uint32>          m_stationId;
+	Archive::AutoVariable<std::string>     m_creatureTemplate;
+	Archive::AutoVariable<Unicode::String> m_name;
+
+	ConnectionRandomNameResponse(const ConnectionRandomNameRequest & source);
+	ConnectionRandomNameResponse & operator = (const ConnectionRandomNameRequest & other);
+};
+
+//--------------------------------------------------------------------
+
+inline const uint32 ConnectionRandomNameResponse::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const std::string &ConnectionRandomNameResponse::getCreatureTemplate() const
+{
+	return m_creatureTemplate.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const Unicode::String &ConnectionRandomNameResponse::getName() const
+{
+	return m_name.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/SetConnectionServerPublic.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/SetConnectionServerPublic.cpp
new file mode 100644
index 00000000..0ef00d0c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/SetConnectionServerPublic.cpp
@@ -0,0 +1,36 @@
+// SetConnectionServerPublic.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/SetConnectionServerPublic.h"
+
+//-----------------------------------------------------------------------
+
+SetConnectionServerPublic::SetConnectionServerPublic(const bool isPublic) :
+GameNetworkMessage("SetConnectionServerPublic"),
+m_isPublic(isPublic)
+{
+	addVariable(m_isPublic);
+}
+
+//-----------------------------------------------------------------------
+
+SetConnectionServerPublic::SetConnectionServerPublic(Archive::ReadIterator & source) :
+GameNetworkMessage("SetConnectionServerPublic"),
+m_isPublic()
+{
+	addVariable(m_isPublic);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+SetConnectionServerPublic::~SetConnectionServerPublic()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/SetConnectionServerPublic.h b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/SetConnectionServerPublic.h
new file mode 100644
index 00000000..420ed53b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/SetConnectionServerPublic.h
@@ -0,0 +1,39 @@
+// SetConnectionServerPublic.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_SetConnectionServerPublic_H
+#define	_INCLUDED_SetConnectionServerPublic_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class SetConnectionServerPublic : public GameNetworkMessage
+{
+public:
+	explicit SetConnectionServerPublic(const bool isPublic);
+	explicit SetConnectionServerPublic(Archive::ReadIterator & source);
+	~SetConnectionServerPublic();
+
+	const bool  getIsPublic  () const;
+
+private:
+	SetConnectionServerPublic & operator = (const SetConnectionServerPublic & rhs);
+	SetConnectionServerPublic(const SetConnectionServerPublic & source);
+
+	Archive::AutoVariable<bool>  m_isPublic;
+};
+
+//-----------------------------------------------------------------------
+
+inline const bool SetConnectionServerPublic::getIsPublic() const
+{
+	return m_isPublic.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_SetConnectionServerPublic_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdateConnectionServerStatus.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdateConnectionServerStatus.cpp
new file mode 100644
index 00000000..c18ac0f3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdateConnectionServerStatus.cpp
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// UpdateConnectionServerStatus.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/UpdateConnectionServerStatus.h"
+
+// ======================================================================
+
+UpdateConnectionServerStatus::UpdateConnectionServerStatus(uint16 publicPort, uint16 privatePort) :
+		GameNetworkMessage("UpdateConnectionServerStatus"),
+		m_publicPort(publicPort),
+		m_privatePort(privatePort)
+{
+	addVariable(m_publicPort);
+	addVariable(m_privatePort);
+}
+
+// ----------------------------------------------------------------------
+
+UpdateConnectionServerStatus::UpdateConnectionServerStatus(Archive::ReadIterator & source) :
+		GameNetworkMessage("UpdateConnectionServerStatus"),
+		m_publicPort(0),
+		m_privatePort(0)
+{
+	addVariable(m_publicPort);
+	addVariable(m_privatePort);
+	
+	unpack(source);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdateConnectionServerStatus.h b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdateConnectionServerStatus.h
new file mode 100644
index 00000000..5c205ff7
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdateConnectionServerStatus.h
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// UpdateConnectionServerStatus.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_UpdateConnectionServerStatus_H
+#define INCLUDED_UpdateConnectionServerStatus_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Sent from:  Connection Server
+ * Sent to:  Central
+ * Action:  Reports the number of players connected to that ConnectionServer
+ */
+class UpdateConnectionServerStatus : public GameNetworkMessage
+{
+  public:
+	UpdateConnectionServerStatus(uint16 publicPort, uint16 privatePort);
+	UpdateConnectionServerStatus(Archive::ReadIterator & source);
+
+  public:
+	uint16 getPublicPort() const;
+	uint16 getPrivatePort() const;
+	
+  private:
+	Archive::AutoVariable<uint16> m_publicPort;
+	Archive::AutoVariable<uint16> m_privatePort;
+};
+
+// ======================================================================
+
+inline uint16 UpdateConnectionServerStatus::getPublicPort() const
+{
+	return m_publicPort.get();
+}
+
+//----------------------------------------------------------------------
+
+inline uint16 UpdateConnectionServerStatus::getPrivatePort() const
+{
+	return m_privatePort.get();
+}
+
+// ======================================================================
+
+#endif
+ 
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdatePlayerCountMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdatePlayerCountMessage.cpp
new file mode 100644
index 00000000..27678374
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdatePlayerCountMessage.cpp
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// UpdatePlayerCountMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/UpdatePlayerCountMessage.h"
+
+// ======================================================================
+
+UpdatePlayerCountMessage::UpdatePlayerCountMessage(bool loadedRecently, int playerCount, int emptySceneCount, int freeTrialCount, int tutorialSceneCount, int falconSceneCount) :
+		GameNetworkMessage("UpdatePlayerCountMessage"),
+		m_loadedRecently(loadedRecently),
+		m_playerCount(playerCount),
+		m_freeTrialCount(freeTrialCount),
+		m_emptySceneCount(emptySceneCount),
+		m_tutorialSceneCount(tutorialSceneCount),
+		m_falconSceneCount(falconSceneCount)
+{
+	addVariable(m_loadedRecently);
+	addVariable(m_playerCount);
+	addVariable(m_freeTrialCount);
+	addVariable(m_emptySceneCount);
+	addVariable(m_tutorialSceneCount);
+	addVariable(m_falconSceneCount);
+}
+
+// ----------------------------------------------------------------------
+
+UpdatePlayerCountMessage::UpdatePlayerCountMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("UpdatePlayerCountMessage"),
+		m_loadedRecently(false),
+		m_playerCount(0),
+		m_freeTrialCount(0),
+		m_emptySceneCount(0),
+		m_tutorialSceneCount(0),
+		m_falconSceneCount(0)
+{
+	addVariable(m_loadedRecently);
+	addVariable(m_playerCount);
+	addVariable(m_freeTrialCount);
+	addVariable(m_emptySceneCount);
+	addVariable(m_tutorialSceneCount);
+	addVariable(m_falconSceneCount);
+	
+	unpack(source);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdatePlayerCountMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdatePlayerCountMessage.h
new file mode 100644
index 00000000..d52e318c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/UpdatePlayerCountMessage.h
@@ -0,0 +1,93 @@
+// ======================================================================
+//
+// UpdatePlayerCountMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_UpdatePlayerCountMessage_H
+#define INCLUDED_UpdatePlayerCountMessage_H
+
+// ======================================================================
+
+#include "Unicode.h"
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+/**
+ * Sent from:  Connection Server
+ * Sent to:  Central
+ * Action:  Reports the number of players connected to that ConnectionServer
+ */
+class UpdatePlayerCountMessage : public GameNetworkMessage
+{
+  public:
+	UpdatePlayerCountMessage(bool loadedRecently, int playerCount, int freeTrialCount, int emptySceneCount, int tutorialSceneCount, int falconSceneCount);
+	UpdatePlayerCountMessage(Archive::ReadIterator & source);
+
+  public:
+	bool getLoadedRecently() const;
+	int getCount() const;
+	int getFreeTrialCount() const;
+	int getEmptySceneCount() const;
+	int getTutorialSceneCount() const;
+	int getFalconSceneCount() const;
+	
+  private:
+	Archive::AutoVariable<bool> m_loadedRecently;
+	Archive::AutoVariable<int> m_playerCount;
+	Archive::AutoVariable<int> m_freeTrialCount;
+	Archive::AutoVariable<int> m_emptySceneCount;
+	Archive::AutoVariable<int> m_tutorialSceneCount;
+	Archive::AutoVariable<int> m_falconSceneCount;
+};
+
+// ======================================================================
+
+inline bool UpdatePlayerCountMessage::getLoadedRecently() const
+{
+	return m_loadedRecently.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdatePlayerCountMessage::getCount() const
+{
+	return m_playerCount.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdatePlayerCountMessage::getFreeTrialCount() const
+{
+	return m_freeTrialCount.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdatePlayerCountMessage::getEmptySceneCount() const
+{
+	return m_emptySceneCount.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdatePlayerCountMessage::getTutorialSceneCount() const
+{
+	return m_tutorialSceneCount.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdatePlayerCountMessage::getFalconSceneCount() const
+{
+	return m_falconSceneCount.get();
+}
+
+// ======================================================================
+
+#endif
+ 
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginMessage.cpp
new file mode 100644
index 00000000..3cecbb74
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginMessage.cpp
@@ -0,0 +1,33 @@
+// ======================================================================
+//
+// ValidateCharacterForLoginMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ValidateCharacterForLoginMessage.h"
+
+// ======================================================================
+
+ValidateCharacterForLoginMessage::ValidateCharacterForLoginMessage(StationId suid, const NetworkId &characterId) :
+		GameNetworkMessage("ValidateCharacterForLoginMessage"),
+		m_suid(suid),
+		m_characterId(characterId)
+{
+	addVariable(m_suid);
+	addVariable(m_characterId);
+}
+
+// ----------------------------------------------------------------------
+
+ValidateCharacterForLoginMessage::ValidateCharacterForLoginMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("ValidateCharacterForLoginMessage")
+{
+	addVariable(m_suid);
+	addVariable(m_characterId);
+
+	unpack(source);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginMessage.h
new file mode 100644
index 00000000..f3fb1575
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginMessage.h
@@ -0,0 +1,58 @@
+// ======================================================================
+//
+// ValidateCharacterForLoginMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ValidateCharacterForLoginMessage_H
+#define INCLUDED_ValidateCharacterForLoginMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Sent from:  Connection Server
+ * Sent to:  Central, which forwards to DatabaseProcess
+ * Action:  A player has requested to play a particular character.
+ *          Check whether the character is valid for that account, and if it is figure
+ *          out where it is located in the world.
+ *          Respond with ValidateCharacterForLoginReplyMessage
+ */
+class ValidateCharacterForLoginMessage : public GameNetworkMessage
+{
+  public:
+	ValidateCharacterForLoginMessage(StationId suid, const NetworkId &characterId);
+	ValidateCharacterForLoginMessage(Archive::ReadIterator & source);
+
+  public:
+	StationId getSuid() const;
+	const NetworkId & getCharacterId() const;
+	
+  private:
+	Archive::AutoVariable<StationId> m_suid;
+	Archive::AutoVariable<NetworkId> m_characterId;
+};
+
+// ======================================================================
+
+inline StationId ValidateCharacterForLoginMessage::getSuid() const
+{
+	return m_suid.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &ValidateCharacterForLoginMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+// ======================================================================
+
+#endif
+ 
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginReplyMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginReplyMessage.cpp
new file mode 100644
index 00000000..d3a448d9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginReplyMessage.cpp
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// ValidateCharacterForLoginReplyMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ValidateCharacterForLoginReplyMessage.h"
+
+#include "sharedMathArchive/VectorArchive.h"
+
+// ======================================================================
+
+ValidateCharacterForLoginReplyMessage::ValidateCharacterForLoginReplyMessage(bool approved, StationId suid, const NetworkId &characterId, const NetworkId &containerId, const std::string &scene, const Vector &coordinates, const Unicode::String &characterName) :
+		GameNetworkMessage("ValidateCharacterForLoginReplyMessage"),
+		m_approved(approved),
+		m_suid(suid),
+		m_characterId(characterId),
+		m_containerId(containerId),
+		m_scene(scene),
+		m_coordinates(coordinates),
+		m_characterName(characterName)
+{
+	addVariable(m_approved);
+	addVariable(m_suid);
+	addVariable(m_characterId);
+	addVariable(m_containerId);
+	addVariable(m_scene);
+	addVariable(m_coordinates);
+	addVariable(m_characterName);
+}
+
+// ----------------------------------------------------------------------
+
+ValidateCharacterForLoginReplyMessage::ValidateCharacterForLoginReplyMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("ValidateCharacterForLoginMessage")
+{
+	addVariable(m_approved);
+	addVariable(m_suid);
+	addVariable(m_characterId);
+	addVariable(m_containerId);
+	addVariable(m_scene);
+	addVariable(m_coordinates);
+	addVariable(m_characterName);
+
+	unpack(source);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginReplyMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginReplyMessage.h
new file mode 100644
index 00000000..bc496a40
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralConnectionServer/ValidateCharacterForLoginReplyMessage.h
@@ -0,0 +1,103 @@
+// ======================================================================
+//
+// ValidateCharacterForLoginReplyMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ValidateCharacterForLoginReplyMessage_H
+#define INCLUDED_ValidateCharacterForLoginReplyMessage_H
+
+// ======================================================================
+
+#include "Unicode.h"
+#include "sharedFoundation/StationId.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+/**
+ * Sent from:  DatabaseProcess 
+ * Sent to:  Central, which forwards to the appropriate ConnectionServer
+ * Action:  Reply to ValidateCharacterForLoginMessage.  Tells the Connection
+ *          Server whether the character is valid, and if so,
+ *          where it is located in the world.
+ */
+class ValidateCharacterForLoginReplyMessage : public GameNetworkMessage
+{
+  public:
+	ValidateCharacterForLoginReplyMessage(bool approved, StationId suid, const NetworkId &characterId, const NetworkId &containerId, const std::string &scene, const Vector &coordinates, const Unicode::String &characterName);
+	ValidateCharacterForLoginReplyMessage(Archive::ReadIterator & source);
+
+	bool                getApproved     () const;
+	StationId           getSuid         () const;
+	const NetworkId &   getCharacterId  () const;
+	const NetworkId &   getContainerId  () const;
+	const std::string & getScene        () const;
+	const Vector &      getCoordinates  () const;
+	const Unicode::String  &getCharacterName  () const;
+
+  private:
+	Archive::AutoVariable<bool> m_approved;
+	Archive::AutoVariable<StationId> m_suid;
+	Archive::AutoVariable<NetworkId> m_characterId;
+	Archive::AutoVariable<NetworkId> m_containerId;
+	Archive::AutoVariable<std::string> m_scene;
+	Archive::AutoVariable<Vector> m_coordinates;
+	Archive::AutoVariable<Unicode::String> m_characterName;
+};
+
+// ======================================================================
+
+inline bool ValidateCharacterForLoginReplyMessage::getApproved() const
+{
+	return m_approved.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline StationId ValidateCharacterForLoginReplyMessage::getSuid() const
+{
+	return m_suid.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & ValidateCharacterForLoginReplyMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & ValidateCharacterForLoginReplyMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string & ValidateCharacterForLoginReplyMessage::getScene() const
+{
+	return m_scene.get();
+} 
+// ----------------------------------------------------------------------
+
+inline const Vector & ValidateCharacterForLoginReplyMessage::getCoordinates() const
+{
+	return m_coordinates.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String  &ValidateCharacterForLoginReplyMessage::getCharacterName  () const
+{
+	return m_characterName.get();
+}
+
+// ======================================================================
+
+#endif
+ 
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdRequest.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdRequest.cpp
new file mode 100644
index 00000000..fc555747
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdRequest.cpp
@@ -0,0 +1,57 @@
+// ======================================================================
+//
+// AccountFeatureIdRequest.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/AccountFeatureIdRequest.h"
+
+// ======================================================================
+
+AccountFeatureIdRequest::AccountFeatureIdRequest(NetworkId const & requester, uint32 gameServer, NetworkId const & target, StationId targetStationId, uint32 gameCode, RequestReason requestReason) :
+	GameNetworkMessage("AccountFeatureIdRequest"),
+	m_requester(requester),
+	m_gameServer(gameServer),
+	m_target(target),
+	m_targetStationId(targetStationId),
+	m_gameCode(gameCode),
+	m_requestReason(static_cast<int8>(requestReason))
+{	
+	addVariable(m_requester);
+	addVariable(m_gameServer);
+	addVariable(m_target);
+	addVariable(m_targetStationId);
+	addVariable(m_gameCode);
+	addVariable(m_requestReason);
+}
+
+//-----------------------------------------------------------------------
+
+AccountFeatureIdRequest::AccountFeatureIdRequest(Archive::ReadIterator & source) :
+	GameNetworkMessage("AccountFeatureIdRequest"),
+	m_requester(),
+	m_gameServer(),
+	m_target(),
+	m_targetStationId(),
+	m_gameCode(),
+	m_requestReason()
+{
+	addVariable(m_requester);
+	addVariable(m_gameServer);
+	addVariable(m_target);
+	addVariable(m_targetStationId);
+	addVariable(m_gameCode);
+	addVariable(m_requestReason);
+
+	unpack(source); //lint !e1506 Call to virtual from constructor
+}
+
+//-----------------------------------------------------------------------
+
+AccountFeatureIdRequest::~AccountFeatureIdRequest()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdRequest.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdRequest.h
new file mode 100644
index 00000000..d0c96a5e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdRequest.h
@@ -0,0 +1,92 @@
+// ======================================================================
+//
+// AccountFeatureIdRequest.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AccountFeatureIdRequest_H
+#define INCLUDED_AccountFeatureIdRequest_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class AccountFeatureIdRequest : public GameNetworkMessage
+{
+  public:
+	enum RequestReason {RR_Reload, RR_ConsoleCommandReloadRequest, RR_ReloadRewardCheck};
+
+	AccountFeatureIdRequest  (NetworkId const & requester, uint32 gameServer, NetworkId const & target, StationId targetStationId, uint32 gameCode, RequestReason requestReason);
+	AccountFeatureIdRequest  (Archive::ReadIterator & source);
+	virtual ~AccountFeatureIdRequest ();
+
+	NetworkId const & getRequester() const;
+	uint32 getGameServer() const;
+	NetworkId const & getTarget() const;
+	StationId getTargetStationId() const;
+	uint32 getGameCode() const;
+	RequestReason getRequestReason() const;
+
+  private:
+	Archive::AutoVariable<NetworkId> m_requester;
+	Archive::AutoVariable<uint32> m_gameServer;
+	Archive::AutoVariable<NetworkId> m_target;
+	Archive::AutoVariable<StationId> m_targetStationId;
+	Archive::AutoVariable<uint32> m_gameCode;
+	Archive::AutoVariable<int8> m_requestReason;
+
+  private:
+	AccountFeatureIdRequest();
+	AccountFeatureIdRequest(const AccountFeatureIdRequest&);
+	AccountFeatureIdRequest& operator= (const AccountFeatureIdRequest&);
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & AccountFeatureIdRequest::getRequester() const
+{
+	return m_requester.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 AccountFeatureIdRequest::getGameServer() const
+{
+	return m_gameServer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & AccountFeatureIdRequest::getTarget() const
+{
+	return m_target.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline StationId AccountFeatureIdRequest::getTargetStationId() const
+{
+	return m_targetStationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 AccountFeatureIdRequest::getGameCode() const
+{
+	return m_gameCode.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline AccountFeatureIdRequest::RequestReason AccountFeatureIdRequest::getRequestReason() const
+{
+	return static_cast<RequestReason>(m_requestReason.get());
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.cpp
new file mode 100644
index 00000000..b7417e7b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.cpp
@@ -0,0 +1,87 @@
+// ======================================================================
+//
+// AccountFeatureIdResponse.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/AccountFeatureIdResponse.h"
+
+// ======================================================================
+
+AccountFeatureIdResponse::AccountFeatureIdResponse(NetworkId const & requester, uint32 gameServer, NetworkId const & target, StationId targetStationId, uint32 gameCode, AccountFeatureIdRequest::RequestReason requestReason, unsigned int resultCode, bool resultCameFromSession, std::map<uint32, int> const & featureIds, std::map<uint32, std::string> const & sessionFeatureIdsData, const char * sessionResultString /*= NULL*/, const char * sessionResultText /*= NULL*/) :
+	GameNetworkMessage("AccountFeatureIdResponse"),
+	m_requester(requester),
+	m_gameServer(gameServer),
+	m_target(target),
+	m_targetStationId(targetStationId),
+	m_gameCode(gameCode),
+	m_requestReason(static_cast<int8>(requestReason)),
+	m_resultCode(resultCode),
+	m_resultCameFromSession(resultCameFromSession),
+	m_featureIds(featureIds),
+	m_sessionFeatureIdsData(sessionFeatureIdsData),
+	m_sessionResultString(),
+	m_sessionResultText()
+{
+	if (sessionResultString)
+		m_sessionResultString.set(std::string(sessionResultString));
+
+	if (sessionResultText)
+		m_sessionResultText.set(std::string(sessionResultText));
+
+	addVariable(m_requester);
+	addVariable(m_gameServer);
+	addVariable(m_target);
+	addVariable(m_targetStationId);
+	addVariable(m_gameCode);
+	addVariable(m_requestReason);
+	addVariable(m_resultCode);
+	addVariable(m_resultCameFromSession);
+	addVariable(m_featureIds);
+	addVariable(m_sessionFeatureIdsData);
+	addVariable(m_sessionResultString);
+	addVariable(m_sessionResultText);
+}
+
+//-----------------------------------------------------------------------
+
+AccountFeatureIdResponse::AccountFeatureIdResponse(Archive::ReadIterator & source) :
+	GameNetworkMessage("AccountFeatureIdResponse"),
+	m_requester(),
+	m_gameServer(),
+	m_target(),
+	m_targetStationId(),
+	m_gameCode(),
+	m_requestReason(),
+	m_resultCode(),
+	m_resultCameFromSession(),
+	m_featureIds(),
+	m_sessionFeatureIdsData(),
+	m_sessionResultString(),
+	m_sessionResultText()
+{
+	addVariable(m_requester);
+	addVariable(m_gameServer);
+	addVariable(m_target);
+	addVariable(m_targetStationId);
+	addVariable(m_gameCode);
+	addVariable(m_requestReason);
+	addVariable(m_resultCode);
+	addVariable(m_resultCameFromSession);
+	addVariable(m_featureIds);
+	addVariable(m_sessionFeatureIdsData);
+	addVariable(m_sessionResultString);
+	addVariable(m_sessionResultText);
+
+	unpack(source); //lint !e1506 Call to virtual from constructor
+}
+
+//-----------------------------------------------------------------------
+
+AccountFeatureIdResponse::~AccountFeatureIdResponse()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.h
new file mode 100644
index 00000000..3bf69cd3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AccountFeatureIdResponse.h
@@ -0,0 +1,145 @@
+// ======================================================================
+//
+// AccountFeatureIdResponse.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AccountFeatureIdResponse_H
+#define INCLUDED_AccountFeatureIdResponse_H
+
+// ======================================================================
+
+#include "serverNetworkMessages/AccountFeatureIdRequest.h"
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class AccountFeatureIdResponse : public GameNetworkMessage
+{
+  public:
+	AccountFeatureIdResponse  (NetworkId const & requester, uint32 gameServer, NetworkId const & target, StationId targetStationId, uint32 gameCode, AccountFeatureIdRequest::RequestReason requestReason, unsigned int resultCode, bool resultCameFromSession, std::map<uint32, int> const & featureIds, std::map<uint32, std::string> const & sessionFeatureIdsData, const char * sessionResultString = NULL, const char * sessionResultText = NULL);
+	AccountFeatureIdResponse  (Archive::ReadIterator & source);
+	virtual ~AccountFeatureIdResponse ();
+
+	NetworkId const & getRequester() const;
+	uint32 getGameServer() const;
+	NetworkId const & getTarget() const;
+	StationId getTargetStationId() const;
+	uint32 getGameCode() const;
+	AccountFeatureIdRequest::RequestReason getRequestReason() const;
+	unsigned int getResultCode() const; // 0 = SUCCESS
+	bool getResultCameFromSession() const;
+	std::map<uint32, int> const & getFeatureIds() const;
+	std::map<uint32, std::string> const & getSessionFeatureIdsData() const;
+	std::string const & getSessionResultString() const;
+	std::string const & getSessionResultText() const;
+
+  private:
+	Archive::AutoVariable<NetworkId> m_requester;
+	Archive::AutoVariable<uint32> m_gameServer;
+	Archive::AutoVariable<NetworkId> m_target;
+	Archive::AutoVariable<StationId> m_targetStationId;
+	Archive::AutoVariable<uint32> m_gameCode;
+	Archive::AutoVariable<int8> m_requestReason;
+	Archive::AutoVariable<unsigned int> m_resultCode; // 0 = SUCCESS
+	Archive::AutoVariable<bool> m_resultCameFromSession;
+	Archive::AutoVariable<std::map<uint32, int> > m_featureIds;
+	Archive::AutoVariable<std::map<uint32, std::string> > m_sessionFeatureIdsData;
+	Archive::AutoVariable<std::string> m_sessionResultString;
+	Archive::AutoVariable<std::string> m_sessionResultText;
+
+  private:
+	AccountFeatureIdResponse();
+	AccountFeatureIdResponse(const AccountFeatureIdResponse&);
+	AccountFeatureIdResponse& operator= (const AccountFeatureIdResponse&);
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & AccountFeatureIdResponse::getRequester() const
+{
+	return m_requester.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 AccountFeatureIdResponse::getGameServer() const
+{
+	return m_gameServer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & AccountFeatureIdResponse::getTarget() const
+{
+	return m_target.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline StationId AccountFeatureIdResponse::getTargetStationId() const
+{
+	return m_targetStationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 AccountFeatureIdResponse::getGameCode() const
+{
+	return m_gameCode.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline AccountFeatureIdRequest::RequestReason AccountFeatureIdResponse::getRequestReason() const
+{
+	return static_cast<AccountFeatureIdRequest::RequestReason>(m_requestReason.get());
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int AccountFeatureIdResponse::getResultCode() const
+{
+	return m_resultCode.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool AccountFeatureIdResponse::getResultCameFromSession() const
+{
+	return m_resultCameFromSession.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::map<uint32, int> const & AccountFeatureIdResponse::getFeatureIds() const
+{
+	return m_featureIds.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::map<uint32, std::string> const & AccountFeatureIdResponse::getSessionFeatureIdsData() const
+{
+	return m_sessionFeatureIdsData.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & AccountFeatureIdResponse::getSessionResultString() const
+{
+	return m_sessionResultString.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & AccountFeatureIdResponse::getSessionResultText() const
+{
+	return m_sessionResultText.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddCharacterMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddCharacterMessage.cpp
new file mode 100644
index 00000000..d7d0b32c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddCharacterMessage.cpp
@@ -0,0 +1,56 @@
+//========================================================================
+//
+// AddCharacterMessage.cpp - tells Centralserver we want all the objects in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/AddCharacterMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+AddCharacterMessage::AddCharacterMessage  (uint32 accountNumber, NetworkId objectId, uint32 process, const Unicode::String &name, bool special) :
+		GameNetworkMessage("AddCharacterMessage"),
+		m_accountNumber(accountNumber),
+		m_objectId(objectId),
+		m_process(process),
+		m_name(name),
+		m_special(special)
+{
+	addVariable(m_accountNumber);
+	addVariable(m_objectId);
+	addVariable(m_process);
+	addVariable(m_name);
+	addVariable(m_special);
+}
+
+//-----------------------------------------------------------------------
+
+AddCharacterMessage::AddCharacterMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("AddCharacterMessage"),
+		m_accountNumber(),
+		m_objectId(),
+		m_process(),
+		m_name(),
+		m_special()
+{
+	addVariable(m_accountNumber);
+	addVariable(m_objectId);
+	addVariable(m_process);
+	addVariable(m_name);
+	addVariable(m_special);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+AddCharacterMessage::~AddCharacterMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddCharacterMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddCharacterMessage.h
new file mode 100644
index 00000000..ebced23c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddCharacterMessage.h
@@ -0,0 +1,87 @@
+// ======================================================================
+//
+// AddCharacterMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AddCharacterMessage_H
+#define INCLUDED_AddCharacterMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Add a character to an account.
+ * Sent from:  Game Server
+ * Sent to:  Database Server
+ * Action:  Update the database to reflect that the specified character
+ * belongs to the specified account.  After it is persisted, tell Central
+ * that the character is ready.
+ */
+class AddCharacterMessage : public GameNetworkMessage
+{
+  public:
+	AddCharacterMessage  (uint32 accountNumber, NetworkId objectId, uint32 process, const Unicode::String &name, bool special);
+	AddCharacterMessage  (Archive::ReadIterator & source);
+	~AddCharacterMessage ();
+
+	uint32 getAccountNumber() const;
+	NetworkId getObjectId() const;
+	uint32 getProcess() const;
+	const Unicode::String &getName() const;
+	bool getSpecial() const;
+	
+  private:
+	Archive::AutoVariable<uint32> m_accountNumber;
+	Archive::AutoVariable<NetworkId> m_objectId;
+	Archive::AutoVariable<uint32> m_process;
+	Archive::AutoVariable<Unicode::String> m_name;
+	Archive::AutoVariable<bool> m_special;
+	
+	AddCharacterMessage();
+	AddCharacterMessage(const AddCharacterMessage&);
+	AddCharacterMessage& operator= (const AddCharacterMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline uint32 AddCharacterMessage::getAccountNumber() const
+{
+	return m_accountNumber.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId AddCharacterMessage::getObjectId() const
+{
+	return m_objectId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 AddCharacterMessage::getProcess() const
+{
+	return m_process.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String &AddCharacterMessage::getName() const
+{
+	return m_name.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool AddCharacterMessage::getSpecial() const
+{
+	return m_special.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddObjectIdBlockMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddObjectIdBlockMessage.cpp
new file mode 100644
index 00000000..30f9ae40
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddObjectIdBlockMessage.cpp
@@ -0,0 +1,49 @@
+//========================================================================
+//
+// AddOIDBlockMessage.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/AddObjectIdBlockMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+AddOIDBlockMessage::AddOIDBlockMessage(uint32 serverId, const NetworkId &start, const NetworkId &end, bool logRequest) :
+	GameNetworkMessage("AddOIDBlockMessage"),
+	m_serverId(serverId),
+	m_start(start),
+	m_end(end),
+	m_logRequest(logRequest)
+{
+	addVariable(m_serverId);
+	addVariable(m_start);
+	addVariable(m_end);
+	addVariable(m_logRequest);
+}	
+
+//-----------------------------------------------------------------------
+
+AddOIDBlockMessage::AddOIDBlockMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("AddOIDBlockMessage")
+{
+	addVariable(m_serverId);
+	addVariable(m_start);
+	addVariable(m_end);
+	addVariable(m_logRequest);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+AddOIDBlockMessage::~AddOIDBlockMessage()
+{
+}
+
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddObjectIdBlockMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddObjectIdBlockMessage.h
new file mode 100644
index 00000000..07bd1f7e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AddObjectIdBlockMessage.h
@@ -0,0 +1,72 @@
+//========================================================================
+//
+// AddOIDBlockMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_AddOIDBlockMessage_H
+#define	_INCLUDED_AddOIDBlockMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class AddOIDBlockMessage : public GameNetworkMessage
+{
+public:
+	AddOIDBlockMessage  (uint32 serverId, const NetworkId &start, const NetworkId &end, bool logRequest);
+	AddOIDBlockMessage  (Archive::ReadIterator & source);
+	~AddOIDBlockMessage ();
+
+	uint32            getServerId(void) const;
+	const NetworkId  &getStart(void) const;
+	const NetworkId  &getEnd(void) const;
+	bool              getLogRequest(void) const;
+
+private:
+	Archive::AutoVariable<uint32> m_serverId;
+	Archive::AutoVariable<NetworkId> m_start;
+	Archive::AutoVariable<NetworkId> m_end;
+	Archive::AutoVariable<bool> m_logRequest;
+	
+	AddOIDBlockMessage();
+	AddOIDBlockMessage(const AddOIDBlockMessage&);
+	AddOIDBlockMessage& operator= (const AddOIDBlockMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+inline uint32 AddOIDBlockMessage::getServerId(void) const
+{
+	return m_serverId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId &AddOIDBlockMessage::getStart(void) const
+{
+	return m_start.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId &AddOIDBlockMessage::getEnd(void) const
+{
+	return m_end.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool AddOIDBlockMessage::getLogRequest(void) const
+{
+	return m_logRequest.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_AddOIDBlockMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdRequest.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdRequest.cpp
new file mode 100644
index 00000000..e6affe88
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdRequest.cpp
@@ -0,0 +1,73 @@
+// ======================================================================
+//
+// AdjustAccountFeatureIdRequest.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/AdjustAccountFeatureIdRequest.h"
+
+// ======================================================================
+
+AdjustAccountFeatureIdRequest::AdjustAccountFeatureIdRequest(NetworkId const & requestingPlayer, uint32 gameServer, NetworkId const & targetPlayer, std::string const & targetPlayerDescription, StationId targetStationId, NetworkId const & targetItem, std::string const & targetItemDescription, uint32 gameCode, uint32 featureId, int adjustment) :
+	GameNetworkMessage("AdjustAccountFeatureIdRequest"),
+	m_requestingPlayer(requestingPlayer),
+	m_gameServer(gameServer),
+	m_targetPlayer(targetPlayer),
+	m_targetPlayerDescription(targetPlayerDescription),
+	m_targetStationId(targetStationId),
+	m_targetItem(targetItem),
+	m_targetItemDescription(targetItemDescription),
+	m_gameCode(gameCode),
+	m_featureId(featureId),
+	m_adjustment(adjustment)
+{	
+	addVariable(m_requestingPlayer);
+	addVariable(m_gameServer);
+	addVariable(m_targetPlayer);
+	addVariable(m_targetPlayerDescription);
+	addVariable(m_targetStationId);
+	addVariable(m_targetItem);
+	addVariable(m_targetItemDescription);
+	addVariable(m_gameCode);
+	addVariable(m_featureId);
+	addVariable(m_adjustment);
+}
+
+//-----------------------------------------------------------------------
+
+AdjustAccountFeatureIdRequest::AdjustAccountFeatureIdRequest(Archive::ReadIterator & source) :
+	GameNetworkMessage("AdjustAccountFeatureIdRequest"),
+	m_requestingPlayer(),
+	m_gameServer(),
+	m_targetPlayer(),
+	m_targetPlayerDescription(),
+	m_targetStationId(),
+	m_targetItem(),
+	m_targetItemDescription(),
+	m_gameCode(),
+	m_featureId(),
+	m_adjustment()
+{
+	addVariable(m_requestingPlayer);
+	addVariable(m_gameServer);
+	addVariable(m_targetPlayer);
+	addVariable(m_targetPlayerDescription);
+	addVariable(m_targetStationId);
+	addVariable(m_targetItem);
+	addVariable(m_targetItemDescription);
+	addVariable(m_gameCode);
+	addVariable(m_featureId);
+	addVariable(m_adjustment);
+
+	unpack(source); //lint !e1506 Call to virtual from constructor
+}
+
+//-----------------------------------------------------------------------
+
+AdjustAccountFeatureIdRequest::~AdjustAccountFeatureIdRequest()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdRequest.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdRequest.h
new file mode 100644
index 00000000..db5f4089
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdRequest.h
@@ -0,0 +1,126 @@
+// ======================================================================
+//
+// AdjustAccountFeatureIdRequest.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AdjustAccountFeatureIdRequest_H
+#define INCLUDED_AdjustAccountFeatureIdRequest_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class AdjustAccountFeatureIdRequest : public GameNetworkMessage
+{
+  public:
+	AdjustAccountFeatureIdRequest  (NetworkId const & requestingPlayer, uint32 gameServer, NetworkId const & targetPlayer, std::string const & targetPlayerDescription, StationId targetStationId, NetworkId const & targetItem, std::string const & targetItemDescription, uint32 gameCode, uint32 featureId, int adjustment);
+	AdjustAccountFeatureIdRequest  (Archive::ReadIterator & source);
+	virtual ~AdjustAccountFeatureIdRequest ();
+
+	NetworkId const & getRequestingPlayer() const;
+	uint32 getGameServer() const;
+	NetworkId const & getTargetPlayer() const;
+	std::string const & getTargetPlayerDescription() const;
+	StationId getTargetStationId() const;
+	NetworkId const & getTargetItem() const;
+	std::string const & getTargetItemDescription() const;
+	uint32 getGameCode() const;
+	uint32 getFeatureId() const;
+	int getAdjustment() const;
+
+  private:
+	Archive::AutoVariable<NetworkId> m_requestingPlayer;
+	Archive::AutoVariable<uint32> m_gameServer;
+	Archive::AutoVariable<NetworkId> m_targetPlayer;
+	Archive::AutoVariable<std::string> m_targetPlayerDescription;
+	Archive::AutoVariable<StationId> m_targetStationId;
+	Archive::AutoVariable<NetworkId> m_targetItem;
+	Archive::AutoVariable<std::string> m_targetItemDescription;
+	Archive::AutoVariable<uint32> m_gameCode;
+	Archive::AutoVariable<uint32> m_featureId;
+	Archive::AutoVariable<int> m_adjustment;
+
+  private:
+	AdjustAccountFeatureIdRequest();
+	AdjustAccountFeatureIdRequest(const AdjustAccountFeatureIdRequest&);
+	AdjustAccountFeatureIdRequest& operator= (const AdjustAccountFeatureIdRequest&);
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & AdjustAccountFeatureIdRequest::getRequestingPlayer() const
+{
+	return m_requestingPlayer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 AdjustAccountFeatureIdRequest::getGameServer() const
+{
+	return m_gameServer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & AdjustAccountFeatureIdRequest::getTargetPlayer() const
+{
+	return m_targetPlayer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & AdjustAccountFeatureIdRequest::getTargetPlayerDescription() const
+{
+	return m_targetPlayerDescription.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline StationId AdjustAccountFeatureIdRequest::getTargetStationId() const
+{
+	return m_targetStationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & AdjustAccountFeatureIdRequest::getTargetItem() const
+{
+	return m_targetItem.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & AdjustAccountFeatureIdRequest::getTargetItemDescription() const
+{
+	return m_targetItemDescription.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 AdjustAccountFeatureIdRequest::getGameCode() const
+{
+	return m_gameCode.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 AdjustAccountFeatureIdRequest::getFeatureId() const
+{
+	return m_featureId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AdjustAccountFeatureIdRequest::getAdjustment() const
+{
+	return m_adjustment.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.cpp
new file mode 100644
index 00000000..55ec5da9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.cpp
@@ -0,0 +1,99 @@
+// ======================================================================
+//
+// AdjustAccountFeatureIdResponse.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/AdjustAccountFeatureIdResponse.h"
+
+// ======================================================================
+
+AdjustAccountFeatureIdResponse::AdjustAccountFeatureIdResponse(NetworkId const & requestingPlayer, uint32 gameServer, NetworkId const & targetPlayer, std::string const & targetPlayerDescription, StationId targetStationId, NetworkId const & targetItem, std::string const & targetItemDescription, uint32 gameCode, uint32 featureId, int oldValue, int newValue, unsigned int resultCode, bool resultCameFromSession, const char * sessionResultString /*= NULL*/, const char * sessionResultText /*= NULL*/) :
+GameNetworkMessage("AdjustAccountFeatureIdResponse"),
+m_requestingPlayer(requestingPlayer),
+m_gameServer(gameServer),
+m_targetPlayer(targetPlayer),
+m_targetPlayerDescription(targetPlayerDescription),
+m_targetStationId(targetStationId),
+m_targetItem(targetItem),
+m_targetItemDescription(targetItemDescription),
+m_gameCode(gameCode),
+m_featureId(featureId),
+m_oldValue(oldValue),
+m_newValue(newValue),
+m_resultCode(resultCode),
+m_resultCameFromSession(resultCameFromSession),
+m_sessionResultString(),
+m_sessionResultText()
+{	
+	if (sessionResultString)
+		m_sessionResultString.set(std::string(sessionResultString));
+
+	if (sessionResultText)
+		m_sessionResultText.set(std::string(sessionResultText));
+
+	addVariable(m_requestingPlayer);
+	addVariable(m_gameServer);
+	addVariable(m_targetPlayer);
+	addVariable(m_targetPlayerDescription);
+	addVariable(m_targetStationId);
+	addVariable(m_targetItem);
+	addVariable(m_targetItemDescription);
+	addVariable(m_gameCode);
+	addVariable(m_featureId);
+	addVariable(m_oldValue);
+	addVariable(m_newValue);
+	addVariable(m_resultCode);
+	addVariable(m_resultCameFromSession);
+	addVariable(m_sessionResultString);
+	addVariable(m_sessionResultText);
+}
+
+//-----------------------------------------------------------------------
+
+AdjustAccountFeatureIdResponse::AdjustAccountFeatureIdResponse(Archive::ReadIterator & source) :
+GameNetworkMessage("AdjustAccountFeatureIdResponse"),
+m_requestingPlayer(),
+m_gameServer(),
+m_targetPlayer(),
+m_targetPlayerDescription(),
+m_targetStationId(),
+m_targetItem(),
+m_targetItemDescription(),
+m_gameCode(),
+m_featureId(),
+m_oldValue(),
+m_newValue(),
+m_resultCode(),
+m_resultCameFromSession(),
+m_sessionResultString(),
+m_sessionResultText()
+{
+	addVariable(m_requestingPlayer);
+	addVariable(m_gameServer);
+	addVariable(m_targetPlayer);
+	addVariable(m_targetPlayerDescription);
+	addVariable(m_targetStationId);
+	addVariable(m_targetItem);
+	addVariable(m_targetItemDescription);
+	addVariable(m_gameCode);
+	addVariable(m_featureId);
+	addVariable(m_oldValue);
+	addVariable(m_newValue);
+	addVariable(m_resultCode);
+	addVariable(m_resultCameFromSession);
+	addVariable(m_sessionResultString);
+	addVariable(m_sessionResultText);
+
+	unpack(source); //lint !e1506 Call to virtual from constructor
+}
+
+//-----------------------------------------------------------------------
+
+AdjustAccountFeatureIdResponse::~AdjustAccountFeatureIdResponse()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.h
new file mode 100644
index 00000000..940937ac
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/AdjustAccountFeatureIdResponse.h
@@ -0,0 +1,189 @@
+// ======================================================================
+//
+// AdjustAccountFeatureIdResponse.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AdjustAccountFeatureIdResponse_H
+#define INCLUDED_AdjustAccountFeatureIdResponse_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class AdjustAccountFeatureIdResponse : public GameNetworkMessage
+{
+public:
+	AdjustAccountFeatureIdResponse  (NetworkId const & requestingPlayer, uint32 gameServer, NetworkId const & targetPlayer, std::string const & targetPlayerDescription, StationId targetStationId, NetworkId const & targetItem, std::string const & targetItemDescription, uint32 gameCode, uint32 featureId, int oldValue, int newValue, unsigned int resultCode, bool resultCameFromSession, const char * sessionResultString = NULL, const char * sessionResultText = NULL);
+	AdjustAccountFeatureIdResponse  (Archive::ReadIterator & source);
+	virtual ~AdjustAccountFeatureIdResponse ();
+
+	NetworkId const & getRequestingPlayer() const;
+	uint32 getGameServer() const;
+	NetworkId const & getTargetPlayer() const;
+	std::string const & getTargetPlayerDescription() const;
+	StationId getTargetStationId() const;
+	NetworkId const & getTargetItem() const;
+	std::string const & getTargetItemDescription() const;
+	uint32 getGameCode() const;
+	uint32 getFeatureId() const;
+	int getOldValue() const;
+	int getNewValue() const;
+	unsigned int getResultCode() const; // 0 = SUCCESS
+	bool getResultCameFromSession() const;
+	std::string const & getSessionResultString() const;
+	std::string const & getSessionResultText() const;
+	void setSessionResultCode(unsigned int resultCode, const char * sessionResultString = NULL, const char * sessionResultText = NULL);
+
+private:
+	Archive::AutoVariable<NetworkId> m_requestingPlayer;
+	Archive::AutoVariable<uint32> m_gameServer;
+	Archive::AutoVariable<NetworkId> m_targetPlayer;
+	Archive::AutoVariable<std::string> m_targetPlayerDescription;
+	Archive::AutoVariable<StationId> m_targetStationId;
+	Archive::AutoVariable<NetworkId> m_targetItem;
+	Archive::AutoVariable<std::string> m_targetItemDescription;
+	Archive::AutoVariable<uint32> m_gameCode;
+	Archive::AutoVariable<uint32> m_featureId;
+	Archive::AutoVariable<int> m_oldValue;
+	Archive::AutoVariable<int> m_newValue;
+	Archive::AutoVariable<unsigned int> m_resultCode; // 0 = SUCCESS
+	Archive::AutoVariable<bool> m_resultCameFromSession;
+	Archive::AutoVariable<std::string> m_sessionResultString;
+	Archive::AutoVariable<std::string> m_sessionResultText;
+
+private:
+	AdjustAccountFeatureIdResponse();
+	AdjustAccountFeatureIdResponse(const AdjustAccountFeatureIdResponse&);
+	AdjustAccountFeatureIdResponse& operator= (const AdjustAccountFeatureIdResponse&);
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & AdjustAccountFeatureIdResponse::getRequestingPlayer() const
+{
+	return m_requestingPlayer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 AdjustAccountFeatureIdResponse::getGameServer() const
+{
+	return m_gameServer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & AdjustAccountFeatureIdResponse::getTargetPlayer() const
+{
+	return m_targetPlayer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & AdjustAccountFeatureIdResponse::getTargetPlayerDescription() const
+{
+	return m_targetPlayerDescription.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline StationId AdjustAccountFeatureIdResponse::getTargetStationId() const
+{
+	return m_targetStationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & AdjustAccountFeatureIdResponse::getTargetItem() const
+{
+	return m_targetItem.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & AdjustAccountFeatureIdResponse::getTargetItemDescription() const
+{
+	return m_targetItemDescription.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 AdjustAccountFeatureIdResponse::getGameCode() const
+{
+	return m_gameCode.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 AdjustAccountFeatureIdResponse::getFeatureId() const
+{
+	return m_featureId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AdjustAccountFeatureIdResponse::getOldValue() const
+{
+	return m_oldValue.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AdjustAccountFeatureIdResponse::getNewValue() const
+{
+	return m_newValue.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int AdjustAccountFeatureIdResponse::getResultCode() const
+{
+	return m_resultCode.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool AdjustAccountFeatureIdResponse::getResultCameFromSession() const
+{
+	return m_resultCameFromSession.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & AdjustAccountFeatureIdResponse::getSessionResultString() const
+{
+	return m_sessionResultString.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & AdjustAccountFeatureIdResponse::getSessionResultText() const
+{
+	return m_sessionResultText.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void AdjustAccountFeatureIdResponse::setSessionResultCode(unsigned int resultCode, const char * sessionResultString /*= NULL*/, const char * sessionResultText /*= NULL*/)
+{
+	m_resultCode.set(resultCode);
+
+	if (sessionResultString)
+		m_sessionResultString.set(std::string(sessionResultString));
+	else
+		m_sessionResultString.set(std::string());
+
+	if (sessionResultText)
+		m_sessionResultText.set(std::string(sessionResultText));
+	else
+		m_sessionResultText.set(std::string());
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CSDBNetMessages.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CSDBNetMessages.cpp
new file mode 100644
index 00000000..fad38fb7
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CSDBNetMessages.cpp
@@ -0,0 +1,237 @@
+// CSToolRequest.cpp
+// Copyright 2005, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Rob Hanz
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CSDBNetMessages.h"
+
+
+CSGetCharactersRequestMessage::CSGetCharactersRequestMessage (uint32 accountId, uint32 accessLevel, uint32 targetId, uint32 toolId, uint32 loginServer ) :
+GameNetworkMessage( "CSGetCharactersRequestMessage" ),
+m_accountId( accountId ),
+m_targetAccount( targetId ),
+m_accessLevel( accessLevel ),
+m_toolId( toolId ),
+m_loginServerId( loginServer )
+{
+	addVariable( m_accountId );
+	addVariable( m_targetAccount );
+	addVariable( m_accessLevel );
+	addVariable( m_toolId );
+	addVariable( m_loginServerId );
+}
+
+CSGetCharactersRequestMessage::CSGetCharactersRequestMessage( Archive::ReadIterator & source ) :
+GameNetworkMessage("CSGetCharactersRequestMessage"),
+m_accountId(0),
+m_targetAccount(0),
+m_accessLevel(0),
+m_toolId(0),
+m_loginServerId(0)
+{
+	addVariable( m_accountId );
+	addVariable( m_targetAccount );
+	addVariable( m_accessLevel );
+	addVariable( m_toolId );
+	addVariable( m_loginServerId );
+	AutoByteStream::unpack( source );
+}
+
+CSGetCharactersRequestMessage::~CSGetCharactersRequestMessage()
+{
+}
+
+GetCharactersForAccountCSReplyMsg::GetCharactersForAccountCSReplyMsg (uint32 accountId, uint32 accessLevel, uint32 targetId, uint32 toolId, uint32 loginServer, const std::string& response ) :
+GameNetworkMessage( "GetCharactersForAccountCSReplyMsg" ),
+m_accountId( accountId ),
+m_targetAccount( targetId ),
+m_accessLevel( accessLevel ),
+m_toolId( toolId ),
+m_loginServerId( loginServer ),
+m_responseString( response )
+{
+	addVariable( m_accountId );
+	addVariable( m_targetAccount );
+	addVariable( m_accessLevel );
+	addVariable( m_toolId );
+	addVariable( m_loginServerId );
+	addVariable( m_responseString );
+}
+
+GetCharactersForAccountCSReplyMsg::GetCharactersForAccountCSReplyMsg( Archive::ReadIterator & source ) :
+GameNetworkMessage("GetCharactersForAccountCSReplyMsg"),
+m_accountId( 0 ),
+m_targetAccount( 0 ),
+m_accessLevel( 0 ),
+m_toolId( 0 ),
+m_loginServerId( 0 ),
+m_responseString()
+{
+	addVariable( m_accountId );
+	addVariable( m_targetAccount );
+	addVariable( m_accessLevel );
+	addVariable( m_toolId );
+	addVariable( m_loginServerId );
+	addVariable( m_responseString );
+	AutoByteStream::unpack( source );
+}
+
+GetCharactersForAccountCSReplyMsg::~GetCharactersForAccountCSReplyMsg()
+{
+}
+
+
+CSGetDeletedItemsRequestMessage::CSGetDeletedItemsRequestMessage(uint32 accountId, uint32 accessLevel, uint32 targetId, uint32 toolId, uint32 loginServer ) :
+GameNetworkMessage( "CSGetDeletedItemsRequestMessage" ),
+m_accountId( accountId ),
+m_targetAccount( targetId ),
+m_accessLevel( accessLevel ),
+m_toolId( toolId ),
+m_loginServerId( loginServer )
+{
+	addVariable( m_accountId );
+	addVariable( m_targetAccount );
+	addVariable( m_accessLevel );
+	addVariable( m_toolId );
+	addVariable( m_loginServerId );
+}
+
+CSGetDeletedItemsRequestMessage::CSGetDeletedItemsRequestMessage( Archive::ReadIterator & source ) :
+GameNetworkMessage("CSGetDeletedItemsRequestMessage"),
+m_accountId( 0 ),
+m_targetAccount( 0 ),
+m_accessLevel( 0 ),
+m_toolId( 0 ),
+m_loginServerId( 0 )
+{
+	addVariable( m_accountId );
+	addVariable( m_targetAccount );
+	addVariable( m_accessLevel );
+	addVariable( m_toolId );
+	addVariable( m_loginServerId );
+	AutoByteStream::unpack( source );
+}
+
+CSGetDeletedItemsRequestMessage::~CSGetDeletedItemsRequestMessage()
+{
+}
+
+
+GetDeletedItemsReplyMessage::GetDeletedItemsReplyMessage (uint32 accountId, uint32 accessLevel, const NetworkId & targetId, uint32 toolId, uint32 loginServer, const std::string& response ) :
+GameNetworkMessage( "GetDeletedItemsReplyMessage" ),
+m_accountId( accountId ),
+m_characterId( targetId ),
+m_accessLevel( accessLevel ),
+m_toolId( toolId ),
+m_loginServerId( loginServer ),
+m_responseString( response )
+{
+	addVariable( m_accountId );
+	addVariable( m_characterId );
+	addVariable( m_accessLevel );
+	addVariable( m_toolId );
+	addVariable( m_loginServerId );
+	addVariable( m_responseString );
+}
+
+GetDeletedItemsReplyMessage::GetDeletedItemsReplyMessage( Archive::ReadIterator & source ) :
+GameNetworkMessage("GetDeletedItemsReplyMessage"),
+m_accountId( 0 ),
+m_characterId(),
+m_accessLevel( 0 ),
+m_toolId( 0 ),
+m_loginServerId( 0 ),
+m_responseString( "" )
+{
+	addVariable( m_accountId );
+	addVariable( m_characterId );
+	addVariable( m_accessLevel );
+	addVariable( m_toolId );
+	addVariable( m_loginServerId );
+	addVariable( m_responseString );
+	AutoByteStream::unpack( source );
+}
+
+GetDeletedItemsReplyMessage::~GetDeletedItemsReplyMessage()
+{
+}
+
+GetCharacterIdReplyMessage::GetCharacterIdReplyMessage (uint32 accountId, const NetworkId & targetId, uint32 toolId, uint32 loginServer, const std::string& characterName ) :
+GameNetworkMessage( "GetCharacterIdReplyMessage" ),
+m_accountId( accountId ),
+m_characterId( targetId ),
+m_toolId( toolId ),
+m_loginServerId( loginServer ),
+m_characterName( characterName )
+{
+	addVariable( m_accountId );
+	addVariable( m_characterId );
+	addVariable( m_toolId );
+	addVariable( m_loginServerId );
+	addVariable( m_characterName );
+}
+
+GetCharacterIdReplyMessage::GetCharacterIdReplyMessage( Archive::ReadIterator & source ) :
+GameNetworkMessage("GetCharacterIdReplyMessage"),
+m_accountId( 0 ),
+m_characterId(),
+m_toolId( 0 ),
+m_loginServerId( 0 ),
+m_characterName( "" )
+{
+	addVariable( m_accountId );
+	addVariable( m_characterId );
+	addVariable( m_toolId );
+	addVariable( m_loginServerId );
+	addVariable( m_characterName );
+	AutoByteStream::unpack( source );
+}
+
+GetCharacterIdReplyMessage::~GetCharacterIdReplyMessage()
+{
+}
+
+DBCSRequestMessage::DBCSRequestMessage( uint32 accountId, uint32 accessLevel, uint32 toolId, uint32 loginServerId, const std::string & command, const std::string & commandLine ) :
+	GameNetworkMessage( "DBCSRequestMessage" ),
+	m_accountId( accountId ),
+	m_accessLevel( accessLevel ),
+	m_toolId( toolId ),
+	m_loginServer( loginServerId ),
+	m_command( command ),
+	m_commandLine( commandLine )
+{
+	addVariable( m_accountId );
+	addVariable( m_accessLevel );
+	addVariable( m_toolId );
+	addVariable( m_loginServer ),
+	addVariable( m_command ),
+	addVariable( m_commandLine );
+}
+
+DBCSRequestMessage::DBCSRequestMessage( Archive::ReadIterator & source ) :
+	GameNetworkMessage( "DBCSRequestMessage" ),
+	m_accountId( 0 ),
+	m_accessLevel( 0 ),
+	m_toolId( 0 ),
+	m_loginServer( 0 ),
+	m_command( "" ),
+	m_commandLine( "" )
+{
+	addVariable( m_accountId );
+	addVariable( m_accessLevel );
+	addVariable( m_toolId );
+	addVariable( m_loginServer ),
+	addVariable( m_command ),
+	addVariable( m_commandLine );
+	
+	AutoByteStream::unpack( source );
+
+}
+
+DBCSRequestMessage::~DBCSRequestMessage()
+{
+}
+
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CSDBNetMessages.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CSDBNetMessages.h
new file mode 100644
index 00000000..08143832
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CSDBNetMessages.h
@@ -0,0 +1,351 @@
+// CSToolREquest.h
+// Copyright 2004, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Rob Hanz
+
+#ifndef	_INCLUDED_CSDBNetMessages_H
+#define	_INCLUDED_CSDBNetMessages_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+/** A Central Server is telling the login server which cluster it is
+	servicing.
+*/
+class CSGetCharactersRequestMessage : public GameNetworkMessage
+{
+  public:
+    CSGetCharactersRequestMessage (uint32 accountId, uint32 accessLevel, uint32 targetId, uint32 toolId, uint32 loginServer );
+    CSGetCharactersRequestMessage (Archive::ReadIterator & source);
+    virtual ~CSGetCharactersRequestMessage();
+    
+    uint32 			getAccountId () const;
+    uint32			getTargetAccountId() const;
+    uint32 			getAccessLevel() const;
+    uint32			getToolId() const;
+    uint32			getLoginServerId() const;
+
+  private:
+    Archive::AutoVariable< uint32 >      m_accountId;
+    Archive::AutoVariable< uint32 >      m_targetAccount;
+    Archive::AutoVariable< uint32 >	 m_accessLevel;
+    Archive::AutoVariable< uint32 > 	 m_toolId;
+    Archive::AutoVariable< uint32 >	 m_loginServerId;
+    
+
+    CSGetCharactersRequestMessage();
+    CSGetCharactersRequestMessage(const CSGetCharactersRequestMessage&);
+    CSGetCharactersRequestMessage & operator= (const CSGetCharactersRequestMessage&);
+
+};
+
+inline uint32 CSGetCharactersRequestMessage::getAccountId() const
+{
+	return m_accountId.get();
+}
+
+inline uint32 CSGetCharactersRequestMessage::getTargetAccountId() const
+{
+	return m_targetAccount.get();
+}
+
+inline uint32 CSGetCharactersRequestMessage::getAccessLevel() const
+{
+	return m_accessLevel.get();
+}
+
+inline uint32 CSGetCharactersRequestMessage::getToolId() const
+{
+	return m_toolId.get();
+}
+
+inline uint32 CSGetCharactersRequestMessage::getLoginServerId() const
+{
+	return m_loginServerId.get();
+}
+
+class GetCharactersForAccountCSReplyMsg : public GameNetworkMessage
+{
+  public:
+    GetCharactersForAccountCSReplyMsg (uint32 accountId, uint32 accessLevel, uint32 targetId, uint32 toolId, uint32 loginServer, const std::string & response );
+    GetCharactersForAccountCSReplyMsg (Archive::ReadIterator & source);
+    virtual ~GetCharactersForAccountCSReplyMsg();
+    
+    uint32 			getAccountId () const;
+    uint32			getTargetAccountId() const;
+    uint32 			getAccessLevel() const;
+    uint32			getToolId() const;
+    uint32			getLoginServerId() const;
+    const std::string	&		getResponse() const;
+    // data go here.
+
+  private:
+    Archive::AutoVariable< uint32 >      m_accountId;
+    Archive::AutoVariable< uint32 >      m_targetAccount;
+    Archive::AutoVariable< uint32 >	 m_accessLevel;
+    Archive::AutoVariable< uint32 > 	 m_toolId;
+    Archive::AutoVariable< uint32 >	 m_loginServerId;
+    Archive::AutoVariable< std::string > m_responseString;
+    
+
+    GetCharactersForAccountCSReplyMsg();
+    GetCharactersForAccountCSReplyMsg(const GetCharactersForAccountCSReplyMsg&);
+    GetCharactersForAccountCSReplyMsg & operator= (const GetCharactersForAccountCSReplyMsg&);
+
+};
+
+inline uint32 GetCharactersForAccountCSReplyMsg::getAccountId() const
+{
+	return m_accountId.get();
+}
+
+inline uint32 GetCharactersForAccountCSReplyMsg::getTargetAccountId() const
+{
+	return m_targetAccount.get();
+}
+
+inline uint32 GetCharactersForAccountCSReplyMsg::getAccessLevel() const
+{
+	return m_accessLevel.get();
+}
+
+inline uint32 GetCharactersForAccountCSReplyMsg::getToolId() const
+{
+	return m_toolId.get();
+}
+
+inline uint32 GetCharactersForAccountCSReplyMsg::getLoginServerId() const
+{
+	return m_loginServerId.get();
+}
+
+const inline std::string& GetCharactersForAccountCSReplyMsg::getResponse() const
+{
+	return m_responseString.get();
+}
+
+class CSGetDeletedItemsRequestMessage : public GameNetworkMessage
+{
+public:
+    CSGetDeletedItemsRequestMessage (uint32 accountId, uint32 accessLevel, uint32 targetId, uint32 toolId, uint32 loginServer );
+    CSGetDeletedItemsRequestMessage (Archive::ReadIterator & source);
+    virtual ~CSGetDeletedItemsRequestMessage();
+
+    uint32 			getAccountId () const;
+    uint32			getTargetAccountId() const;
+    uint32 			getAccessLevel() const;
+    uint32			getToolId() const;
+    uint32			getLoginServerId() const;
+
+  private:
+    Archive::AutoVariable< uint32 >      m_accountId;
+    Archive::AutoVariable< uint32 >      m_targetAccount;
+    Archive::AutoVariable< uint32 >	 m_accessLevel;
+    Archive::AutoVariable< uint32 > 	 m_toolId;
+    Archive::AutoVariable< uint32 >	 m_loginServerId;
+    
+    CSGetDeletedItemsRequestMessage();
+    CSGetDeletedItemsRequestMessage(const CSGetDeletedItemsRequestMessage&);
+    CSGetDeletedItemsRequestMessage & operator= (const CSGetDeletedItemsRequestMessage&);
+        
+};
+inline uint32 CSGetDeletedItemsRequestMessage::getAccountId() const
+{
+	return m_accountId.get();
+}
+
+inline uint32 CSGetDeletedItemsRequestMessage::getTargetAccountId() const
+{
+	return m_targetAccount.get();
+}
+
+inline uint32 CSGetDeletedItemsRequestMessage::getAccessLevel() const
+{
+	return m_accessLevel.get();
+}
+
+inline uint32 CSGetDeletedItemsRequestMessage::getToolId() const
+{
+	return m_toolId.get();
+}
+
+inline uint32 CSGetDeletedItemsRequestMessage::getLoginServerId() const
+{
+	return m_loginServerId.get();
+}
+
+class GetDeletedItemsReplyMessage : public GameNetworkMessage
+{
+  public:
+    GetDeletedItemsReplyMessage (uint32 accountId, uint32 accessLevel, const NetworkId &characterId, uint32 toolId, uint32 loginServer, const std::string & response );
+    GetDeletedItemsReplyMessage (Archive::ReadIterator & source);
+    virtual ~GetDeletedItemsReplyMessage();
+    
+    uint32   			getAccountId () const;
+    const NetworkId &		getCharacterId() const;
+    uint32 			getAccessLevel() const;
+    uint32			getToolId() const;
+    uint32			getLoginServerId() const;
+    const std::string	&		getResponse() const;
+    // data go here.
+
+  private:
+    Archive::AutoVariable< uint32 >      m_accountId;
+    Archive::AutoVariable< NetworkId >   m_characterId;
+    Archive::AutoVariable< uint32 >	 m_accessLevel;
+    Archive::AutoVariable< uint32 > 	 m_toolId;
+    Archive::AutoVariable< uint32 >	 m_loginServerId;
+    Archive::AutoVariable< std::string > m_responseString;
+    
+
+    GetDeletedItemsReplyMessage();
+    GetDeletedItemsReplyMessage(const GetDeletedItemsReplyMessage&);
+    GetDeletedItemsReplyMessage & operator= (const GetDeletedItemsReplyMessage&);
+
+};
+
+inline uint32 GetDeletedItemsReplyMessage::getAccountId() const
+{
+	return m_accountId.get();
+}
+
+inline const NetworkId & GetDeletedItemsReplyMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+inline uint32 GetDeletedItemsReplyMessage::getAccessLevel() const
+{
+	return m_accessLevel.get();
+}
+
+inline uint32 GetDeletedItemsReplyMessage::getToolId() const
+{
+	return m_toolId.get();
+}
+
+inline uint32 GetDeletedItemsReplyMessage::getLoginServerId() const
+{
+	return m_loginServerId.get();
+}
+
+const inline std::string& GetDeletedItemsReplyMessage::getResponse() const
+{
+	return m_responseString.get();
+}
+
+class GetCharacterIdReplyMessage : public GameNetworkMessage
+{
+  public:
+    GetCharacterIdReplyMessage (uint32 accountId, const NetworkId &characterId, uint32 toolId, uint32 loginServer, const std::string & characterName);
+    GetCharacterIdReplyMessage (Archive::ReadIterator & source);
+    virtual ~GetCharacterIdReplyMessage();
+    
+    uint32   			getAccountId () const;
+    const NetworkId &		getCharacterId() const;
+    uint32			getToolId() const;
+    uint32			getLoginServerId() const;
+    const std::string	&	getCharacterName() const;
+    // data go here.
+
+  private:
+    Archive::AutoVariable< uint32 >      m_accountId;
+    Archive::AutoVariable< NetworkId >   m_characterId;
+    Archive::AutoVariable< uint32 > 	 m_toolId;
+    Archive::AutoVariable< uint32 >	 m_loginServerId;
+    Archive::AutoVariable< std::string > m_characterName;
+    
+
+    GetCharacterIdReplyMessage();
+    GetCharacterIdReplyMessage(const GetCharacterIdReplyMessage&);
+    GetCharacterIdReplyMessage & operator= (const GetCharacterIdReplyMessage&);
+
+};
+
+inline uint32 GetCharacterIdReplyMessage::getAccountId() const
+{
+	return m_accountId.get();
+}
+
+inline const NetworkId & GetCharacterIdReplyMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+inline const std::string & GetCharacterIdReplyMessage::getCharacterName() const
+{
+	return m_characterName.get();
+}
+
+inline uint32 GetCharacterIdReplyMessage::getToolId() const
+{
+	return m_toolId.get();
+}
+
+inline uint32 GetCharacterIdReplyMessage::getLoginServerId() const
+{
+	return m_loginServerId.get();
+}
+
+class DBCSRequestMessage : public GameNetworkMessage
+{
+public:
+	DBCSRequestMessage( uint32 accountId, uint32 accessLevel, uint32 toolId, uint32 loginServer, const std::string & command, const std::string & commandline );
+	
+	DBCSRequestMessage( Archive::ReadIterator & source );
+	virtual ~DBCSRequestMessage();
+	
+	uint32			getAccountId() const;
+	uint32			getAccessLevel() const;
+	uint32			getToolId() const;
+	uint32			getLoginServerId() const;
+	const std::string &		getCommand() const;
+	const std::string &		getCommandLine() const;
+	
+	
+private:
+	Archive::AutoVariable< uint32 >		m_accountId;
+	Archive::AutoVariable< uint32 >		m_accessLevel;
+	Archive::AutoVariable< uint32 >		m_toolId;
+	Archive::AutoVariable< uint32 >		m_loginServer;
+	Archive::AutoVariable< std::string >	m_command;
+	Archive::AutoVariable< std::string >	m_commandLine;
+	
+	DBCSRequestMessage();
+	DBCSRequestMessage( const DBCSRequestMessage & );
+	DBCSRequestMessage & operator = ( const DBCSRequestMessage& );
+};
+
+inline uint32 DBCSRequestMessage::getAccountId() const
+{
+	return m_accountId.get();
+}
+
+inline uint32 DBCSRequestMessage::getAccessLevel() const
+{
+	return m_accessLevel.get();
+}
+
+inline uint32 DBCSRequestMessage::getToolId() const
+{
+	return m_toolId.get();
+}
+
+inline uint32 DBCSRequestMessage::getLoginServerId() const
+{
+	return m_loginServer.get();
+}
+
+inline const std::string& DBCSRequestMessage::getCommand() const
+{
+	return m_command.get();
+}
+
+inline const std::string& DBCSRequestMessage::getCommandLine() const
+{
+	return m_commandLine.get();
+}
+
+#endif //_INCLUDED_CSDBNetMessages_H
+//
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralGameServerMessages.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralGameServerMessages.cpp
new file mode 100644
index 00000000..229e3e34
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralGameServerMessages.cpp
@@ -0,0 +1,538 @@
+// CentralCommandChannelMessages.cpp
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverKeyShare/KeyShare.h"
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "sharedFoundation/ApplicationVersion.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+CentralGameServerConnect::CentralGameServerConnect(const std::string & newVolumeName,
+												   const std::string & newClientServiceAddress,
+												   const uint16 newClientServicePort,
+												   const std::string & newGameServiceAddress,
+												   const uint16 newGameServicePort) :
+GameNetworkMessage("CentralGameServerConnect"),
+clientServiceAddress(newClientServiceAddress),
+gameServiceAddress(newGameServiceAddress),
+volumeName(newVolumeName),
+clientServicePort(newClientServicePort),
+gameServicePort(newGameServicePort),
+buildVersionNumber(ApplicationVersion::getInternalVersion())
+{
+	addVariable(clientServiceAddress);
+	addVariable(gameServiceAddress);
+	addVariable(volumeName);
+	addVariable(clientServicePort);
+	addVariable(gameServicePort);
+	addVariable(buildVersionNumber);
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServerConnect::CentralGameServerConnect(Archive::ReadIterator & source) :
+GameNetworkMessage("CentralGameServerConnect"),
+clientServiceAddress(""),
+gameServiceAddress(""),
+volumeName(""),
+clientServicePort(0),
+gameServicePort(0),
+buildVersionNumber("")
+{
+	addVariable(clientServiceAddress);
+	addVariable(gameServiceAddress);
+	addVariable(volumeName);
+	addVariable(clientServicePort);
+	addVariable(gameServicePort);
+	addVariable(buildVersionNumber);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServerConnect::~CentralGameServerConnect()
+{
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServerSetProcessId::CentralGameServerSetProcessId(const uint32 newProcessId, const uint32 newClockSubtractInterval, const std::string & c) :
+GameNetworkMessage("CentralGameServerSetProcessId"),
+clockSubtractInterval(newClockSubtractInterval),
+clusterName(c),
+processId(newProcessId)
+{
+	addVariable(processId);
+	addVariable(clockSubtractInterval);
+	addVariable(clusterName);
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServerSetProcessId::CentralGameServerSetProcessId(Archive::ReadIterator & source) :
+GameNetworkMessage("CentralGameServerSetProcessId"),
+clockSubtractInterval(0),
+clusterName(),
+processId()
+{
+	addVariable(processId);
+	addVariable(clockSubtractInterval);
+	addVariable(clusterName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServerSetProcessId::~CentralGameServerSetProcessId()
+{
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServerProxyObject::CentralGameServerProxyObject(const NetworkId newObjectId, 
+		                                                   const char * const newTemplateName,
+	                                                       const uint32 newGameServerProcessId,
+														   const std::string & newGameServerAddress,
+														   const unsigned short newGameServerPort) :
+GameNetworkMessage("CentralGameServerProxyObject"),
+gameServerAddress(newGameServerAddress),
+gameServerPort(newGameServerPort),
+gameServerProcessId(newGameServerProcessId),
+objectId(newObjectId),
+templateName(newTemplateName)
+{
+	addVariable(gameServerAddress);
+	addVariable(gameServerPort);
+	addVariable(gameServerProcessId);
+	addVariable(objectId);
+	addVariable(templateName);
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServerProxyObject::CentralGameServerProxyObject(Archive::ReadIterator & source) :
+GameNetworkMessage("CentralGameServerProxyObject"),
+gameServerAddress(),
+gameServerPort(),
+gameServerProcessId(),
+templateName()
+{
+	addVariable(gameServerAddress);
+	addVariable(gameServerPort);
+	addVariable(gameServerProcessId);
+	addVariable(objectId);
+	addVariable(templateName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServerProxyObject::~CentralGameServerProxyObject()
+{
+}
+
+//-----------------------------------------------------------------------
+CentralGameServerDbProcessServerProcessId::CentralGameServerDbProcessServerProcessId(const uint32 newServerProcessId, const uint32 newGameTime) :
+GameNetworkMessage("CentralGameServerDbProcessServerProcessId"),
+serverProcessId(newServerProcessId),
+gameTime(newGameTime)
+{
+	addVariable(serverProcessId);
+	addVariable(gameTime);
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServerDbProcessServerProcessId::CentralGameServerDbProcessServerProcessId(Archive::ReadIterator & source) :
+GameNetworkMessage("CentralGameServerDbProcessServerProcessId"),
+serverProcessId(0)
+{
+	addVariable(serverProcessId);
+	addVariable(gameTime);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServerDbProcessServerProcessId::~CentralGameServerDbProcessServerProcessId()
+{
+}
+
+//-----------------------------------------------------------------------
+
+CentralCreateCharacter::CentralCreateCharacter(const uint32 stationId, const Unicode::String & characterName, const std::string & templateName, float scaleFactor, const std::string & planetName, const Vector & coordinates, const NetworkId & cellId, const std::string & appearanceData, const std::string & hairTemplateName, const std::string & hairAppearanceData, const std::string & profession, const Unicode::String & biography, bool useNewbieTutorial, const std::string & skillTemplate, const std::string & workingSkill, bool jedi, uint32 gameFeatures) :
+		GameNetworkMessage("CentralCreateCharacter"),
+		m_appearanceData(appearanceData),
+		m_cellId(cellId),
+		m_coordinates(coordinates),
+		m_characterName(characterName),
+		m_planetName(planetName),
+		m_stationId(stationId),
+		m_hairTemplateName(hairTemplateName),
+		m_hairAppearanceData (hairAppearanceData),
+		m_templateName(templateName),
+		m_profession(profession),
+		m_scaleFactor(scaleFactor),
+		m_biography(biography),
+		m_useNewbieTutorial(useNewbieTutorial),
+		m_skillTemplate(skillTemplate),
+		m_workingSkill(workingSkill),
+		m_jedi(jedi),
+		m_gameFeatures(gameFeatures)
+{
+	addVariable(m_appearanceData);
+	addVariable(m_cellId);
+	addVariable(m_coordinates);
+	addVariable(m_characterName);
+	addVariable(m_planetName);
+	addVariable(m_stationId);
+	addVariable(m_hairTemplateName);
+	addVariable(m_hairAppearanceData);
+	addVariable(m_templateName);
+	addVariable(m_profession);
+	addVariable(m_scaleFactor);
+	addVariable(m_biography);
+	addVariable(m_useNewbieTutorial);
+	addVariable(m_skillTemplate);
+	addVariable(m_workingSkill);
+	addVariable(m_jedi);
+	addVariable(m_gameFeatures);
+}
+
+//-----------------------------------------------------------------------
+
+CentralCreateCharacter::CentralCreateCharacter(Archive::ReadIterator & source) :
+		GameNetworkMessage("CentralCreateCharacter"),
+		m_appearanceData(),
+		m_cellId(),
+		m_coordinates(),
+		m_characterName(),
+		m_planetName(),
+		m_stationId(),
+		m_hairTemplateName(),
+		m_hairAppearanceData (),
+		m_templateName(),
+		m_profession(),
+		m_scaleFactor(1.0f),
+		m_biography(),
+		m_useNewbieTutorial(false),
+		m_skillTemplate(),
+		m_workingSkill(),
+		m_jedi(false),
+		m_gameFeatures(0)
+{
+	addVariable(m_appearanceData);
+	addVariable(m_cellId);
+	addVariable(m_coordinates);
+	addVariable(m_characterName);
+	addVariable(m_planetName);
+	addVariable(m_stationId);
+	addVariable(m_hairTemplateName);
+	addVariable(m_hairAppearanceData);
+	addVariable(m_templateName);
+	addVariable(m_profession);
+	addVariable(m_scaleFactor);
+	addVariable(m_biography);
+	addVariable(m_useNewbieTutorial);
+	addVariable(m_skillTemplate);
+	addVariable(m_workingSkill);
+	addVariable(m_jedi);
+	addVariable(m_gameFeatures);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+CentralCreateCharacter::~CentralCreateCharacter()
+{
+}
+
+//----------------------------------------------------------------------
+
+const float CentralCreateCharacter::getScaleFactor        () const
+{
+	return m_scaleFactor.get ();
+}
+
+//-----------------------------------------------------------------------
+
+VerifyNameRequest::VerifyNameRequest(const uint32 stationId, const NetworkId & characterId, const std::string &creatureTemplate, const Unicode::String & characterName) :
+GameNetworkMessage("VerifyNameRequest"),
+m_creatureTemplate(creatureTemplate),
+m_characterName(characterName),
+m_stationId(stationId),
+m_characterId(characterId)
+{
+	addVariable(m_creatureTemplate);
+    addVariable(m_characterName);
+    addVariable(m_stationId);
+	addVariable(m_characterId);
+}
+
+//-----------------------------------------------------------------------
+
+VerifyNameRequest::VerifyNameRequest(Archive::ReadIterator & source) :
+GameNetworkMessage("VerifyNameRequest"),
+m_creatureTemplate(),
+m_characterName(),
+m_stationId(),
+m_characterId()
+{
+	addVariable(m_creatureTemplate);
+    addVariable(m_characterName);
+    addVariable(m_stationId);
+	addVariable(m_characterId);
+
+    unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+VerifyNameRequest::~VerifyNameRequest()
+{
+}
+
+//-----------------------------------------------------------------------
+
+VerifyNameResponse::VerifyNameResponse(const uint32 stationId, const NetworkId & characterId, const std::string &creatureTemplate, const Unicode::String & characterName, const StringId &errorMessage) :
+GameNetworkMessage("VerifyNameResponse"),
+m_stationId(stationId),
+m_characterId(characterId),
+m_creatureTemplate(creatureTemplate),
+m_name(characterName),
+m_errorMessage(errorMessage)
+{
+	addVariable(m_stationId);
+	addVariable(m_characterId);
+	addVariable(m_creatureTemplate);
+	addVariable(m_name);
+	addVariable(m_errorMessage);
+}
+
+//-----------------------------------------------------------------------
+
+VerifyNameResponse::VerifyNameResponse(Archive::ReadIterator & source) :
+GameNetworkMessage("VerifyNameResponse"),
+m_stationId(),
+m_characterId(),
+m_creatureTemplate(),
+m_name(),
+m_errorMessage()
+{
+	addVariable(m_stationId);
+	addVariable(m_characterId);
+	addVariable(m_creatureTemplate);
+	addVariable(m_name);
+	addVariable(m_errorMessage);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+VerifyNameResponse::~VerifyNameResponse()
+{
+}
+
+//-----------------------------------------------------------------------
+
+ReleaseNameMessage::ReleaseNameMessage(const uint32 stationId, const NetworkId & characterId) :
+GameNetworkMessage("ReleaseNameMessage"),
+m_stationId(stationId),
+m_characterId(characterId)
+{
+    addVariable(m_stationId);
+	addVariable(m_characterId);
+}
+
+//-----------------------------------------------------------------------
+
+ReleaseNameMessage::ReleaseNameMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ReleaseNameMessage"),
+m_stationId(),
+m_characterId()
+{
+    addVariable(m_stationId);
+	addVariable(m_characterId);
+
+    unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ReleaseNameMessage::~ReleaseNameMessage()
+{
+}
+
+//----------------------------------------------------------------------
+DatabaseSaveStart::DatabaseSaveStart() : GameNetworkMessage("DatabaseSaveStart")
+{
+}
+
+DatabaseSaveStart::DatabaseSaveStart(Archive::ReadIterator & source) : GameNetworkMessage("DatabaseSaveStart")
+{
+	unpack(source);
+}
+
+DatabaseSaveStart::~DatabaseSaveStart()
+{
+}
+
+//----------------------------------------------------------------------
+
+DatabaseCreateCharacterSuccess::DatabaseCreateCharacterSuccess(const NetworkId objectId, StationId stationId, const Unicode::String &characterName, int templateId, bool jedi) :
+		GameNetworkMessage("DatabaseCreateCharacterSuccess"),
+		m_objectId(objectId),
+		m_stationId(stationId),
+		m_characterName(characterName),
+		m_templateId(templateId),
+		m_jedi(jedi)
+{
+	addVariable(m_objectId);
+	addVariable(m_stationId);
+	addVariable(m_characterName);
+	addVariable(m_templateId);
+	addVariable(m_jedi);
+}
+
+//-----------------------------------------------------------------------
+
+DatabaseCreateCharacterSuccess::DatabaseCreateCharacterSuccess(Archive::ReadIterator & source) :
+		GameNetworkMessage("DatabaseCreateCharacterSuccess"),
+		m_objectId(),
+		m_stationId(),
+		m_characterName(),
+		m_templateId(),
+		m_jedi()
+{
+	addVariable(m_objectId);
+	addVariable(m_stationId);
+	addVariable(m_characterName);
+	addVariable(m_templateId);
+	addVariable(m_jedi);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+DatabaseCreateCharacterSuccess::~DatabaseCreateCharacterSuccess()
+{
+}
+
+//-----------------------------------------------------------------------
+
+GameCreateCharacterFailed::GameCreateCharacterFailed(const uint32 stationId, const Unicode::String &name, const StringId &errorMessage, const std::string &optionalDetailedErrorMessage) :
+GameNetworkMessage("GameCreateCharacterFailed"),
+m_stationId(stationId),
+m_name(name),
+m_errorMessage(errorMessage),
+m_optionalDetailedErrorMessage(optionalDetailedErrorMessage)
+{
+	addVariable(m_stationId);
+	addVariable(m_name);
+	addVariable(m_errorMessage);
+	addVariable(m_optionalDetailedErrorMessage);
+}
+
+//-----------------------------------------------------------------------
+
+GameCreateCharacterFailed::GameCreateCharacterFailed(Archive::ReadIterator & source) :
+GameNetworkMessage("GameCreateCharacterFailed"),
+m_stationId(),
+m_name(),
+m_errorMessage(),
+m_optionalDetailedErrorMessage()
+{
+	addVariable(m_stationId);
+	addVariable(m_name);
+	addVariable(m_errorMessage);
+	addVariable(m_optionalDetailedErrorMessage);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+GameCreateCharacterFailed::~GameCreateCharacterFailed()
+{
+
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionServerAddress ::ConnectionServerAddress (const std::string & newGameAddress, const uint16 newGamePort) :
+GameNetworkMessage("ConnectionServerAddress"),
+gameServiceAddress(newGameAddress),
+gameServicePort(newGamePort)
+{
+	addVariable(gameServiceAddress);
+	addVariable(gameServicePort);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionServerAddress ::ConnectionServerAddress (Archive::ReadIterator & source) :
+GameNetworkMessage("ConnectionServerAddress"),
+gameServiceAddress(),
+gameServicePort()
+{
+	addVariable(gameServiceAddress);
+	addVariable(gameServicePort);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionServerAddress ::~ConnectionServerAddress ()
+{
+}
+//-----------------------------------------------------------------------
+
+//-----------------------------------------------------------------------
+ShutdownCluster::ShutdownCluster(const uint32 timeToShutdown, const uint32 maxTime, const Unicode::String systemMessage):
+GameNetworkMessage("ShutdownCluster"),
+m_timeToShutdown(timeToShutdown),
+m_maxTime(maxTime),
+m_systemMessage(systemMessage)
+{
+	addVariable(m_timeToShutdown);
+	addVariable(m_maxTime);
+	addVariable(m_systemMessage);
+}
+
+ShutdownCluster::ShutdownCluster( Archive::ReadIterator &source) :
+GameNetworkMessage("ShutdownCluster"),
+m_timeToShutdown(),
+m_maxTime(),
+m_systemMessage()
+{
+	addVariable(m_timeToShutdown);
+	addVariable(m_maxTime);
+	addVariable(m_systemMessage);
+	unpack(source);
+}
+
+ShutdownCluster::~ShutdownCluster()
+{
+}
+
+//----------------------------------------------------------------------
+AbortShutdown::AbortShutdown() : GameNetworkMessage("AbortShutdown")
+{
+}
+
+AbortShutdown::AbortShutdown(Archive::ReadIterator & source) : GameNetworkMessage("AbortShutdown")
+{
+	unpack(source);
+}
+
+AbortShutdown::~AbortShutdown()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralGameServerMessages.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralGameServerMessages.h
new file mode 100644
index 00000000..fc9d99f4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralGameServerMessages.h
@@ -0,0 +1,787 @@
+// CentralGameServerMessages.h
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_CentralGameServerMessages_H
+#define	_INCLUDED_CentralGameServerMessages_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/Archive.h"
+#include "StringId.h"
+#include "Unicode.h"
+#include "localizationArchive/StringIdArchive.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/StationId.h"
+#include "sharedMath/Vector.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+class CentralGameServerConnect : public GameNetworkMessage
+{
+public:
+	CentralGameServerConnect	(	const std::string & newVolumeName, 
+	                                const std::string & newClientServiceAddress, 
+									const uint16 newClientServicePort,
+									const std::string & newGameServiceAddress,
+									const uint16 newGameServicePort);
+	CentralGameServerConnect    (Archive::ReadIterator & source);
+	~CentralGameServerConnect	();
+	const std::string & getClientServiceAddress		(void) const;
+	const uint16		getClientServicePort		(void) const;
+	const std::string &	getGameServiceAddress		(void) const;
+	const uint16		getGameServicePort			(void) const;
+	const std::string &	getVolumeName				(void) const;
+	const std::string & getBuildVersionNumber       (void) const;
+private:
+	Archive::AutoVariable<std::string>      clientServiceAddress;
+	Archive::AutoVariable<std::string>      gameServiceAddress;
+	Archive::AutoVariable<std::string>      volumeName;
+	Archive::AutoVariable<uint16>           clientServicePort;
+	Archive::AutoVariable<uint16>           gameServicePort;
+	Archive::AutoVariable<std::string>      buildVersionNumber;
+
+	CentralGameServerConnect();
+	CentralGameServerConnect(const CentralGameServerConnect&);
+	CentralGameServerConnect& operator= (const CentralGameServerConnect&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralGameServerConnect::getClientServiceAddress(void) const
+{
+	return clientServiceAddress.get(); //lint !e1037 // const op () const is hardly ambiguous
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 CentralGameServerConnect::getClientServicePort(void) const
+{
+	return clientServicePort.get(); //lint !e1037 // const op () const is hardly ambiguous
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralGameServerConnect::getGameServiceAddress(void) const
+{
+	return gameServiceAddress.get(); //lint !e1037 // const op () const is hardly ambiguous
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 CentralGameServerConnect::getGameServicePort(void) const
+{
+	return gameServicePort.get(); //lint !e1037 // const op () const is hardly ambiguous
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralGameServerConnect::getVolumeName(void) const
+{
+	return volumeName.get(); //lint !e1037 // const op () const is hardly ambiguous
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralGameServerConnect::getBuildVersionNumber(void) const
+{
+	return buildVersionNumber.get(); //lint !e1037 // const op () const is hardly ambiguous
+}
+
+//-----------------------------------------------------------------------
+/**
+	sent from the central server to a game server process advising it
+	of the server's new process identifier in the cluster
+*/
+class CentralGameServerSetProcessId : public GameNetworkMessage
+{
+public:
+	explicit CentralGameServerSetProcessId(const uint32 newProcessId, const uint32 clockSubtractInterval, const std::string &newClusterName);
+
+	CentralGameServerSetProcessId(Archive::ReadIterator & source);
+	~CentralGameServerSetProcessId();
+
+	const uint32       getClockSubtractInterval  () const;
+	const std::string &getClusterName            () const;
+	const uint32	   getProcessId              () const;
+
+private:
+	Archive::AutoVariable<uint32> clockSubtractInterval;
+	Archive::AutoVariable<std::string> clusterName;
+	Archive::AutoVariable<uint32> processId;
+
+	CentralGameServerSetProcessId();
+	CentralGameServerSetProcessId(const CentralGameServerSetProcessId&);
+	CentralGameServerSetProcessId& operator= (const CentralGameServerSetProcessId&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const uint32 CentralGameServerSetProcessId::getClockSubtractInterval() const
+{
+	return clockSubtractInterval.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string &CentralGameServerSetProcessId::getClusterName(void) const
+{
+	return clusterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint32 CentralGameServerSetProcessId::getProcessId(void) const
+{
+	return processId.get(); //lint !e1037 // const op () const is hardly ambiguous
+}
+
+//-----------------------------------------------------------------------
+
+class CentralGameServerProxyObject : public GameNetworkMessage
+{
+public:
+	CentralGameServerProxyObject(const NetworkId newObjectId, 
+		                         const char * const newTemplateName,
+	                             const uint32 newGameServerProcessId,
+								 const std::string & newGameServerAddress,
+								 const unsigned short newGameServerPort);
+	CentralGameServerProxyObject(Archive::ReadIterator & source);
+	~CentralGameServerProxyObject();
+
+	const std::string &  getGameServerAddress() const;
+	const uint16         getGameServerPort() const;
+	const uint32         getGameServerProcessId() const;
+	const NetworkId      getObjectId() const;
+	const std::string &  getTemplateName() const;
+private:
+	Archive::AutoVariable<std::string>   gameServerAddress;
+	Archive::AutoVariable<uint16>        gameServerPort;
+	Archive::AutoVariable<uint32>        gameServerProcessId;
+	Archive::AutoVariable<NetworkId>           objectId;
+	Archive::AutoVariable<std::string>   templateName;
+
+	CentralGameServerProxyObject();
+	CentralGameServerProxyObject(const CentralGameServerProxyObject&);
+	CentralGameServerProxyObject& operator= (const CentralGameServerProxyObject&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralGameServerProxyObject::getGameServerAddress(void) const
+{
+	return gameServerAddress.get(); //lint !e1037 // const op () const is hardly ambiguous
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 CentralGameServerProxyObject::getGameServerPort() const
+{
+	return gameServerPort.get(); //lint !e1037 // const op () const is hardly ambiguous
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint32 CentralGameServerProxyObject::getGameServerProcessId(void) const
+{
+	return gameServerProcessId.get(); //lint !e1037 // const op () const is hardly ambiguous
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId CentralGameServerProxyObject::getObjectId(void) const
+{
+	return objectId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralGameServerProxyObject::getTemplateName(void) const
+{
+	return templateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+class CentralGameServerDbProcessServerProcessId : public GameNetworkMessage
+{
+public:
+	CentralGameServerDbProcessServerProcessId(const uint32 newServerProcessId, const uint32 gameTime);
+	CentralGameServerDbProcessServerProcessId(Archive::ReadIterator & source);
+	~CentralGameServerDbProcessServerProcessId();
+
+	const uint32  getSubtractInterval () const;
+	const uint32  getServerProcessId  () const;
+private:
+	Archive::AutoVariable<uint32>  serverProcessId;
+	Archive::AutoVariable<uint32>  gameTime;
+
+	CentralGameServerDbProcessServerProcessId();
+	CentralGameServerDbProcessServerProcessId(const CentralGameServerDbProcessServerProcessId&);
+	CentralGameServerDbProcessServerProcessId& operator= (const CentralGameServerDbProcessServerProcessId&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const uint32 CentralGameServerDbProcessServerProcessId::getServerProcessId(void) const
+{
+	return serverProcessId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint32 CentralGameServerDbProcessServerProcessId::getSubtractInterval() const
+{
+	return gameTime.get();
+}
+
+//-----------------------------------------------------------------------
+
+class CentralCreateCharacter : public GameNetworkMessage 
+{
+public:
+	CentralCreateCharacter(const uint32 stationId, 
+	                       const Unicode::String & characterName, 
+	                       const std::string & templateName, 
+	                       float scaleFactor, 
+	                       const std::string & planetName, 
+	                       const Vector & coordinates, 
+	                       const NetworkId & cellId, 
+	                       const std::string & newAppearanceData, 
+	                       const std::string & hairTemplateName, 
+	                       const std::string & hairAppearanceData, 
+	                       const std::string & profession,
+						   const Unicode::String & biography,
+						   const bool useNewbieTutorial,
+						   const std::string & skillTemplate,
+						   const std::string & workingSkill,
+						   const bool jedi,
+						   const uint32 gameFeatures);
+
+	CentralCreateCharacter(Archive::ReadIterator & source);
+	~CentralCreateCharacter();
+	
+	const float             getScaleFactor         () const;
+	const std::string &     getAppearanceData      () const;
+	const NetworkId &       getCell                () const;
+	const Unicode::String & getCharacterName       () const;
+	const Vector &          getCoordinates         () const;
+	const std::string &     getHairTemplateName    () const;
+	const std::string &     getHairAppearanceData  () const;
+	const std::string &     getPlanetName          () const;
+	const uint32            getStationId           () const;
+	const std::string &     getTemplateName        () const;
+	const std::string &     getProfession          () const;
+	const Unicode::String & getBiography           () const;
+	const bool              getUseNewbieTutorial   () const;
+	const std::string &     getSkillTemplate       () const;
+	const std::string &     getWorkingSkill        () const;
+	const bool              getJedi                () const;
+	const uint32            getGameFeatures        () const;
+
+private:
+	Archive::AutoVariable<std::string>      m_appearanceData;
+	Archive::AutoVariable<NetworkId>        m_cellId;
+	Archive::AutoVariable<Vector>           m_coordinates;
+	Archive::AutoVariable<Unicode::String>  m_characterName;
+	Archive::AutoVariable<std::string>      m_planetName;
+	Archive::AutoVariable<uint32>           m_stationId;
+	Archive::AutoVariable<std::string>      m_hairTemplateName;
+	Archive::AutoVariable<std::string>      m_hairAppearanceData;
+	Archive::AutoVariable<std::string>      m_templateName;
+	Archive::AutoVariable<std::string>      m_profession;
+	Archive::AutoVariable<float>            m_scaleFactor;
+	Archive::AutoVariable<Unicode::String>  m_biography;
+	Archive::AutoVariable<bool>             m_useNewbieTutorial;
+	Archive::AutoVariable<std::string>      m_skillTemplate;
+	Archive::AutoVariable<std::string>      m_workingSkill;
+	Archive::AutoVariable<bool>             m_jedi;
+	Archive::AutoVariable<uint32>           m_gameFeatures;
+	
+	CentralCreateCharacter();
+	CentralCreateCharacter(const CentralCreateCharacter&);
+	CentralCreateCharacter& operator= (const CentralCreateCharacter&);
+};
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralCreateCharacter::getAppearanceData() const
+{
+    return m_appearanceData.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & CentralCreateCharacter::getCell() const
+{
+	return m_cellId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Vector & CentralCreateCharacter::getCoordinates() const
+{
+	return m_coordinates.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & CentralCreateCharacter::getCharacterName() const
+{
+	return m_characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralCreateCharacter::getHairTemplateName() const
+{
+	return m_hairTemplateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralCreateCharacter::getHairAppearanceData() const
+{
+	return m_hairAppearanceData.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralCreateCharacter::getPlanetName() const
+{
+	return m_planetName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint32 CentralCreateCharacter::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralCreateCharacter::getTemplateName() const
+{
+	return m_templateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralCreateCharacter::getProfession() const
+{
+	return m_profession.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & CentralCreateCharacter::getBiography() const
+{
+	return m_biography.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool CentralCreateCharacter::getUseNewbieTutorial() const
+{
+	return m_useNewbieTutorial.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralCreateCharacter::getSkillTemplate() const
+{
+	return m_skillTemplate.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralCreateCharacter::getWorkingSkill() const
+{
+	return m_workingSkill.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool CentralCreateCharacter::getJedi() const
+{
+	return m_jedi.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const uint32 CentralCreateCharacter::getGameFeatures() const
+{
+	return m_gameFeatures.get();
+}
+
+//-----------------------------------------------------------------------
+
+class VerifyNameRequest: public GameNetworkMessage 
+{
+public:
+	VerifyNameRequest(const uint32 stationId, const NetworkId & characterId, const std::string &creatureTemplate, const Unicode::String & characterName);
+	VerifyNameRequest(Archive::ReadIterator & source);
+	~VerifyNameRequest();
+
+	const std::string &getCreatureTemplate() const;
+	const Unicode::String & getCharacterName() const;
+	const uint32            getStationId() const;
+	const NetworkId &       getCharacterId() const;
+
+private:
+	Archive::AutoVariable<std::string>      m_creatureTemplate;
+	Archive::AutoVariable<Unicode::String>  m_characterName;
+	Archive::AutoVariable<uint32>           m_stationId;
+
+	// 0 means requesting to verify name for character creation; otherwise, it means
+	// requesting to verify name for character rename for that particular character
+	Archive::AutoVariable<NetworkId>        m_characterId;
+
+	VerifyNameRequest();
+	VerifyNameRequest(const VerifyNameRequest&);
+	VerifyNameRequest& operator= (const VerifyNameRequest&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string &VerifyNameRequest::getCreatureTemplate() const
+{
+	return m_creatureTemplate.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & VerifyNameRequest::getCharacterName() const
+{
+	return m_characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint32 VerifyNameRequest::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & VerifyNameRequest::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+//-----------------------------------------------------------------------
+
+class VerifyNameResponse: public GameNetworkMessage 
+{
+	// See NameErrors.h for acceptable error codes
+public:
+	VerifyNameResponse(const uint32 stationId, const NetworkId & characterId, const std::string &creatureTemplate, const Unicode::String & characterName, const StringId &errorMessage);
+	VerifyNameResponse(Archive::ReadIterator & source);
+	~VerifyNameResponse();
+	
+	const uint32 getStationId() const;
+	const NetworkId & getCharacterId() const;
+	const std::string &getCreatureTemplate() const;
+	const Unicode::String & getName() const;
+	const StringId &getErrorMessage() const;
+
+private:
+	Archive::AutoVariable<uint32>           m_stationId;
+	Archive::AutoVariable<NetworkId>        m_characterId;
+	Archive::AutoVariable<std::string>      m_creatureTemplate;
+	Archive::AutoVariable<Unicode::String>  m_name;
+	Archive::AutoVariable<StringId>         m_errorMessage;
+	
+	VerifyNameResponse();
+	VerifyNameResponse(const VerifyNameResponse&);
+	VerifyNameResponse& operator= (const VerifyNameResponse&);
+};
+
+//--------------------------------------------------------------------
+
+inline const std::string &VerifyNameResponse::getCreatureTemplate() const
+{
+	return m_creatureTemplate.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint32 VerifyNameResponse::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & VerifyNameResponse::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & VerifyNameResponse::getName() const
+{
+	return m_name.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const StringId &VerifyNameResponse::getErrorMessage() const
+{
+	return m_errorMessage.get();
+}
+
+//-----------------------------------------------------------------------
+
+class ReleaseNameMessage: public GameNetworkMessage 
+{
+public:
+	ReleaseNameMessage(const uint32 stationId, const NetworkId & characterId); // if name is empty, release all names
+	ReleaseNameMessage(Archive::ReadIterator & source);
+	~ReleaseNameMessage();
+	
+	const uint32            getStationId() const;
+	const NetworkId &       getCharacterId() const;
+
+private:
+	Archive::AutoVariable<uint32>           m_stationId;
+	Archive::AutoVariable<NetworkId>        m_characterId;
+
+	ReleaseNameMessage();
+	ReleaseNameMessage(const ReleaseNameMessage&);
+	ReleaseNameMessage& operator= (const ReleaseNameMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const uint32 ReleaseNameMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & ReleaseNameMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+//-----------------------------------------------------------------------
+//  This message is sent from Persister to Central Server to indicate 
+//  that a save is starting.
+class DatabaseSaveStart : public GameNetworkMessage
+{
+public:
+	DatabaseSaveStart();
+	DatabaseSaveStart(Archive::ReadIterator & source);
+	~DatabaseSaveStart();
+};
+
+// ----------------------------------------------------------------------
+
+class DatabaseCreateCharacterSuccess : public GameNetworkMessage
+{
+public:
+	DatabaseCreateCharacterSuccess(const NetworkId objectId, StationId stationId, const Unicode::String &characterName, int templateId, bool jedi);
+	DatabaseCreateCharacterSuccess(Archive::ReadIterator & source);
+	~DatabaseCreateCharacterSuccess();
+
+	const NetworkId &        getObjectId() const;
+	const StationId          getStationId() const;
+	const Unicode::String &  getCharacterName() const;
+	const int                getTemplateId() const;
+	const bool               getJedi() const;
+
+private:
+	Archive::AutoVariable<NetworkId>                m_objectId;
+	Archive::AutoVariable<StationId>                m_stationId;
+	Archive::AutoVariable<Unicode::String>          m_characterName;
+	Archive::AutoVariable<int>                      m_templateId;
+	Archive::AutoVariable<bool>                     m_jedi;
+
+	DatabaseCreateCharacterSuccess();
+	DatabaseCreateCharacterSuccess(const DatabaseCreateCharacterSuccess&);
+	DatabaseCreateCharacterSuccess& operator= (const DatabaseCreateCharacterSuccess&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & DatabaseCreateCharacterSuccess::getObjectId(void) const
+{
+	return m_objectId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const StationId DatabaseCreateCharacterSuccess::getStationId(void) const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & DatabaseCreateCharacterSuccess::getCharacterName() const
+{
+	return m_characterName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const int DatabaseCreateCharacterSuccess::getTemplateId() const
+{
+	return m_templateId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const bool DatabaseCreateCharacterSuccess:: getJedi() const
+{
+	return m_jedi.get();
+}
+
+//-----------------------------------------------------------------------
+
+class GameCreateCharacterFailed : public GameNetworkMessage
+{
+public:
+	explicit GameCreateCharacterFailed(const uint32 stationId, const Unicode::String &name, const StringId &errorCode, const std::string &optionalDetailedErrorMessage);
+	GameCreateCharacterFailed(Archive::ReadIterator & source);
+	~GameCreateCharacterFailed();
+
+	const uint32 getStationId(void) const;
+	const Unicode::String &getName(void) const;
+	const StringId &getErrorMessage(void) const;
+	const std::string &getOptionalDetailedErrorMessage() const;
+private:
+	Archive::AutoVariable<uint32> m_stationId;
+	Archive::AutoVariable<Unicode::String> m_name;
+	Archive::AutoVariable<StringId>  m_errorMessage;
+	Archive::AutoVariable<std::string> m_optionalDetailedErrorMessage;
+	
+	GameCreateCharacterFailed();
+	GameCreateCharacterFailed(const GameCreateCharacterFailed&);
+	GameCreateCharacterFailed& operator= (const GameCreateCharacterFailed&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const uint32 GameCreateCharacterFailed::getStationId(void) const
+{
+	return m_stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String &GameCreateCharacterFailed::getName(void) const
+{
+	return m_name.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const StringId &GameCreateCharacterFailed::getErrorMessage(void) const
+{
+	return m_errorMessage.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const std::string &GameCreateCharacterFailed::getOptionalDetailedErrorMessage() const
+{
+	return m_optionalDetailedErrorMessage.get();
+}
+
+//-----------------------------------------------------------------------
+
+/**
+* the ConnectionServerAddress message is sent from central to game when a user server connects to the login server so the game can establish a connection with it.
+*/
+
+class ConnectionServerAddress : public GameNetworkMessage
+{
+public:
+	ConnectionServerAddress (const std::string & newGameAddress, const uint16 newGamePort);
+	ConnectionServerAddress (Archive::ReadIterator & source);
+    virtual ~ConnectionServerAddress ();
+
+    const std::string &                  getGameServiceAddress	(void) const;
+    const uint16                         getGameServicePort	(void) const;
+
+private:
+	Archive::AutoVariable<std::string>   gameServiceAddress;
+	Archive::AutoVariable<uint16>        gameServicePort;
+
+	ConnectionServerAddress(const ConnectionServerAddress&);
+	ConnectionServerAddress& operator= (const ConnectionServerAddress&);
+};
+//-----------------------------------------------------------------------
+
+inline const std::string & ConnectionServerAddress::getGameServiceAddress (void) const
+{
+	return gameServiceAddress.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 ConnectionServerAddress::getGameServicePort (void) const
+{
+	return gameServicePort.get();
+}
+
+//-----------------------------------------------------------------------
+
+// Send this message to CentralServer to begin the shutdown sequence (broadcasts to the players, database save, etc)
+class ShutdownCluster : public GameNetworkMessage
+{
+public:
+	ShutdownCluster( const uint32 timeToShutdown, const uint32 maxTime, const Unicode::String systemMessage);
+	ShutdownCluster(Archive::ReadIterator &source);
+	virtual ~ShutdownCluster();
+
+	const uint32			getTimeToShutdown(void) const;
+	const uint32			getMaxTime(void) const;
+	const Unicode::String		getSystemMessage(void) const;
+
+private:
+	Archive::AutoVariable<uint32>			m_timeToShutdown;
+	Archive::AutoVariable<uint32>			m_maxTime;
+	Archive::AutoVariable<Unicode::String>		m_systemMessage;
+
+	ShutdownCluster();
+	ShutdownCluster( const ShutdownCluster& );
+	ShutdownCluster& operator= (const ShutdownCluster& );
+};
+
+inline const uint32 ShutdownCluster::getTimeToShutdown(void) const
+{
+	return m_timeToShutdown.get();
+}
+
+inline const uint32 ShutdownCluster::getMaxTime(void) const
+{
+	return m_maxTime.get();
+}
+
+inline const Unicode::String ShutdownCluster::getSystemMessage(void) const
+{
+	return m_systemMessage.get();
+}
+
+//------------------------------------------------------------------------
+//  This message is sent to Central Server to stop any shutdown sequence that is in progress
+class AbortShutdown : public GameNetworkMessage
+{
+public:
+	AbortShutdown();
+	AbortShutdown(Archive::ReadIterator & source);
+	~AbortShutdown();
+};
+
+
+
+#endif	// _INCLUDED_CentralGameServerMessages_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralPingMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralPingMessage.cpp
new file mode 100644
index 00000000..bb61659f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralPingMessage.cpp
@@ -0,0 +1,36 @@
+//========================================================================
+//
+// CentralPingMessage.cpp - tells Centralserver we want all the objects in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CentralPingMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+CentralPingMessage::CentralPingMessage  () :
+		GameNetworkMessage("CentralPingMessage")
+{
+}
+
+//-----------------------------------------------------------------------
+
+CentralPingMessage::CentralPingMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("CentralPingMessage")
+{
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+CentralPingMessage::~CentralPingMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralPingMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralPingMessage.h
new file mode 100644
index 00000000..2fa9d6b6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CentralPingMessage.h
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// CentralPingMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_CentralPingMessage_H
+#define INCLUDED_CentralPingMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Sent from:  Central / Game Server
+ * Sent to:  Game Server / Central
+ * Action:  Verfiy that we have two-way communications and that the game
+ * server is responding.
+ */
+class CentralPingMessage : public GameNetworkMessage
+{
+  public:
+	CentralPingMessage  ();
+	CentralPingMessage  (Archive::ReadIterator & source);
+	~CentralPingMessage ();
+
+	uint32 getPingNumber() const;
+	
+  private:
+
+	CentralPingMessage(const CentralPingMessage&);
+	CentralPingMessage& operator= (const CentralPingMessage&);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChangeUniverseProcessMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChangeUniverseProcessMessage.cpp
new file mode 100644
index 00000000..670232f8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChangeUniverseProcessMessage.cpp
@@ -0,0 +1,49 @@
+//========================================================================
+//
+// ChangeUniverseProcessMessage.cpp - tells  CentralServer to unload all instances of
+// an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ChangeUniverseProcessMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id			id of object we want to unload
+ */
+ChangeUniverseProcessMessage::ChangeUniverseProcessMessage(int id) :
+	GameNetworkMessage("ChangeUniverseProcessMessage"),
+	m_id(id)
+{
+	addVariable(m_id);
+}	
+
+//-----------------------------------------------------------------------
+
+ChangeUniverseProcessMessage::ChangeUniverseProcessMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ChangeUniverseProcessMessage"),
+m_id(0)
+{
+	addVariable(m_id);
+    unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+ChangeUniverseProcessMessage::~ChangeUniverseProcessMessage()
+{
+}	
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChangeUniverseProcessMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChangeUniverseProcessMessage.h
new file mode 100644
index 00000000..789daead
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChangeUniverseProcessMessage.h
@@ -0,0 +1,47 @@
+//========================================================================
+//
+// ChangeUniverseProcessMessage.h - tells CentralServer to unload all instances of
+// an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_ChangeUniverseProcessMessage_H
+#define	_INCLUDED_ChangeUniverseProcessMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChangeUniverseProcessMessage : public GameNetworkMessage
+{
+public:
+
+	explicit ChangeUniverseProcessMessage  (int id);
+	ChangeUniverseProcessMessage           (Archive::ReadIterator & source);
+	~ChangeUniverseProcessMessage ();
+
+	int          getId() const;
+
+private:
+	Archive::AutoVariable<int>                 m_id;
+
+	ChangeUniverseProcessMessage();
+	ChangeUniverseProcessMessage(const ChangeUniverseProcessMessage&);
+	ChangeUniverseProcessMessage& operator= (const ChangeUniverseProcessMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline int ChangeUniverseProcessMessage::getId(void) const
+{
+	return m_id.get();
+}	
+
+// ----------------------------------------------------------------------
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterListMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterListMessage.cpp
new file mode 100644
index 00000000..b7c63cfa
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterListMessage.cpp
@@ -0,0 +1,102 @@
+// ======================================================================
+//
+// CharacterListMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CharacterListMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+CharacterListMessage::CharacterListMessage(uint32 accountNumber, const std::vector<CharacterListMessageData> &data) :
+		GameNetworkMessage("CharacterListMessage"),
+		m_data(),
+		m_accountNumber(accountNumber)
+{
+	m_data.set(data);
+
+	addVariable(m_data);
+	addVariable(m_accountNumber);
+}
+
+//-----------------------------------------------------------------------
+
+CharacterListMessage::CharacterListMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("CharacterListMessage"),
+		m_data(),
+		m_accountNumber()
+{
+	addVariable(m_data);
+	addVariable(m_accountNumber);
+	
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+CharacterListMessage::~CharacterListMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+const std::vector<CharacterListMessageData> &CharacterListMessage::getData() const
+{
+	return m_data.get();
+}		
+
+// ----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get(ReadIterator & source, CharacterListMessageData &c)
+	{
+		get(source,c.m_name);
+		get(source,c.m_objectTemplate);
+		get(source,c.m_characterId);
+		get(source,c.m_containerId);
+		get(source,c.m_location);
+		get(source,c.m_coordinates);
+	}
+
+	void put(ByteStream & target, const CharacterListMessageData &c)
+	{
+		put(target,c.m_name);
+		put(target,c.m_objectTemplate);
+		put(target,c.m_characterId);
+		put(target,c.m_containerId);
+		put(target,c.m_location);
+		put(target,c.m_coordinates);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+CharacterListMessageData::CharacterListMessageData(const Unicode::String &name, const std::string &objectTemplate, const NetworkId &characterId, const NetworkId &containerId, const std::string &location, const Vector &coordinates) :
+		m_name(name),
+		m_objectTemplate(objectTemplate),
+		m_characterId(characterId),
+		m_containerId(containerId),
+		m_location(location),
+		m_coordinates(coordinates)
+{
+}
+
+// ----------------------------------------------------------------------
+
+CharacterListMessageData::CharacterListMessageData() :
+		m_name(),
+		m_objectTemplate(),
+		m_characterId(),
+		m_containerId(),
+		m_location(),
+		m_coordinates()
+{
+}
+	
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterListMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterListMessage.h
new file mode 100644
index 00000000..1959ebf0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterListMessage.h
@@ -0,0 +1,83 @@
+// ======================================================================
+//
+// CharacterListMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_CharacterListMessage_H
+#define INCLUDED_CharacterListMessage_H
+
+// ======================================================================
+
+#include <string>
+
+#include "Unicode.h"
+#include "sharedMath/Vector.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * This is declared as a separate class so that it can be forwarded.
+ * Otherwise, it would be nested in CharacterListMessage
+ */
+class CharacterListMessageData
+{
+  public:
+	Unicode::String m_name;
+	std::string m_objectTemplate;
+	NetworkId m_characterId;
+	NetworkId m_containerId;
+	std::string m_location;
+	Vector m_coordinates;
+
+	CharacterListMessageData();
+	CharacterListMessageData(const Unicode::String &name, const std::string &objectTemplate, const NetworkId &characterId, const NetworkId &containerId, const std::string &location, const Vector &coordinates);
+};
+
+// ----------------------------------------------------------------------
+
+/**
+ * List a character for an account
+ * Sent from:  DBProcess
+ * Sent to:  Central
+ * Action:  Forward the character list to the client.
+ */
+class CharacterListMessage : public GameNetworkMessage
+{
+  public:
+	CharacterListMessage  (uint32 accountNumber, const std::vector<CharacterListMessageData> &data);
+	CharacterListMessage  (Archive::ReadIterator & source);
+	~CharacterListMessage ();
+	
+	uint32                       getAccountNumber() const;
+	const std::vector<CharacterListMessageData> &getData() const;
+
+  private:
+	Archive::AutoArray<CharacterListMessageData>  m_data;
+	Archive::AutoVariable<uint32> m_accountNumber;
+	
+	CharacterListMessage();
+	CharacterListMessage(const CharacterListMessage&);
+	CharacterListMessage& operator= (const CharacterListMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline uint32 CharacterListMessage::getAccountNumber(void) const
+{
+	return m_accountNumber.get();
+}
+
+// ----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get(ReadIterator & source, CharacterListMessageData &c);
+	void put(ByteStream & target, const CharacterListMessageData &c);
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterTransferStatusMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterTransferStatusMessage.cpp
new file mode 100644
index 00000000..7216fdd2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterTransferStatusMessage.cpp
@@ -0,0 +1,57 @@
+//========================================================================
+//
+// CharacterTransferStatusMessage.cpp - tells Centralserver a new object is being created.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CharacterTransferStatusMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id		id of object that was created
+ */
+CharacterTransferStatusMessage::CharacterTransferStatusMessage(unsigned int gameServerId, const NetworkId & toCharacterId, const std::string & statusMessage) :
+GameNetworkMessage("CharacterTransferStatusMessage"),
+m_gameServerId(gameServerId),
+m_toCharacterId(toCharacterId),
+m_statusMessage(statusMessage)
+{
+	addVariable(m_gameServerId);
+	addVariable(m_toCharacterId);
+	addVariable(m_statusMessage);
+}	// CharacterTransferStatusMessage::CharacterTransferStatusMessage
+
+//-----------------------------------------------------------------------
+
+CharacterTransferStatusMessage::CharacterTransferStatusMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("CharacterTransferStatusMessage"),
+m_gameServerId(),
+m_toCharacterId(),
+m_statusMessage()
+{
+	addVariable(m_gameServerId);
+	addVariable(m_toCharacterId);
+	addVariable(m_statusMessage);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+CharacterTransferStatusMessage::~CharacterTransferStatusMessage()
+{
+}	// CharacterTransferStatusMessage::~CharacterTransferStatusMessage
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterTransferStatusMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterTransferStatusMessage.h
new file mode 100644
index 00000000..70524b83
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CharacterTransferStatusMessage.h
@@ -0,0 +1,65 @@
+//========================================================================
+//
+// CharacterTransferStatusMessage.h - tells Centralserver a new object is being created.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_CharacterTransferStatusMessage_H
+#define	_INCLUDED_CharacterTransferStatusMessage_H
+
+//-----------------------------------------------------------------------
+
+#include <string>
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Vector.h"
+#include "sharedFoundation/NetworkId.h"
+
+//-----------------------------------------------------------------------
+
+class CharacterTransferStatusMessage : public GameNetworkMessage
+{
+public:
+	CharacterTransferStatusMessage  (unsigned int gameServerId, const NetworkId & toCharacterId, const std::string & statusMessage);
+	CharacterTransferStatusMessage  (Archive::ReadIterator & source);
+	~CharacterTransferStatusMessage ();
+
+	unsigned int         getGameServerId   () const;
+	const NetworkId &    getToCharacterId  () const;
+	const std::string &  getStatusMessage  () const;
+
+private:
+	Archive::AutoVariable<unsigned int>  m_gameServerId;
+	Archive::AutoVariable<NetworkId>     m_toCharacterId;
+	Archive::AutoVariable<std::string>   m_statusMessage;
+	
+	CharacterTransferStatusMessage();
+	CharacterTransferStatusMessage(const CharacterTransferStatusMessage&);
+	CharacterTransferStatusMessage& operator= (const CharacterTransferStatusMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+inline unsigned int CharacterTransferStatusMessage::getGameServerId() const
+{
+	return m_gameServerId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & CharacterTransferStatusMessage::getToCharacterId() const
+{
+	return m_toCharacterId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CharacterTransferStatusMessage::getStatusMessage() const
+{
+	return m_statusMessage.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_CharacterTransferStatusMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkCompleteMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkCompleteMessage.cpp
new file mode 100644
index 00000000..3d2bdbd4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkCompleteMessage.cpp
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// ChunkCompleteMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ChunkCompleteMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+ChunkCompleteMessage::ChunkCompleteMessage(std::vector<std::pair<int, int> > const & chunks) :
+	GameNetworkMessage("ChunkCompleteMessage"),
+	m_chunks()
+{
+	m_chunks.set(chunks);
+	
+	addVariable(m_chunks);
+}	
+
+// ----------------------------------------------------------------------
+
+ChunkCompleteMessage::ChunkCompleteMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("ChunkCompleteMessage"),
+		m_chunks()
+{
+	addVariable(m_chunks);
+	
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ChunkCompleteMessage::~ChunkCompleteMessage()
+{
+}	
+
+// ----------------------------------------------------------------------
+
+std::vector<std::pair<int, int> > const & ChunkCompleteMessage::getChunks() const
+{
+	return m_chunks.get();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkCompleteMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkCompleteMessage.h
new file mode 100644
index 00000000..00a91c16
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkCompleteMessage.h
@@ -0,0 +1,38 @@
+// ======================================================================
+//
+// ChunkCompleteMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_ChunkCompleteMessage_H
+#define	_INCLUDED_ChunkCompleteMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class ChunkCompleteMessage : public GameNetworkMessage
+{
+public:
+	ChunkCompleteMessage  (std::vector<std::pair<int, int> > const & chunks);
+	ChunkCompleteMessage  (Archive::ReadIterator & source);
+	~ChunkCompleteMessage ();
+
+	std::vector<std::pair<int, int> > const & getChunks() const;
+
+private:
+	Archive::AutoArray<std::pair<int, int> > m_chunks;
+
+	ChunkCompleteMessage();
+	ChunkCompleteMessage(const ChunkCompleteMessage&);
+	ChunkCompleteMessage& operator= (const ChunkCompleteMessage&);
+};
+
+// ======================================================================
+
+#endif	// _INCLUDED_ChunkCompleteMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkObjectListMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkObjectListMessage.cpp
new file mode 100644
index 00000000..bb01478a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkObjectListMessage.cpp
@@ -0,0 +1,64 @@
+//========================================================================
+//
+// ChunkObjectListMessage.cpp - 
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ChunkObjectListMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+/**
+ * Class constructor.
+ *
+ * @param process		gameserver id requesting the chunk (from RequestChunkMessage)
+ * @param count         number of ids in the chunk
+ * @param ids           list of ids
+ */
+ChunkObjectListMessage::ChunkObjectListMessage(uint32 process, uint16 count,
+	const NetworkId* ids) :
+	GameNetworkMessage("ChunkObjectListMessage"),
+	m_process(process),
+	m_ids()
+{
+	addVariable(m_process);
+	addVariable(m_ids);
+
+	if (count > 0)
+	{
+		NOT_NULL(ids);
+		std::vector<NetworkId> v;
+
+		for (size_t i = 0; i < count; ++i)
+			v.push_back(ids[i]);
+		m_ids.set(v);
+	}
+}	// RequestChunkMessage::RequestChunkMessage
+
+//-----------------------------------------------------------------------
+
+	ChunkObjectListMessage::ChunkObjectListMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ChunkObjectListMessage"),
+m_process(),
+m_ids()
+{
+	addVariable(m_process);
+	addVariable(m_ids);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+ChunkObjectListMessage::~ChunkObjectListMessage()
+{
+}	// ChunkObjectListMessage::~ChunkObjectListMessage
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkObjectListMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkObjectListMessage.h
new file mode 100644
index 00000000..23ba9ddf
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ChunkObjectListMessage.h
@@ -0,0 +1,71 @@
+//========================================================================
+//
+// ChunkObjectListMessage.h - tells Centralserver all the object ids in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_ChunkObjectListMessage_H
+#define	_INCLUDED_ChunkObjectListMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include <vector>
+
+/** @todo: right now this will every object in the game, we need to modify to
+ * give a chunk id list
+ */
+
+
+//-----------------------------------------------------------------------
+
+class ChunkObjectListMessage : public GameNetworkMessage
+{
+public:
+	ChunkObjectListMessage  (uint32 process, uint16 count, const NetworkId* ids);
+	ChunkObjectListMessage  (Archive::ReadIterator & source);
+	~ChunkObjectListMessage ();
+
+	const uint32             getProcess(void) const;
+	const uint16             getCount(void) const;
+	const std::vector<NetworkId> & getIds(void) const;
+
+private:
+	Archive::AutoVariable<uint32> m_process;		// gameserver id requesting the chunk (from RequestChunkMessage)
+	//uint16 m_count;			// number of ids in the chunk
+	//NetworkId*   m_ids;			// list of ids
+	Archive::AutoArray<NetworkId> 	m_ids;
+
+	ChunkObjectListMessage();
+	ChunkObjectListMessage(const ChunkObjectListMessage&);
+	ChunkObjectListMessage& operator= (const ChunkObjectListMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const uint32 ChunkObjectListMessage::getProcess(void) const
+{
+	return m_process.get();
+}	// ChunkObjectListMessage::getProcess
+
+//-----------------------------------------------------------------------
+
+inline const std::vector<NetworkId> & ChunkObjectListMessage::getIds(void) const
+{
+	return m_ids.get();
+}	// ChunkObjectListMessage::getIds
+
+//-----------------------------------------------------------------------
+
+inline const uint16 ChunkObjectListMessage::getCount() const
+{
+	// cast back to a 16 bit int to save space over the network
+	return static_cast<uint16>(m_ids.get().size());
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChunkObjectListMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsMessage.cpp
new file mode 100644
index 00000000..1abf754e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsMessage.cpp
@@ -0,0 +1,182 @@
+// ======================================================================
+//
+// ClaimRewardsMessage.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ClaimRewardsMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+
+// ======================================================================
+
+ClaimRewardsMessage::ClaimRewardsMessage  (uint32 gameServer, StationId stationId, NetworkId const & player, std::string const & rewardEvent, bool consumeEvent, std::string const & rewardItem, bool consumeItem, uint32 accountFeatureId, bool consumeAccountFeatureId) :
+		GameNetworkMessage("ClaimRewardsMessage"),
+		m_gameServer(gameServer),
+		m_stationId(stationId),
+		m_player(player),
+		m_rewardEvent(rewardEvent),
+		m_consumeEvent(consumeEvent),
+		m_accountUniqueItems(),
+		m_additionalItems(),
+		m_accountFeatureId(accountFeatureId),
+		m_consumeAccountFeatureId((accountFeatureId > 0) ? consumeAccountFeatureId : false), // m_consumeAccountFeatureId is only meaningful if m_accountFeatureId > 0
+		m_accountFeatureIdOldValue(),
+		m_accountFeatureIdNewValue()
+{
+	if (consumeItem)
+		m_accountUniqueItems.get().push_back(rewardItem);
+	else
+		m_additionalItems.get().push_back(rewardItem);
+	
+	addVariable(m_gameServer);
+	addVariable(m_stationId);
+	addVariable(m_player);
+	addVariable(m_rewardEvent);
+	addVariable(m_consumeEvent);
+	addVariable(m_accountUniqueItems);
+	addVariable(m_additionalItems);
+	addVariable(m_accountFeatureId);
+	addVariable(m_consumeAccountFeatureId);
+	addVariable(m_accountFeatureIdOldValue);
+	addVariable(m_accountFeatureIdNewValue);
+}
+
+//-----------------------------------------------------------------------
+
+ClaimRewardsMessage::ClaimRewardsMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("ClaimRewardsMessage"),
+		m_gameServer(),
+		m_stationId(),
+		m_player(),
+		m_rewardEvent(),
+		m_consumeEvent(),
+		m_accountUniqueItems(),
+		m_additionalItems(),
+		m_accountFeatureId(),
+		m_consumeAccountFeatureId(),
+		m_accountFeatureIdOldValue(),
+		m_accountFeatureIdNewValue()
+{
+	addVariable(m_gameServer);
+	addVariable(m_stationId);
+	addVariable(m_player);
+	addVariable(m_rewardEvent);
+	addVariable(m_consumeEvent);
+	addVariable(m_accountUniqueItems);
+	addVariable(m_additionalItems);
+	addVariable(m_accountFeatureId);
+	addVariable(m_consumeAccountFeatureId);
+	addVariable(m_accountFeatureIdOldValue);
+	addVariable(m_accountFeatureIdNewValue);
+
+	unpack(source); //lint !e1506 Call to virtual from constructor
+}
+
+//-----------------------------------------------------------------------
+
+ClaimRewardsMessage::~ClaimRewardsMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+uint32 ClaimRewardsMessage::getGameServer() const
+{
+	return m_gameServer.get();
+}
+
+// ----------------------------------------------------------------------
+
+StationId ClaimRewardsMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & ClaimRewardsMessage::getPlayer() const
+{
+	return m_player.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & ClaimRewardsMessage::getRewardEvent() const
+{
+	return m_rewardEvent.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool ClaimRewardsMessage::getConsumeEvent() const
+{
+	return m_consumeEvent.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & ClaimRewardsMessage::getRewardItem() const
+{
+	static const std::string empty;
+
+	if (!m_accountUniqueItems.get().empty())
+		return (m_accountUniqueItems.get())[0];
+	else if (!m_additionalItems.get().empty())
+		return (m_additionalItems.get())[0];
+
+	return empty;
+}
+
+// ----------------------------------------------------------------------
+
+bool ClaimRewardsMessage::getConsumeItem() const
+{
+	return (!m_accountUniqueItems.get().empty());
+}
+
+// ----------------------------------------------------------------------
+
+uint32 ClaimRewardsMessage::getAccountFeatureId() const
+{
+	return m_accountFeatureId.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool ClaimRewardsMessage::getConsumeAccountFeatureId() const
+{
+	return m_consumeAccountFeatureId.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & ClaimRewardsMessage::getAccountFeatureIdOldValue() const
+{
+	return m_accountFeatureIdOldValue.get();
+}
+
+// ----------------------------------------------------------------------
+
+void ClaimRewardsMessage::setAccountFeatureIdOldValue(std::string const & accountFeatureIdOldValue)
+{
+	m_accountFeatureIdOldValue.set(accountFeatureIdOldValue);
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & ClaimRewardsMessage::getAccountFeatureIdNewValue() const
+{
+	return m_accountFeatureIdNewValue.get();
+}
+
+// ----------------------------------------------------------------------
+
+void ClaimRewardsMessage::setAccountFeatureIdNewValue(std::string const & accountFeatureIdNewValue)
+{
+	m_accountFeatureIdNewValue.set(accountFeatureIdNewValue);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsMessage.h
new file mode 100644
index 00000000..18c4886f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsMessage.h
@@ -0,0 +1,72 @@
+// ======================================================================
+//
+// ClaimRewardsMessage.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ClaimRewardsMessage_H
+#define INCLUDED_ClaimRewardsMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Request claiming a set of veteran rewards
+ * Sent from:  Game Server
+ * Sent to:  Login Server (via Central)
+ * Action:  Check that these rewards can still be claimed on this account.
+ */
+class ClaimRewardsMessage : public GameNetworkMessage
+{
+  public:
+	ClaimRewardsMessage  (uint32 gameServer, StationId stationId, NetworkId const & player, std::string const & rewardEvent, bool consumeEvent, std::string const & rewardItem, bool consumeItem, uint32 accountFeatureId, bool consumeAccountFeatureId);
+	ClaimRewardsMessage  (Archive::ReadIterator & source);
+	virtual ~ClaimRewardsMessage ();
+
+	uint32 getGameServer() const;
+	StationId getStationId() const;
+	NetworkId const & getPlayer() const;
+	std::string const & getRewardEvent() const;
+	bool getConsumeEvent() const;
+	std::string const & getRewardItem() const;
+	bool getConsumeItem() const;
+	uint32 getAccountFeatureId() const;
+	bool getConsumeAccountFeatureId() const;
+	std::string const & getAccountFeatureIdOldValue() const;
+	void setAccountFeatureIdOldValue(std::string const & accountFeatureIdOldValue);
+	std::string const & getAccountFeatureIdNewValue() const;
+	void setAccountFeatureIdNewValue(std::string const & accountFeatureIdNewValue);
+
+  private:
+	Archive::AutoVariable<uint32> m_gameServer;
+	Archive::AutoVariable<StationId> m_stationId;
+	Archive::AutoVariable<NetworkId> m_player;
+	Archive::AutoVariable<std::string> m_rewardEvent;
+	Archive::AutoVariable<bool> m_consumeEvent;
+	Archive::AutoArray<std::string> m_accountUniqueItems; // once-per-account items that should be registered in the login database
+	Archive::AutoArray<std::string> m_additionalItems;    // rewards the player is claiming which are not once-per-account and don't need to be registered in the login database
+	Archive::AutoVariable<uint32> m_accountFeatureId; // if non-zero, reward requires that the account has this feature id, and reward will consume 1 count of this feature id
+	Archive::AutoVariable<bool> m_consumeAccountFeatureId; // for account feature Id reward, indicates whether to consume the account feature Id
+	
+	// for reward that requires an account feature id,
+	// these fields will contain the old and new value
+	// of the account feature id; these values are passed to
+	// session/Platform to update the account feature id; only
+	// on a successful update will the reward then be granted
+	Archive::AutoVariable<std::string> m_accountFeatureIdOldValue;
+	Archive::AutoVariable<std::string> m_accountFeatureIdNewValue;
+
+  private:
+	ClaimRewardsMessage();
+	ClaimRewardsMessage(const ClaimRewardsMessage&);
+	ClaimRewardsMessage& operator= (const ClaimRewardsMessage&);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsReplyMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsReplyMessage.cpp
new file mode 100644
index 00000000..ebd4271f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsReplyMessage.cpp
@@ -0,0 +1,158 @@
+// ======================================================================
+//
+// ClaimRewardsReplyMessage.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ClaimRewardsReplyMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+
+// ======================================================================
+
+ClaimRewardsReplyMessage::ClaimRewardsReplyMessage(uint32 gameServer, StationId stationId, NetworkId const & player, std::string const & rewardEvent, std::string const & rewardItem, uint32 accountFeatureId, bool consumeAccountFeatureId, int previousAccountFeatureIdCount, int currentAccountFeatureIdCount, bool result) :
+		GameNetworkMessage("ClaimRewardsReplyMessage"),
+		m_gameServer(gameServer),
+		m_stationId(stationId),
+		m_player(player),
+		m_rewardEvent(rewardEvent),
+		m_accountUniqueItems(),
+		m_additionalItems(),
+		m_accountFeatureId(accountFeatureId),
+		m_consumeAccountFeatureId((accountFeatureId > 0) ? consumeAccountFeatureId : false), // m_consumeAccountFeatureId is only meaningful if m_accountFeatureId > 0
+		m_previousAccountFeatureIdCount(previousAccountFeatureIdCount),
+		m_currentAccountFeatureIdCount(currentAccountFeatureIdCount),
+		m_result(result)
+{
+	m_accountUniqueItems.get().push_back(rewardItem);
+	
+	addVariable(m_gameServer);
+	addVariable(m_stationId);
+	addVariable(m_player);
+	addVariable(m_rewardEvent);
+	addVariable(m_accountUniqueItems);
+	addVariable(m_additionalItems);
+	addVariable(m_accountFeatureId);
+	addVariable(m_consumeAccountFeatureId);
+	addVariable(m_previousAccountFeatureIdCount);
+	addVariable(m_currentAccountFeatureIdCount);
+	addVariable(m_result);
+}
+
+//-----------------------------------------------------------------------
+
+ClaimRewardsReplyMessage::ClaimRewardsReplyMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("ClaimRewardsReplyMessage"),
+		m_gameServer(),
+		m_stationId(),
+		m_player(),
+		m_rewardEvent(),
+		m_accountUniqueItems(),
+		m_additionalItems(),
+		m_accountFeatureId(),
+		m_consumeAccountFeatureId(),
+		m_previousAccountFeatureIdCount(),
+		m_currentAccountFeatureIdCount(),
+		m_result()
+{
+	addVariable(m_gameServer);
+	addVariable(m_stationId);
+	addVariable(m_player);
+	addVariable(m_rewardEvent);
+	addVariable(m_accountUniqueItems);
+	addVariable(m_additionalItems);
+	addVariable(m_accountFeatureId);
+	addVariable(m_consumeAccountFeatureId);
+	addVariable(m_previousAccountFeatureIdCount);
+	addVariable(m_currentAccountFeatureIdCount);
+	addVariable(m_result);
+	
+	unpack(source); //lint !e1506 Call to virtual from constructor
+}
+
+//-----------------------------------------------------------------------
+
+ClaimRewardsReplyMessage::~ClaimRewardsReplyMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+uint32 ClaimRewardsReplyMessage::getGameServer() const
+{
+	return m_gameServer.get();
+}
+
+// ----------------------------------------------------------------------
+
+StationId ClaimRewardsReplyMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & ClaimRewardsReplyMessage::getPlayer() const
+{
+	return m_player.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & ClaimRewardsReplyMessage::getRewardEvent() const
+{
+	return m_rewardEvent.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & ClaimRewardsReplyMessage::getRewardItem() const
+{
+	static const std::string empty;
+
+	if (!m_accountUniqueItems.get().empty())
+		return (m_accountUniqueItems.get())[0];
+	else if (!m_additionalItems.get().empty())
+		return (m_additionalItems.get())[0];
+
+	return empty;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 ClaimRewardsReplyMessage::getAccountFeatureId() const
+{
+	return m_accountFeatureId.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool ClaimRewardsReplyMessage::getConsumeAccountFeatureId() const
+{
+	return m_consumeAccountFeatureId.get();
+}
+
+// ----------------------------------------------------------------------
+
+int ClaimRewardsReplyMessage::getPreviousAccountFeatureIdCount() const
+{
+	return m_previousAccountFeatureIdCount.get();
+}
+
+// ----------------------------------------------------------------------
+
+int ClaimRewardsReplyMessage::getCurrentAccountFeatureIdCount() const
+{
+	return m_currentAccountFeatureIdCount.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool ClaimRewardsReplyMessage::getResult() const
+{
+	return m_result.get();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsReplyMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsReplyMessage.h
new file mode 100644
index 00000000..c896bda6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ClaimRewardsReplyMessage.h
@@ -0,0 +1,64 @@
+// ======================================================================
+//
+// ClaimRewardsReplyMessage.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ClaimRewardsReplyMessage_H
+#define INCLUDED_ClaimRewardsReplyMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Request claiming a set of veteran rewards
+ * Sent from:  Game Server
+ * Sent to:  Login Server (via Central)
+ * Action:  Check that these rewards can still be claimed on this account.
+ */
+class ClaimRewardsReplyMessage : public GameNetworkMessage
+{
+  public:
+	ClaimRewardsReplyMessage  (uint32 gameServer, StationId stationId, NetworkId const & player, std::string const & rewardEvent, std::string const & rewardItem, uint32 accountFeatureId, bool consumeAccountFeatureId, int previousAccountFeatureIdCount, int currentAccountFeatureIdCount, bool result);
+	ClaimRewardsReplyMessage  (Archive::ReadIterator & source);
+	~ClaimRewardsReplyMessage ();
+
+	uint32 getGameServer() const;
+	StationId getStationId() const;
+	NetworkId const & getPlayer() const;
+	std::string const & getRewardEvent() const;
+	std::string const & getRewardItem() const;
+	uint32 getAccountFeatureId() const;
+	bool getConsumeAccountFeatureId() const;
+	int getPreviousAccountFeatureIdCount() const;
+	int getCurrentAccountFeatureIdCount() const;
+	bool getResult() const;
+	
+  private:
+	Archive::AutoVariable<uint32> m_gameServer;
+	Archive::AutoVariable<StationId> m_stationId;
+	Archive::AutoVariable<NetworkId> m_player;
+	Archive::AutoVariable<std::string> m_rewardEvent;
+	Archive::AutoArray<std::string> m_accountUniqueItems; // once-per-account items that should be registered in the login database
+	Archive::AutoArray<std::string> m_additionalItems;    // rewards the player is claiming which are not once-per-account and don't need to be registered in the login database
+	Archive::AutoVariable<uint32> m_accountFeatureId; // if non-zero, reward required that the account has this feature id, and reward has consumed 1 count of this feature id
+	Archive::AutoVariable<bool> m_consumeAccountFeatureId; // for account feature Id reward, indicates whether to consume the account feature Id
+	Archive::AutoVariable<int> m_previousAccountFeatureIdCount;
+	Archive::AutoVariable<int> m_currentAccountFeatureIdCount;
+	Archive::AutoVariable<bool> m_result;
+	
+  private:
+	ClaimRewardsReplyMessage();
+	ClaimRewardsReplyMessage(const ClaimRewardsReplyMessage&);
+	ClaimRewardsReplyMessage& operator= (const ClaimRewardsReplyMessage&);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CreateNewObjectMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CreateNewObjectMessage.cpp
new file mode 100644
index 00000000..0c129276
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CreateNewObjectMessage.cpp
@@ -0,0 +1,62 @@
+//========================================================================
+//
+// CreateNewObjectMessage.cpp - tells Centralserver a new object is being created.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CreateNewObjectMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id		id of object that was created
+ */
+CreateNewObjectMessage::CreateNewObjectMessage(const NetworkId& id, uint32 process,
+	const std::string &scene, const Vector &pos) :
+	GameNetworkMessage("CreateNewObjectMessage"),
+	m_id(id),
+	m_process(process),
+	m_scene(scene),
+	m_pos(pos)
+{
+	addVariable(m_id);
+	addVariable(m_process);
+	addVariable(m_scene);
+	addVariable(m_pos);
+}	// CreateNewObjectMessage::CreateNewObjectMessage
+
+//-----------------------------------------------------------------------
+
+CreateNewObjectMessage::CreateNewObjectMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("CreateNewObjectMessage"),
+m_id(),
+m_process(),
+m_scene(),
+m_pos()
+{
+	addVariable(m_id);
+	addVariable(m_process);
+	addVariable(m_scene);
+	addVariable(m_pos);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+CreateNewObjectMessage::~CreateNewObjectMessage()
+{
+}	// CreateNewObjectMessage::~CreateNewObjectMessage
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CreateNewObjectMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CreateNewObjectMessage.h
new file mode 100644
index 00000000..c764931c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/CreateNewObjectMessage.h
@@ -0,0 +1,66 @@
+//========================================================================
+//
+// CreateNewObjectMessage.h - tells Centralserver a new object is being created.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_CreateNewObjectMessage_H
+#define	_INCLUDED_CreateNewObjectMessage_H
+
+//-----------------------------------------------------------------------
+
+#include <string>
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Vector.h"
+
+//-----------------------------------------------------------------------
+
+class CreateNewObjectMessage : public GameNetworkMessage
+{
+public:
+	CreateNewObjectMessage  (const NetworkId& id, uint32 process, const std::string &scene, const Vector &pos);
+	CreateNewObjectMessage  (Archive::ReadIterator & source);
+	~CreateNewObjectMessage ();
+
+	const NetworkId&          getId(void) const;
+	uint32              getProcess(void) const;
+	const std::string&  getScene(void) const;
+	const Vector&       getPos(void) const;
+
+private:
+	Archive::AutoVariable<NetworkId>         m_id;			// id of object that was created
+	Archive::AutoVariable<uint32>      m_process;		// process the object was created on
+	Archive::AutoVariable<std::string> m_scene;		// scene (planet) the object is in
+	Archive::AutoVariable<Vector>      m_pos;			// position of the object
+
+	CreateNewObjectMessage();
+	CreateNewObjectMessage(const CreateNewObjectMessage&);
+	CreateNewObjectMessage& operator= (const CreateNewObjectMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId& CreateNewObjectMessage::getId(void) const
+{
+	return m_id.get();
+}	// CreateNewObjectMessage::getId
+
+inline uint32 CreateNewObjectMessage::getProcess(void) const
+{
+	return m_process.get();
+}	// CreateNewObjectMessage::getProcess
+
+inline const std::string& CreateNewObjectMessage::getScene(void) const
+{
+	return m_scene.get();
+}	// CreateNewObjectMessage::getScene
+
+inline const Vector& CreateNewObjectMessage::getPos(void) const
+{
+	return m_pos.get();
+}	// CreateNewObjectMessage::getPos
+
+#endif	// _INCLUDED_CreateNewObjectMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/DownloadCharacterMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/DownloadCharacterMessage.cpp
new file mode 100644
index 00000000..565fdaea
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/DownloadCharacterMessage.cpp
@@ -0,0 +1,61 @@
+//========================================================================
+//
+// DownloadCharacterMessage.cpp - tells Centralserver a new object is being created.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/DownloadCharacterMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id		id of object that was created
+ */
+DownloadCharacterMessage::DownloadCharacterMessage(unsigned int stationId, unsigned int gameServerId, const NetworkId & toCharacterId, bool isAdmin) :
+GameNetworkMessage("DownloadCharacterMessage"),
+m_stationId(stationId),
+m_gameServerId(gameServerId),
+m_toCharacterId(toCharacterId),
+m_isAdmin(isAdmin)
+{
+	addVariable(m_stationId);
+	addVariable(m_gameServerId);
+	addVariable(m_toCharacterId);
+	addVariable(m_isAdmin);
+}	// DownloadCharacterMessage::DownloadCharacterMessage
+
+//-----------------------------------------------------------------------
+
+DownloadCharacterMessage::DownloadCharacterMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("DownloadCharacterMessage"),
+m_stationId(),
+m_gameServerId(),
+m_toCharacterId(),
+m_isAdmin()
+{
+	addVariable(m_stationId);
+	addVariable(m_gameServerId);
+	addVariable(m_toCharacterId);
+	addVariable(m_isAdmin);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+DownloadCharacterMessage::~DownloadCharacterMessage()
+{
+}	// DownloadCharacterMessage::~DownloadCharacterMessage
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/DownloadCharacterMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/DownloadCharacterMessage.h
new file mode 100644
index 00000000..733ada9b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/DownloadCharacterMessage.h
@@ -0,0 +1,74 @@
+//========================================================================
+//
+// DownloadCharacterMessage.h - tells Centralserver a new object is being created.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_DownloadCharacterMessage_H
+#define	_INCLUDED_DownloadCharacterMessage_H
+
+//-----------------------------------------------------------------------
+
+#include <string>
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Vector.h"
+#include "sharedFoundation/NetworkId.h"
+
+//-----------------------------------------------------------------------
+
+class DownloadCharacterMessage : public GameNetworkMessage
+{
+public:
+	DownloadCharacterMessage  (unsigned int stationId, unsigned int gameServerId, const NetworkId & toCharacterId, bool isAdmin);
+	DownloadCharacterMessage  (Archive::ReadIterator & source);
+	~DownloadCharacterMessage ();
+
+	unsigned int       getStationId      () const;
+	unsigned int       getGameServerId   () const;
+	const NetworkId &  getToCharacterId  () const;
+	bool               getIsAdmin        () const;
+
+private:
+	Archive::AutoVariable<unsigned int>  m_stationId;
+	Archive::AutoVariable<unsigned int>  m_gameServerId;
+	Archive::AutoVariable<NetworkId>     m_toCharacterId;
+	Archive::AutoVariable<bool>          m_isAdmin;
+
+	DownloadCharacterMessage();
+	DownloadCharacterMessage(const DownloadCharacterMessage&);
+	DownloadCharacterMessage& operator= (const DownloadCharacterMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+inline unsigned int DownloadCharacterMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned int DownloadCharacterMessage::getGameServerId() const
+{
+	return m_gameServerId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & DownloadCharacterMessage::getToCharacterId() const
+{
+	return m_toCharacterId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool DownloadCharacterMessage::getIsAdmin() const
+{
+	return m_isAdmin.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_DownloadCharacterMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ExcommunicateGameServerMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ExcommunicateGameServerMessage.cpp
new file mode 100644
index 00000000..391a961e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ExcommunicateGameServerMessage.cpp
@@ -0,0 +1,46 @@
+//========================================================================
+//
+// ExcommunicateGameServerMessage.cpp
+//
+// copyright 2003 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ExcommunicateGameServerMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+ExcommunicateGameServerMessage::ExcommunicateGameServerMessage(uint32 serverId, uint32 pid, const std::string & h) :
+		GameNetworkMessage("ExcommunicateGameServerMessage"),
+		m_serverId(serverId),
+		m_processId(pid),
+		m_hostName(h)
+{
+	addVariable(m_serverId);
+	addVariable(m_processId);
+	addVariable(m_hostName);
+}
+
+//-----------------------------------------------------------------------
+
+ExcommunicateGameServerMessage::ExcommunicateGameServerMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("ExcommunicateGameServerMessage"),
+		m_serverId()
+{
+	addVariable(m_serverId);
+	addVariable(m_processId);
+	addVariable(m_hostName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ExcommunicateGameServerMessage::~ExcommunicateGameServerMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ExcommunicateGameServerMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ExcommunicateGameServerMessage.h
new file mode 100644
index 00000000..ec35cd3d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ExcommunicateGameServerMessage.h
@@ -0,0 +1,68 @@
+// ======================================================================
+//
+// ExcommunicateGameServerMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ExcommunicateGameServerMessage_H
+#define INCLUDED_ExcommunicateGameServerMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Sent from:  Central 
+ * Sent to:  everybody
+ * Action:  Drop connection to the specified game server, doing the same
+ * things that would be done normally if the game server closed connection
+ * (e.g. drop proxies, start recovery on the planet server, etc.)
+ */
+class ExcommunicateGameServerMessage : public GameNetworkMessage
+{
+public:
+	ExcommunicateGameServerMessage  (uint32 serverId, uint32 pid, const std::string & hostName);
+	explicit ExcommunicateGameServerMessage  (Archive::ReadIterator & source);
+	~ExcommunicateGameServerMessage ();
+
+	uint32               getServerId   () const;
+	uint32               getProcessId  () const;
+	const std::string &  getHostName   () const;
+
+private:
+	Archive::AutoVariable<uint32>         m_serverId;
+	Archive::AutoVariable<uint32>         m_processId;	
+	Archive::AutoVariable<std::string>    m_hostName;
+
+	ExcommunicateGameServerMessage();
+	ExcommunicateGameServerMessage(const ExcommunicateGameServerMessage&);
+	ExcommunicateGameServerMessage& operator= (const ExcommunicateGameServerMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline uint32 ExcommunicateGameServerMessage::getServerId() const
+{
+	return m_serverId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline uint32 ExcommunicateGameServerMessage::getProcessId() const
+{
+	return m_processId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ExcommunicateGameServerMessage::getHostName() const
+{
+	return m_hostName.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FailedToLoadObjectMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FailedToLoadObjectMessage.cpp
new file mode 100644
index 00000000..aa6cc939
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FailedToLoadObjectMessage.cpp
@@ -0,0 +1,54 @@
+//========================================================================
+//
+// FailedToLoadObjectMessage.cpp - tells Centralserver an object couldn't be loaded.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/FailedToLoadObjectMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id					id of object we didn't load
+ * @param requestingProcess		process that originally requested the load
+ */
+FailedToLoadObjectMessage::FailedToLoadObjectMessage(const NetworkId& id,
+	uint32 requestingProcess) :
+	GameNetworkMessage("FailedToLoadObjectMessage"),
+	m_id(id),
+	m_process(requestingProcess)
+{
+	addVariable(m_id);
+	addVariable(m_process);
+}	// FailedToLoadObjectMessage::FailedToLoadObjectMessage
+
+//-----------------------------------------------------------------------
+
+FailedToLoadObjectMessage::FailedToLoadObjectMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("FailedToLoadObjectMessage"),
+m_id(),
+m_process()
+{
+	addVariable(m_id);
+	addVariable(m_process);
+	unpack(source);
+}	// FailedToLoadObjectMessage::FailedToLoadObjectMessage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+FailedToLoadObjectMessage::~FailedToLoadObjectMessage()
+{
+}	// FailedToLoadObjectMessage::~FailedToLoadObjectMessage
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FailedToLoadObjectMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FailedToLoadObjectMessage.h
new file mode 100644
index 00000000..89c93d46
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FailedToLoadObjectMessage.h
@@ -0,0 +1,51 @@
+//========================================================================
+//
+// FailedToLoadObjectMessage.h - tells Centralserver an object couldn't be loaded.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_FailedToLoadObjectMessage_H
+#define	_INCLUDED_FailedToLoadObjectMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class FailedToLoadObjectMessage : public GameNetworkMessage
+{
+public:
+	FailedToLoadObjectMessage  (const NetworkId& id, uint32 requestingProcess);
+	FailedToLoadObjectMessage  (Archive::ReadIterator & source);
+	~FailedToLoadObjectMessage ();
+
+	const NetworkId&          getId(void) const;
+	uint32              getRequestingProcess(void) const;
+
+private:
+	Archive::AutoVariable<NetworkId>    m_id;				// id of object we didn't load
+	Archive::AutoVariable<uint32> m_process;			// process that originally requested the load
+
+	FailedToLoadObjectMessage();
+	FailedToLoadObjectMessage(const FailedToLoadObjectMessage&);
+	FailedToLoadObjectMessage& operator= (const FailedToLoadObjectMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId& FailedToLoadObjectMessage::getId(void) const
+{
+	return m_id.get();
+}	// FailedToLoadObjectMessage::getId
+
+inline uint32 FailedToLoadObjectMessage::getRequestingProcess(void) const
+{
+	return m_process.get();
+}	// FailedToLoadObjectMessage::getRequestingProcess
+
+
+#endif	// _INCLUDED_FailedToLoadObjectMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionRequest.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionRequest.cpp
new file mode 100644
index 00000000..cd28cc6c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionRequest.cpp
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// FeatureIdTransactionRequest.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/FeatureIdTransactionRequest.h"
+
+// ======================================================================
+
+FeatureIdTransactionRequest::FeatureIdTransactionRequest(uint32 gameServer, StationId stationId, NetworkId const & player) :
+	GameNetworkMessage("FeatureIdTransactionRequest"),
+	m_gameServer(gameServer),
+	m_stationId(stationId),
+	m_player(player)
+{
+	addVariable(m_gameServer);
+	addVariable(m_stationId);
+	addVariable(m_player);
+}
+
+//-----------------------------------------------------------------------
+
+FeatureIdTransactionRequest::FeatureIdTransactionRequest(Archive::ReadIterator & source) :
+	GameNetworkMessage("FeatureIdTransactionRequest"),
+	m_gameServer(),
+	m_stationId(),
+	m_player()
+{
+	addVariable(m_gameServer);
+	addVariable(m_stationId);
+	addVariable(m_player);
+
+	unpack(source); //lint !e1506 Call to virtual from constructor
+}
+
+//-----------------------------------------------------------------------
+
+FeatureIdTransactionRequest::~FeatureIdTransactionRequest()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionRequest.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionRequest.h
new file mode 100644
index 00000000..b0e192f0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionRequest.h
@@ -0,0 +1,63 @@
+// ======================================================================
+//
+// FeatureIdTransactionRequest.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_FeatureIdTransactionRequest_H
+#define INCLUDED_FeatureIdTransactionRequest_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class FeatureIdTransactionRequest : public GameNetworkMessage
+{
+  public:
+	FeatureIdTransactionRequest  (uint32 gameServer, StationId stationId, NetworkId const & player);
+	FeatureIdTransactionRequest  (Archive::ReadIterator & source);
+	virtual ~FeatureIdTransactionRequest ();
+
+	uint32 getGameServer() const;
+	StationId getStationId() const;
+	NetworkId const & getPlayer() const;
+
+  private:
+	  Archive::AutoVariable<uint32> m_gameServer;
+	  Archive::AutoVariable<StationId> m_stationId;
+	  Archive::AutoVariable<NetworkId> m_player;
+
+  private:
+	FeatureIdTransactionRequest();
+	FeatureIdTransactionRequest(const FeatureIdTransactionRequest&);
+	FeatureIdTransactionRequest& operator= (const FeatureIdTransactionRequest&);
+};
+
+// ----------------------------------------------------------------------
+
+inline uint32 FeatureIdTransactionRequest::getGameServer() const
+{
+	return m_gameServer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline StationId FeatureIdTransactionRequest::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & FeatureIdTransactionRequest::getPlayer() const
+{
+	return m_player.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionResponse.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionResponse.cpp
new file mode 100644
index 00000000..fa65d961
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionResponse.cpp
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// FeatureIdTransactionResponse.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/FeatureIdTransactionResponse.h"
+
+// ======================================================================
+
+FeatureIdTransactionResponse::FeatureIdTransactionResponse(uint32 gameServer, NetworkId const & player, std::map<std::string, int> const & transactions) :
+	GameNetworkMessage("FeatureIdTransactionResponse"),
+	m_gameServer(gameServer),
+	m_player(player),
+	m_transactions(transactions)
+{
+	addVariable(m_gameServer);
+	addVariable(m_player);
+	addVariable(m_transactions);
+}
+
+//-----------------------------------------------------------------------
+
+FeatureIdTransactionResponse::FeatureIdTransactionResponse(Archive::ReadIterator & source) :
+	GameNetworkMessage("FeatureIdTransactionResponse"),
+	m_gameServer(),
+	m_player(),
+	m_transactions()
+{
+	addVariable(m_gameServer);
+	addVariable(m_player);
+	addVariable(m_transactions);
+
+	unpack(source); //lint !e1506 Call to virtual from constructor
+}
+
+//-----------------------------------------------------------------------
+
+FeatureIdTransactionResponse::~FeatureIdTransactionResponse()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionResponse.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionResponse.h
new file mode 100644
index 00000000..81f95c82
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionResponse.h
@@ -0,0 +1,63 @@
+// ======================================================================
+//
+// FeatureIdTransactionResponse.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_FeatureIdTransactionResponse_H
+#define INCLUDED_FeatureIdTransactionResponse_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class FeatureIdTransactionResponse : public GameNetworkMessage
+{
+  public:
+	FeatureIdTransactionResponse  (uint32 gameServer, NetworkId const & player, std::map<std::string, int> const & transactions);
+	FeatureIdTransactionResponse  (Archive::ReadIterator & source);
+	virtual ~FeatureIdTransactionResponse ();
+
+	uint32 getGameServer() const;
+	NetworkId const & getPlayer() const;
+	std::map<std::string, int> const & getTransactions() const;
+
+  private:
+	  Archive::AutoVariable<uint32> m_gameServer;
+	  Archive::AutoVariable<NetworkId> m_player;
+	  Archive::AutoVariable<std::map<std::string, int> > m_transactions;
+
+  private:
+	FeatureIdTransactionResponse();
+	FeatureIdTransactionResponse(const FeatureIdTransactionResponse&);
+	FeatureIdTransactionResponse& operator= (const FeatureIdTransactionResponse&);
+};
+
+// ----------------------------------------------------------------------
+
+inline uint32 FeatureIdTransactionResponse::getGameServer() const
+{
+	return m_gameServer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & FeatureIdTransactionResponse::getPlayer() const
+{
+	return m_player.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::map<std::string, int> const & FeatureIdTransactionResponse::getTransactions() const
+{
+	return m_transactions.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionSyncUpdate.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionSyncUpdate.cpp
new file mode 100644
index 00000000..96c7398d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionSyncUpdate.cpp
@@ -0,0 +1,49 @@
+// ======================================================================
+//
+// FeatureIdTransactionSyncUpdate.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/FeatureIdTransactionSyncUpdate.h"
+
+// ======================================================================
+
+FeatureIdTransactionSyncUpdate::FeatureIdTransactionSyncUpdate(StationId stationId, NetworkId const & player, std::string const & itemId, int adjustment) :
+	GameNetworkMessage("FeatureIdTransactionSyncUpdate"),
+	m_stationId(stationId),
+	m_player(player),
+	m_itemId(itemId),
+	m_adjustment(adjustment)
+{
+	addVariable(m_stationId);
+	addVariable(m_player);
+	addVariable(m_itemId);
+	addVariable(m_adjustment);
+}
+
+//-----------------------------------------------------------------------
+
+FeatureIdTransactionSyncUpdate::FeatureIdTransactionSyncUpdate(Archive::ReadIterator & source) :
+	GameNetworkMessage("FeatureIdTransactionSyncUpdate"),
+	m_stationId(),
+	m_player(),
+	m_itemId(),
+	m_adjustment()
+{
+	addVariable(m_stationId);
+	addVariable(m_player);
+	addVariable(m_itemId);
+	addVariable(m_adjustment);
+
+	unpack(source); //lint !e1506 Call to virtual from constructor
+}
+
+//-----------------------------------------------------------------------
+
+FeatureIdTransactionSyncUpdate::~FeatureIdTransactionSyncUpdate()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionSyncUpdate.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionSyncUpdate.h
new file mode 100644
index 00000000..1bfb5c8f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FeatureIdTransactionSyncUpdate.h
@@ -0,0 +1,72 @@
+// ======================================================================
+//
+// FeatureIdTransactionSyncUpdate.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_FeatureIdTransactionSyncUpdate_H
+#define INCLUDED_FeatureIdTransactionSyncUpdate_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class FeatureIdTransactionSyncUpdate : public GameNetworkMessage
+{
+  public:
+	FeatureIdTransactionSyncUpdate  (StationId stationId, NetworkId const & player, std::string const & itemId, int adjustment);
+	FeatureIdTransactionSyncUpdate  (Archive::ReadIterator & source);
+	virtual ~FeatureIdTransactionSyncUpdate ();
+
+	StationId getStationId() const;
+	NetworkId const & getPlayer() const;
+	std::string const & getItemId() const;
+	int getAdjustment() const;
+
+  private:
+	  Archive::AutoVariable<StationId> m_stationId;
+	  Archive::AutoVariable<NetworkId> m_player;
+	  Archive::AutoVariable<std::string> m_itemId;
+	  Archive::AutoVariable<int> m_adjustment;
+
+  private:
+	FeatureIdTransactionSyncUpdate();
+	FeatureIdTransactionSyncUpdate(const FeatureIdTransactionSyncUpdate&);
+	FeatureIdTransactionSyncUpdate& operator= (const FeatureIdTransactionSyncUpdate&);
+};
+
+// ----------------------------------------------------------------------
+
+inline StationId FeatureIdTransactionSyncUpdate::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & FeatureIdTransactionSyncUpdate::getPlayer() const
+{
+	return m_player.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & FeatureIdTransactionSyncUpdate::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int FeatureIdTransactionSyncUpdate::getAdjustment() const
+{
+	return m_adjustment.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FlagObjectForDeleteMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FlagObjectForDeleteMessage.cpp
new file mode 100644
index 00000000..46f31ed1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FlagObjectForDeleteMessage.cpp
@@ -0,0 +1,66 @@
+//========================================================================
+//
+// FlagObjectForDeleteMessage.cpp - tells  CentralServer to unload all instances of
+// an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/FlagObjectForDeleteMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id			id of object we want to unload
+ */
+FlagObjectForDeleteMessage::FlagObjectForDeleteMessage(const NetworkId& id, int reason, bool immediate, bool demandLoadedContainer, bool cascadeReason) :
+	GameNetworkMessage("FlagObjectForDeleteMessage"),
+	m_id(id),
+	m_reason(reason),
+	m_immediate(immediate),
+	m_demandLoadedContainer(demandLoadedContainer),
+	m_cascadeReason(cascadeReason)
+{
+	addVariable(m_id);
+	addVariable(m_reason);
+	addVariable(m_immediate);
+	addVariable(m_demandLoadedContainer);
+	addVariable(m_cascadeReason);
+
+	DEBUG_FATAL(cascadeReason && !demandLoadedContainer,("Programmer bug:  using cascadeReason with FlagObjectForDeleteMessage is only supported if the object is a demand-loaded container."));
+}	
+
+//-----------------------------------------------------------------------
+
+FlagObjectForDeleteMessage::FlagObjectForDeleteMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("FlagObjectForDeleteMessage"),
+		m_id(NetworkId::cms_invalid),
+		m_reason(0),
+		m_immediate(false),
+		m_cascadeReason(false)
+{
+	addVariable(m_id);
+	addVariable(m_reason);
+	addVariable(m_immediate);
+	addVariable(m_demandLoadedContainer);
+	addVariable(m_cascadeReason);
+    unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+FlagObjectForDeleteMessage::~FlagObjectForDeleteMessage()
+{
+}	
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FlagObjectForDeleteMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FlagObjectForDeleteMessage.h
new file mode 100644
index 00000000..4a5a7a42
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/FlagObjectForDeleteMessage.h
@@ -0,0 +1,83 @@
+//========================================================================
+//
+// FlagObjectForDeleteMessage.h - tells CentralServer to unload all instances of
+// an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_FlagObjectForDeleteMessage_H
+#define	_INCLUDED_FlagObjectForDeleteMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class FlagObjectForDeleteMessage : public GameNetworkMessage
+{
+public:
+
+	explicit FlagObjectForDeleteMessage  (const NetworkId& id, int reason, bool immediate, bool demandLoadedContainer, bool cascadeReason);
+	FlagObjectForDeleteMessage           (Archive::ReadIterator & source);
+	~FlagObjectForDeleteMessage ();
+
+	const NetworkId&          getId() const;
+	int                       getReason() const;
+	bool                      getImmediate() const;
+	bool                      getDemandLoadedContainer() const;
+	bool                      getCascadeReason() const;
+
+private:
+	Archive::AutoVariable<NetworkId> m_id;
+	Archive::AutoVariable<int>       m_reason;
+	Archive::AutoVariable<bool>      m_immediate;
+	Archive::AutoVariable<bool>      m_demandLoadedContainer;
+	Archive::AutoVariable<bool>      m_cascadeReason;
+
+	FlagObjectForDeleteMessage();
+	FlagObjectForDeleteMessage(const FlagObjectForDeleteMessage&);
+	FlagObjectForDeleteMessage& operator= (const FlagObjectForDeleteMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId& FlagObjectForDeleteMessage::getId(void) const
+{
+	return m_id.get();
+}	// FlagObjectForDeleteMessage::getId
+
+// ----------------------------------------------------------------------
+
+inline int FlagObjectForDeleteMessage::getReason(void) const
+{
+	return m_reason.get();
+}	
+
+// ----------------------------------------------------------------------
+
+inline bool FlagObjectForDeleteMessage::getImmediate() const
+{
+	return m_immediate.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool FlagObjectForDeleteMessage::getDemandLoadedContainer() const
+{
+	return m_demandLoadedContainer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool FlagObjectForDeleteMessage::getCascadeReason() const
+{
+	return m_cascadeReason.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_FlagObjectForDeleteMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ForceUnloadObjectMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ForceUnloadObjectMessage.cpp
new file mode 100644
index 00000000..fb41b746
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ForceUnloadObjectMessage.cpp
@@ -0,0 +1,53 @@
+//========================================================================
+//
+// ForceUnloadObjectMessage.cpp - tells  CentralServer to unload all instances of
+// an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ForceUnloadObjectMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id			id of object we want to unload
+ */
+ForceUnloadObjectMessage::ForceUnloadObjectMessage(const NetworkId& id, bool permaDelete) :
+	GameNetworkMessage("ForceUnloadObjectMessage"),
+	m_id(id),
+        m_permaDelete(permaDelete)
+{
+	addVariable(m_id);
+        addVariable(m_permaDelete);
+}	// ForceUnloadObjectMessage::ForceUnloadObjectMessage
+
+//-----------------------------------------------------------------------
+
+ForceUnloadObjectMessage::ForceUnloadObjectMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ForceUnloadObjectMessage"),
+m_id(NetworkId::cms_invalid),
+m_permaDelete(false)
+{
+	addVariable(m_id);
+        addVariable(m_permaDelete);
+        unpack(source);
+}	// ForceUnloadObjectMessage::ForceUnloadObjectMessage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+ForceUnloadObjectMessage::~ForceUnloadObjectMessage()
+{
+}	// ForceUnloadObjectMessage::~ForceUnloadObjectMessage
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ForceUnloadObjectMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ForceUnloadObjectMessage.h
new file mode 100644
index 00000000..ad7180bd
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ForceUnloadObjectMessage.h
@@ -0,0 +1,55 @@
+//========================================================================
+//
+// ForceUnloadObjectMessage.h - tells CentralServer to unload all instances of
+// an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_ForceUnloadObjectMessage_H
+#define	_INCLUDED_ForceUnloadObjectMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ForceUnloadObjectMessage : public GameNetworkMessage
+{
+public:
+	explicit ForceUnloadObjectMessage  (const NetworkId& id, bool permaDelete = false);
+	ForceUnloadObjectMessage           (Archive::ReadIterator & source);
+	~ForceUnloadObjectMessage ();
+
+	const NetworkId&          getId(void) const;
+	bool                getPermaDelete(void) const;
+        
+private:
+	Archive::AutoVariable<NetworkId>     m_id;			///< id of object we want to unload
+	Archive::AutoVariable<bool>    m_permaDelete;            ///< whether or not to delete this from the DB.
+
+	ForceUnloadObjectMessage();
+	ForceUnloadObjectMessage(const ForceUnloadObjectMessage&);
+	ForceUnloadObjectMessage& operator= (const ForceUnloadObjectMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId& ForceUnloadObjectMessage::getId(void) const
+{
+	return m_id.get();
+}	// ForceUnloadObjectMessage::getId
+
+inline bool ForceUnloadObjectMessage::getPermaDelete(void) const
+{
+    return m_permaDelete.get();
+}
+
+
+// ----------------------------------------------------------------------
+
+
+#endif	// _INCLUDED_ForceUnloadObjectMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSRequestMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSRequestMessage.cpp
new file mode 100644
index 00000000..0acbe750
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSRequestMessage.cpp
@@ -0,0 +1,59 @@
+// GameServerCSToolRequest.cpp
+// Copyright 2005, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Rob Hanz
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GameServerCSRequestMessage.h"
+#include "serverNetworkMessages/CSToolRequest.h"
+
+
+GameServerCSRequestMessage::GameServerCSRequestMessage ( uint32 accountId, 
+    							 const std::string & command,
+				 			 uint32 toolId,
+				 			 uint32 accessLevel, 
+				 			 uint32 loginServerID,
+							 const std::string & userName,
+							 const std::string & commandName ) :
+GameNetworkMessage( "GameServerCSRequest" ),
+m_accountId( accountId ),
+m_command( command ),
+m_toolId( toolId ),
+m_accessLevel( accessLevel ),
+m_loginServerID( loginServerID ),
+m_userName( userName ),
+m_commandName( commandName )
+{
+	addVariable( m_accountId );
+	addVariable( m_command );
+	addVariable( m_toolId );
+	addVariable( m_accessLevel );
+	addVariable( m_loginServerID );
+	addVariable( m_userName );
+	addVariable( m_commandName );
+}
+
+GameServerCSRequestMessage::GameServerCSRequestMessage( Archive::ReadIterator & source ) :
+GameNetworkMessage("GameServerCSRequest"),
+m_accountId( 0 ),
+m_command( "" ),
+m_toolId( 0 ),
+m_accessLevel( 0 ),
+m_loginServerID( 0 ),
+m_userName( "" ),
+m_commandName( "" )
+{
+	addVariable( m_accountId );
+	addVariable( m_command );
+	addVariable( m_toolId );
+	addVariable( m_accessLevel );
+	addVariable( m_loginServerID );
+	addVariable( m_userName );
+	addVariable( m_commandName );
+	AutoByteStream::unpack( source );
+}
+
+GameServerCSRequestMessage::~GameServerCSRequestMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSRequestMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSRequestMessage.h
new file mode 100644
index 00000000..bde8e972
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSRequestMessage.h
@@ -0,0 +1,89 @@
+// CSToolREquest.h
+// Copyright 2004, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Rob Hanz
+
+#ifndef	_INCLUDED_GameServerCSRequest_H
+#define	_INCLUDED_GameServerCSRequest_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+class CSToolRequest;
+
+//-----------------------------------------------------------------------
+/** A Central Server is telling the login server which cluster it is
+	servicing.
+*/
+class GameServerCSRequestMessage : public GameNetworkMessage
+{
+  public:
+    GameServerCSRequestMessage ( uint32 accountId, 
+    				 const std::string & command,
+				 uint32 toolId,
+				 uint32 accessLevel, 
+				 uint32 loginServerID,
+				 const std::string & userName,
+				 const std::string & commandName );
+    GameServerCSRequestMessage (Archive::ReadIterator & source);
+    virtual ~GameServerCSRequestMessage ();
+    
+    uint32 			getAccountId () const;
+    const std::string & 	getCommandString() const;
+    uint32			getToolId() const;
+    uint32			getAccessLevel() const;
+    uint32			getLoginServerID() const;
+    const std::string& 		getUserName() const;
+    const std::string& 		getCommandName() const;
+    
+  private:
+    Archive::AutoVariable< uint32 >      m_accountId;
+    Archive::AutoVariable<std::string>   m_command;
+    Archive::AutoVariable< uint32 > 	 m_toolId;
+    Archive::AutoVariable< uint32 >	 m_accessLevel;
+    Archive::AutoVariable< uint32 >	 m_loginServerID;
+    Archive::AutoVariable< std::string > m_userName;
+    Archive::AutoVariable< std::string > m_commandName;
+    
+
+    GameServerCSRequestMessage();
+    GameServerCSRequestMessage(const GameServerCSRequestMessage&);
+    GameServerCSRequestMessage& operator= (const GameServerCSRequestMessage&);
+
+};
+
+inline uint32 GameServerCSRequestMessage::getAccountId() const
+{
+	return m_accountId.get();
+}
+
+inline const std::string & GameServerCSRequestMessage::getCommandString() const
+{
+	return m_command.get();
+}
+
+inline uint32 GameServerCSRequestMessage::getAccessLevel() const
+{
+	return m_accessLevel.get();
+}
+
+inline uint32 GameServerCSRequestMessage::getToolId() const
+{
+	return m_toolId.get();
+}
+
+inline uint32 GameServerCSRequestMessage::getLoginServerID() const
+{
+	return m_loginServerID.get();
+}
+
+inline const std::string & GameServerCSRequestMessage::getUserName() const
+{
+	return m_userName.get();
+}
+
+inline const std::string & GameServerCSRequestMessage::getCommandName() const
+{
+	return m_commandName.get();
+}
+#endif //_INCLUDED_GameServerCSRequest_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSResponseMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSResponseMessage.cpp
new file mode 100644
index 00000000..c6b85819
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSResponseMessage.cpp
@@ -0,0 +1,47 @@
+// CSToolRequest.cpp
+// Copyright 2005, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Rob Hanz
+
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GameServerCSRequestMessage.h"
+#include "serverNetworkMessages/GameServerCSResponseMessage.h"
+
+
+GameServerCSResponseMessage::GameServerCSResponseMessage( const GameServerCSRequestMessage & source ) :
+GameNetworkMessage( "GameServerCSResponse" ),
+m_accountId( source.getAccountId() ),
+m_response( "" ),
+m_toolId( source.getToolId() ),
+m_loginServerID( source.getLoginServerID() )
+{
+	addVariable( m_accountId );
+	addVariable( m_response );
+	addVariable( m_toolId );
+	addVariable( m_loginServerID );
+}
+
+GameServerCSResponseMessage::GameServerCSResponseMessage( Archive::ReadIterator & source ) :
+GameNetworkMessage("GameServerCSResponse"),
+m_accountId( 0 ),
+m_response( "" ),
+m_toolId( 0 ),
+m_loginServerID( 0 )
+{
+	addVariable( m_accountId );
+	addVariable( m_response );
+	addVariable( m_toolId );
+	addVariable( m_loginServerID );
+	AutoByteStream::unpack( source );
+}
+
+GameServerCSResponseMessage::~GameServerCSResponseMessage()
+{
+}
+
+void GameServerCSResponseMessage::setResponse( const std::string & response )
+{
+	m_response.set( response );
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSResponseMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSResponseMessage.h
new file mode 100644
index 00000000..c2b5c33a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerCSResponseMessage.h
@@ -0,0 +1,63 @@
+// CSToolREquest.h
+// Copyright 2004, Sony Online Entertainment Inc., all rights reserved.
+// Author: Rob Hanz
+
+#ifndef	_INCLUDED_GameServerCSResponse_H
+#define	_INCLUDED_GameServerCSResponse_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "serverNetworkMessages/GameServerCSRequestMessage.h"
+//-----------------------------------------------------------------------
+/** A Central Server is telling the login server which cluster it is
+	servicing.
+*/
+class GameServerCSResponseMessage: public GameNetworkMessage
+{
+  public:
+    GameServerCSResponseMessage( const GameServerCSRequestMessage & source );
+    GameServerCSResponseMessage(Archive::ReadIterator & source);
+    virtual ~GameServerCSResponseMessage ();
+
+    uint32 			getAccountId () const;
+    const std::string & 	getResponse() const;
+    uint32			getToolId() const;
+    uint32			getLoginServerID() const;
+
+    void			setResponse( const std::string & response );
+
+  private:
+    Archive::AutoVariable< uint32 >      m_accountId;
+    Archive::AutoVariable<std::string>   m_response;
+    Archive::AutoVariable< uint32 > 	 m_toolId;
+    Archive::AutoVariable< uint32 >	 m_loginServerID;
+
+
+    GameServerCSResponseMessage();
+    GameServerCSResponseMessage(const GameServerCSResponseMessage&);
+    GameServerCSResponseMessage& operator= (const GameServerCSResponseMessage&);
+
+};
+
+inline const std::string & GameServerCSResponseMessage::getResponse() const
+{
+	return m_response.get();
+}
+
+inline uint32 GameServerCSResponseMessage::getAccountId() const
+{
+	return m_accountId.get();
+}
+
+inline uint32 GameServerCSResponseMessage::getToolId() const
+{
+	return m_toolId.get();
+}
+
+inline uint32 GameServerCSResponseMessage::getLoginServerID() const
+{
+	return m_loginServerID.get();
+}
+
+#endif //_INCLUDED_GameServerCSResponse_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerReadyMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerReadyMessage.cpp
new file mode 100644
index 00000000..bdd07728
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerReadyMessage.cpp
@@ -0,0 +1,47 @@
+//========================================================================
+//
+// GameServerReadyMessage.cpp - tells Centralserver we want all the objects in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GameServerReadyMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+GameServerReadyMessage::GameServerReadyMessage(int mapWidth) :
+		GameNetworkMessage("GameServerReadyMessage"),
+		m_mapWidth(mapWidth)
+{
+	addVariable(m_mapWidth);
+}
+
+//-----------------------------------------------------------------------
+
+GameServerReadyMessage::GameServerReadyMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("GameServerReadyMessage")
+{
+	addVariable(m_mapWidth);
+	
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+GameServerReadyMessage::~GameServerReadyMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+int GameServerReadyMessage::getMapWidth() const
+{
+	return m_mapWidth.get();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerReadyMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerReadyMessage.h
new file mode 100644
index 00000000..5dcef826
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerReadyMessage.h
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// GameServerReadyMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_GameServerReadyMessage_H
+#define INCLUDED_GameServerReadyMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Sent from:  GameServer
+ * Sent to:  Central and Planet Servers
+ * Action:  The GameServer has finished initialization and is ready to
+ * handle requests.
+ */
+class GameServerReadyMessage : public GameNetworkMessage
+{
+  public:
+	GameServerReadyMessage  (int mapWidth);
+	GameServerReadyMessage  (Archive::ReadIterator & source);
+	~GameServerReadyMessage ();
+
+	int getMapWidth() const;
+	
+  private:
+	Archive::AutoVariable<int> m_mapWidth;
+	
+  private:
+
+	GameServerReadyMessage(const GameServerReadyMessage&);
+	GameServerReadyMessage& operator= (const GameServerReadyMessage&);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerUniverseLoadedMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerUniverseLoadedMessage.cpp
new file mode 100644
index 00000000..27c6e8bf
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerUniverseLoadedMessage.cpp
@@ -0,0 +1,44 @@
+// ======================================================================
+//
+// GameServerUniverseLoadedMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GameServerUniverseLoadedMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+GameServerUniverseLoadedMessage::GameServerUniverseLoadedMessage(uint32 processId, uint32 sourceOfUniverseDataProcessId) :
+GameNetworkMessage("GameServerUniverseLoadedMessage"),
+m_processId(processId),
+m_sourceOfUniverseDataProcessId(sourceOfUniverseDataProcessId)
+{
+	addVariable(m_processId);
+	addVariable(m_sourceOfUniverseDataProcessId);
+}
+
+// ----------------------------------------------------------------------
+
+GameServerUniverseLoadedMessage::GameServerUniverseLoadedMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("GameServerUniverseLoadedMessage"),
+m_processId(),
+m_sourceOfUniverseDataProcessId()
+{
+	addVariable(m_processId);
+	addVariable(m_sourceOfUniverseDataProcessId);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+GameServerUniverseLoadedMessage::~GameServerUniverseLoadedMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerUniverseLoadedMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerUniverseLoadedMessage.h
new file mode 100644
index 00000000..bb5e1e79
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/GameServerUniverseLoadedMessage.h
@@ -0,0 +1,57 @@
+// ======================================================================
+//
+// GameServerUniverseLoadedMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_GameServerUniverseLoadedMessage_H
+#define INCLUDED_GameServerUniverseLoadedMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Sent from:  GameServer
+ * Sent to:  Central
+ * Action:  The GameServer has completed loading its universe objects.
+ */
+class GameServerUniverseLoadedMessage : public GameNetworkMessage
+{
+  public:
+	GameServerUniverseLoadedMessage  (uint32 processId, uint32 sourceOfUniverseDataProcessId);
+	GameServerUniverseLoadedMessage  (Archive::ReadIterator & source);
+	~GameServerUniverseLoadedMessage ();
+
+	uint32 getProcessId() const;
+	uint32 getSourceOfUniverseDataProcessId() const;
+
+  private:
+	Archive::AutoVariable<uint32> m_processId;
+	Archive::AutoVariable<uint32> m_sourceOfUniverseDataProcessId;
+
+	GameServerUniverseLoadedMessage(const GameServerUniverseLoadedMessage&);
+	GameServerUniverseLoadedMessage& operator= (const GameServerUniverseLoadedMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline uint32 GameServerUniverseLoadedMessage::getProcessId() const
+{
+	return m_processId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 GameServerUniverseLoadedMessage::getSourceOfUniverseDataProcessId() const
+{
+	return m_sourceOfUniverseDataProcessId.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadObjectMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadObjectMessage.cpp
new file mode 100644
index 00000000..70cfcf67
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadObjectMessage.cpp
@@ -0,0 +1,56 @@
+// ======================================================================
+//
+// LoadObjectMessage.cpp - tells Gameserver another Gameserver wants to load a
+// proxy from an authoritative object.
+//
+// Copyright 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LoadObjectMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+/**
+ * Class constructor.
+ *
+ * @param id			id of object we want to load
+ * @param process		process id of Gameserver that wants to load the object
+ */
+LoadObjectMessage::LoadObjectMessage(NetworkId const &id, uint32 process) :
+	GameNetworkMessage("LoadObjectMessage"),
+	m_id(id),
+	m_process(process)
+{
+	addVariable(m_id);
+	addVariable(m_process);
+}
+
+// ----------------------------------------------------------------------
+
+LoadObjectMessage::LoadObjectMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("LoadObjectMessage"),
+	m_id(),
+	m_process()
+{
+	addVariable(m_id);
+	addVariable(m_process);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+LoadObjectMessage::~LoadObjectMessage()
+{
+}
+
+// ======================================================================
+
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadObjectMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadObjectMessage.h
new file mode 100644
index 00000000..678ab948
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadObjectMessage.h
@@ -0,0 +1,55 @@
+// ======================================================================
+//
+// LoadObjectMessage.h - tells Gameserver another Gameserver wants to load a
+// proxy from an authoritative object.
+//
+// Copyright 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_LoadObjectMessage_H
+#define	_INCLUDED_LoadObjectMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class LoadObjectMessage: public GameNetworkMessage
+{
+public:
+	LoadObjectMessage(NetworkId const &id, uint32 process);
+	LoadObjectMessage(Archive::ReadIterator &source);
+	~LoadObjectMessage();
+
+	NetworkId const &   getId() const;
+	uint32              getProcess() const;
+
+private:
+	Archive::AutoVariable<NetworkId>   m_id;       // id of object we want to load
+	Archive::AutoVariable<uint32>      m_process;  // process id of Gameserver that wants to load the object
+
+	LoadObjectMessage();
+	LoadObjectMessage(LoadObjectMessage const &);
+	LoadObjectMessage &operator=(LoadObjectMessage const &);
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &LoadObjectMessage::getId() const
+{
+	return m_id.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 LoadObjectMessage::getProcess() const
+{
+	return m_process.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_LoadObjectMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadUniverseMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadUniverseMessage.cpp
new file mode 100644
index 00000000..c43d49bf
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadUniverseMessage.cpp
@@ -0,0 +1,46 @@
+//========================================================================
+//
+// LoadUniverseMessage.cpp - tells Centralserver we want all the objects in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LoadUniverseMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param process		gameserver id that should receive the loaded objects
+ */
+LoadUniverseMessage::LoadUniverseMessage  (uint32 process) :
+		GameNetworkMessage("LoadUniverseMessage"),
+		m_process(process)
+{
+	addVariable(m_process);
+}	
+
+//-----------------------------------------------------------------------
+
+LoadUniverseMessage::LoadUniverseMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("LoadUniverseMessage"),
+		m_process()
+{
+	addVariable(m_process);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoadUniverseMessage::~LoadUniverseMessage()
+{
+}	
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadUniverseMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadUniverseMessage.h
new file mode 100644
index 00000000..fe4ec683
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/LoadUniverseMessage.h
@@ -0,0 +1,47 @@
+//========================================================================
+//
+// LoadUniverseMessage.h - tells Gameserver another Gameserver wants to load a
+// proxy from an authoritative object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_LoadUniverseMessage_H
+#define	_INCLUDED_LoadUniverseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class LoadUniverseMessage : public GameNetworkMessage
+{
+  public:
+	LoadUniverseMessage  (uint32 process);
+	LoadUniverseMessage  (Archive::ReadIterator & source);
+	~LoadUniverseMessage ();
+
+	uint32              getProcess(void) const;
+        
+  private:
+	Archive::AutoVariable<uint32>      m_process;		// process id of Gameserver that wants to load the object
+
+  private:
+	LoadUniverseMessage();
+	LoadUniverseMessage(const LoadUniverseMessage&);
+	LoadUniverseMessage& operator= (const LoadUniverseMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline uint32 LoadUniverseMessage::getProcess(void) const
+{
+	return m_process.get();
+}	// LoadUniverseMessage::getProcess
+
+// ----------------------------------------------------------------------
+
+#endif	// _INCLUDED_LoadUniverseMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToAckMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToAckMessage.cpp
new file mode 100644
index 00000000..6e9f4cd2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToAckMessage.cpp
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// MessageToAckMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/MessageToAckMessage.h"
+
+// ======================================================================
+
+MessageToAckMessage::MessageToAckMessage(const NetworkId &messageId) :
+		GameNetworkMessage("MessageToAckMessage"),
+		m_messageId(messageId)
+{
+	addVariable(m_messageId);
+}
+
+//-----------------------------------------------------------------------
+
+MessageToAckMessage::MessageToAckMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("MessageToAckMessage"),
+		m_messageId()
+{
+	addVariable(m_messageId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+MessageToAckMessage::~MessageToAckMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToAckMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToAckMessage.h
new file mode 100644
index 00000000..ef466583
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToAckMessage.h
@@ -0,0 +1,52 @@
+// ======================================================================
+//
+// MessageToAckMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MessageToAckMessage_H
+#define INCLUDED_MessageToAckMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+/**
+ * Case 1:
+ * Sent from:  GameServer
+ * Sent to:  Central
+ * Action:  Acknowldege that a MessageTo has been handled.
+ *
+ * Case 2:
+ * Sent from:  Central
+ * Sent to:  DBProcess
+ * Action:  Remove a MessageTo from the database.
+ */
+class MessageToAckMessage : public GameNetworkMessage
+{
+  public:
+	MessageToAckMessage  (const NetworkId &messageId);
+	MessageToAckMessage  (Archive::ReadIterator & source);
+	~MessageToAckMessage ();
+
+	const NetworkId & getMessageId() const;
+
+  private:
+	Archive::AutoVariable<NetworkId> m_messageId;
+
+	MessageToAckMessage();
+	MessageToAckMessage(const MessageToAckMessage&);
+	MessageToAckMessage& operator= (const MessageToAckMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & MessageToAckMessage::getMessageId() const
+{
+	return m_messageId.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToMessage.cpp
new file mode 100644
index 00000000..a0845d49
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToMessage.cpp
@@ -0,0 +1,46 @@
+// ======================================================================
+//
+// MessageToMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/MessageToMessage.h"
+#include "sharedNetwork/NetworkHandler.h"
+
+// ======================================================================
+
+MessageToMessage::MessageToMessage(MessageToPayload const &data, uint32 sourceServerPid) :
+	GameNetworkMessage("MessageToMessage"),
+	m_data(data),
+	m_sourceServerPid(sourceServerPid)
+{
+	addVariable(m_data);
+	addVariable(m_sourceServerPid);
+	std::string messageName = "MessageToPayload." + m_data.get().getMethod();
+	NetworkHandler::reportMessage(messageName, m_data.get().getPackedDataVector().size());
+}
+
+//-----------------------------------------------------------------------
+
+MessageToMessage::MessageToMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("MessageToMessage"),
+	m_data(),
+	m_sourceServerPid()
+{
+	addVariable(m_data);
+	addVariable(m_sourceServerPid);
+	unpack(source);
+	std::string messageName = "MessageToPayload." + m_data.get().getMethod();
+	NetworkHandler::reportMessage(messageName, m_data.get().getPackedDataVector().size());
+}
+
+//-----------------------------------------------------------------------
+
+MessageToMessage::~MessageToMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToMessage.h
new file mode 100644
index 00000000..5d238cd7
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToMessage.h
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// MessageToMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MessageToMessage_H
+#define INCLUDED_MessageToMessage_H
+
+// ======================================================================
+
+#include "serverNetworkMessages/MessageToPayload.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class MessageToMessage: public GameNetworkMessage
+{
+public:
+	MessageToMessage(MessageToPayload const &data, uint32 sourceServerPid);
+	MessageToMessage(Archive::ReadIterator &source);
+	~MessageToMessage();
+
+	MessageToPayload const &getData() const;
+	uint32 getSourceServerPid() const;
+
+private:
+	Archive::AutoVariable<MessageToPayload> m_data;
+	Archive::AutoVariable<uint32> m_sourceServerPid;
+
+	MessageToMessage();
+	MessageToMessage(MessageToMessage const &);
+	MessageToMessage &operator=(MessageToMessage const &);
+};
+
+// ----------------------------------------------------------------------
+
+inline MessageToPayload const &MessageToMessage::getData() const
+{
+	return m_data.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 MessageToMessage::getSourceServerPid() const
+{
+	return m_sourceServerPid.get();
+}
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.cpp
new file mode 100644
index 00000000..a2ba3c3a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.cpp
@@ -0,0 +1,272 @@
+// ======================================================================
+//
+// MessageToPayload.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/MessageToPayload.h"
+
+#include "MessageToPayloadImpl.h"
+
+// ======================================================================
+
+MessageToPayload::MessageToPayload(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const std::string &packedData, unsigned long callTime, bool guaranteed, DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime) :
+		m_impl(new MessageToPayloadImpl(networkId, messageId, method, packedData, callTime, guaranteed, deliveryType, undeliveredCallbackObject, undeliveredCallbackMethod, recurringTime))
+{
+}
+
+// ----------------------------------------------------------------------
+
+MessageToPayload::MessageToPayload(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const std::vector<int8> &packedData, unsigned long callTime, bool guaranteed, DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime) :
+		m_impl(new MessageToPayloadImpl(networkId, messageId, method, packedData, callTime, guaranteed, deliveryType, undeliveredCallbackObject, undeliveredCallbackMethod, recurringTime))
+{
+}
+
+// ----------------------------------------------------------------------
+
+MessageToPayload::MessageToPayload() :
+		m_impl(new MessageToPayloadImpl())
+{
+}
+
+// ----------------------------------------------------------------------
+
+MessageToPayload::MessageToPayload(MessageToPayload const & rhs) :
+		m_impl(rhs.m_impl)
+{
+	m_impl->increaseRefCount();
+}
+
+// ----------------------------------------------------------------------
+
+MessageToPayload::~MessageToPayload()
+{
+	m_impl->decreaseRefCount();
+	if (m_impl->getRefCount()==0)
+		delete m_impl;
+}
+
+// ----------------------------------------------------------------------
+
+MessageToPayload & MessageToPayload::operator=(MessageToPayload const & rhs)
+{
+	if (&rhs != this)
+	{
+		m_impl->decreaseRefCount();
+		if (m_impl->getRefCount()==0)
+			delete m_impl;
+		m_impl=rhs.m_impl;
+		m_impl->increaseRefCount();
+	}
+	return *this;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayload::setGuaranteed(bool guaranteed)
+{
+	// This does not do a copy-on-write if the refcount > 1, because currently
+	// we don't expect the code to ever change the guaranteed flag when there
+	// is more than one reference to the message.  If it does, it probably
+	// indicates incorrect behavior.
+	m_impl->setGuaranteed(guaranteed);
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayload::pack(Archive::ByteStream &target) const
+{
+	m_impl->pack(target);
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayload::unpack(Archive::ReadIterator &source)
+{
+	if (m_impl->getRefCount() > 1)
+	{
+		// copy-on-write
+		m_impl->decreaseRefCount();
+		m_impl=new MessageToPayloadImpl();
+	}
+	m_impl->unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & MessageToPayload::getUndeliveredCallbackObject() const
+{
+	return m_impl->getUndeliveredCallbackObject();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & MessageToPayload::getUndeliveredCallbackMethod() const
+{
+	return m_impl->getUndeliveredCallbackMethod();
+}
+
+// ----------------------------------------------------------------------
+
+std::string MessageToPayload::getDataAsString() const
+{
+	return m_impl->getDataAsString();
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageToPayload::operator==(MessageToPayload const & rhs) const
+{
+	return (m_impl == rhs.m_impl || *m_impl == *(rhs.m_impl));
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageToPayload::operator!=(MessageToPayload const & rhs) const
+{
+	return (m_impl != rhs.m_impl && *m_impl != *(rhs.m_impl));
+}
+
+// ----------------------------------------------------------------------
+
+int MessageToPayload::getRecurringTime() const
+{
+	return m_impl->getRecurringTime();
+}
+
+// ----------------------------------------------------------------------
+
+int MessageToPayload::getInstanceCount()
+{
+	return MessageToPayloadImpl::getInstanceCount();
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & MessageToPayload::getNetworkId() const
+{
+	return m_impl->getNetworkId();
+}
+
+// ----------------------------------------------------------------------
+
+MessageToId const & MessageToPayload::getMessageId() const
+{
+	return m_impl->getMessageId();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & MessageToPayload::getMethod() const
+{
+	return m_impl->getMethod();
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<int8> const & MessageToPayload::getPackedDataVector() const
+{
+	return m_impl->getPackedDataVector();
+}
+
+// ----------------------------------------------------------------------
+
+unsigned long MessageToPayload::getCallTime() const
+{
+	return m_impl->getCallTime();
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageToPayload::getGuaranteed() const
+{
+	return m_impl->getGuaranteed();
+}
+
+// ----------------------------------------------------------------------
+
+MessageToPayload::DeliveryType MessageToPayload::getDeliveryType() const
+{
+	return m_impl->getDeliveryType();
+}
+
+// ----------------------------------------------------------------------
+
+uint64 MessageToPayload::getCounterMessageToPayload() const
+{
+	return m_impl->getCounterMessageToPayload();
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageToPayload::getPersisted() const
+{
+	return m_impl->getPersisted();
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayload::setPersisted(bool persisted)
+{
+	m_impl->setPersisted(persisted);
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayload::addBroadcastCount()
+{
+	m_impl->addBroadcastCount();
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayload::addBounceServer(uint32 serverProcessId)
+{
+	m_impl->addBounceServer(serverProcessId);
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageToPayload::hasBounceServer(uint32 serverProcessId) const
+{
+	return m_impl->hasBounceServer(serverProcessId);
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayload::clearBounceServers()
+{
+	m_impl->clearBounceServers();
+}
+
+// ----------------------------------------------------------------------
+
+int MessageToPayload::getBroadcastCount() const
+{
+	return m_impl->getBroadcastCount();
+}
+
+// ----------------------------------------------------------------------
+
+int MessageToPayload::getBounceCount() const
+{
+	return m_impl->getBounceCount();
+}
+
+// ======================================================================
+
+void Archive::put(ByteStream & target, const MessageToPayload & source)
+{
+	source.pack(target);
+}
+
+// ----------------------------------------------------------------------
+
+void Archive::get(ReadIterator & source, MessageToPayload & target)
+{
+	target.unpack(source);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.h
new file mode 100644
index 00000000..c5aa8de5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.h
@@ -0,0 +1,90 @@
+// ======================================================================
+//
+// MessageToPayload.h
+// copyright (c) 2001 Sony Online Entertainment
+//const
+// ======================================================================
+
+#ifndef INCLUDED_MessageToPayload_H
+#define INCLUDED_MessageToPayload_H
+
+// ======================================================================
+
+class NetworkId;
+typedef NetworkId MessageToId;
+class MessageToPayload;
+class MessageToPayloadImpl;
+
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+	
+	void put(ByteStream & target, const MessageToPayload & source);
+	void get(ReadIterator & source, MessageToPayload & target);
+}
+
+// ======================================================================
+
+/** 
+ * Data associated with a MessageTo
+ *
+ * Implemented as a pointer to a refcounted class, because the game server
+ * copies these often.
+ */
+class MessageToPayload
+{
+public:
+	enum DeliveryType
+	{
+		DT_c,
+		DT_java,
+		DT_none
+	};
+	
+public:
+	MessageToPayload(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const	std::string &packedData, unsigned long callTime, bool guaranteed, DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime);
+	MessageToPayload(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const	stdvector<int8>::fwd &packedData, unsigned long callTime, bool guaranteed, DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime);
+	MessageToPayload(MessageToPayload const & rhs);
+	MessageToPayload();
+	~MessageToPayload();
+	MessageToPayload & operator=(MessageToPayload const & rhs);
+
+	bool operator==(MessageToPayload const & rhs) const;
+	bool operator!=(MessageToPayload const & rhs) const;
+
+	void pack(Archive::ByteStream &target) const;
+	void unpack(Archive::ReadIterator &source);
+
+	void setGuaranteed(bool guaranteed);
+	void setPersisted(bool persisted);
+	void addBroadcastCount();
+	void addBounceServer(uint32 serverProcessId);
+	bool hasBounceServer(uint32 serverProcessId) const;
+	void clearBounceServers();
+
+	NetworkId const &getNetworkId() const;
+	MessageToId const &getMessageId() const;
+	std::string const &getMethod() const;
+	stdvector<int8>::fwd const &getPackedDataVector() const;
+	std::string getDataAsString() const;
+	unsigned long getCallTime() const;
+	bool getGuaranteed() const;
+	DeliveryType getDeliveryType() const;
+	NetworkId const & getUndeliveredCallbackObject() const;
+	std::string const & getUndeliveredCallbackMethod() const;
+	int getRecurringTime() const;
+	uint64 getCounterMessageToPayload() const;
+	bool getPersisted() const;
+	int getBroadcastCount() const;
+	int getBounceCount() const;
+	
+	static int getInstanceCount();
+
+private:
+	MessageToPayloadImpl * m_impl;
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.cpp
new file mode 100644
index 00000000..045de95b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.cpp
@@ -0,0 +1,290 @@
+// ======================================================================
+//
+// MessageToPayloadImpl.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "MessageToPayloadImpl.h"
+
+uint64 MessageToPayloadImpl::ms_counterMessageToPayload = 0;
+int MessageToPayloadImpl::ms_instanceCount = 0;
+
+// ======================================================================
+
+MessageToPayloadImpl::MessageToPayloadImpl(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const std::string &packedData, unsigned long callTime, bool guaranteed, MessageToPayload::DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime) :
+		m_networkId(networkId),
+		m_messageId(messageId),
+		m_method(method),
+		m_packedData(packedData.begin(), packedData.end()),
+		m_callTime(callTime),
+		m_guaranteed(guaranteed),
+		m_persisted(false),
+		m_deliveryType(deliveryType),
+		m_undeliveredCallbackObject(undeliveredCallbackObject),
+		m_undeliveredCallbackMethod(undeliveredCallbackMethod),
+		m_recurringTime(recurringTime),
+		m_broadcastCount(0),
+		m_bounceCount(0),
+		m_bounceServers(),
+		m_refCount(1),
+		m_counterMessageToPayload(++ms_counterMessageToPayload)
+{
+	DEBUG_FATAL(m_guaranteed && m_recurringTime!=0,("Attempted to create MessageToPayloadImpl for message %s, which was guaranteed and had a recurringTime.  Recurring MessageTos may not be guaranteed."));
+	++ms_instanceCount;
+}
+
+// ----------------------------------------------------------------------
+
+MessageToPayloadImpl::MessageToPayloadImpl(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const std::vector<int8> &packedData, unsigned long callTime, bool guaranteed, MessageToPayload::DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime) :
+		m_networkId(networkId),
+		m_messageId(messageId),
+		m_method(method),
+		m_packedData(packedData),
+		m_callTime(callTime),
+		m_guaranteed(guaranteed),
+		m_persisted(false),
+		m_deliveryType(deliveryType),
+		m_undeliveredCallbackObject(undeliveredCallbackObject),
+		m_undeliveredCallbackMethod(undeliveredCallbackMethod),
+		m_recurringTime(recurringTime),
+		m_broadcastCount(0),
+		m_bounceCount(0),
+		m_bounceServers(),
+		m_refCount(1),
+		m_counterMessageToPayload(++ms_counterMessageToPayload)
+{
+	DEBUG_FATAL(m_guaranteed && m_recurringTime!=0,("Attempted to create MessageToPayloadImpl for message %s, which was guaranteed and had a recurringTime.  Recurring MessageTos may not be guaranteed."));
+	++ms_instanceCount;
+}
+
+// ----------------------------------------------------------------------
+
+MessageToPayloadImpl::MessageToPayloadImpl() :
+		m_networkId(),
+		m_messageId(),
+		m_method(),
+		m_packedData(),
+		m_callTime(0),
+		m_guaranteed(false),
+		m_persisted(false),
+		m_deliveryType(MessageToPayload::DT_none),
+		m_undeliveredCallbackObject(NetworkId::cms_invalid),
+		m_undeliveredCallbackMethod(),
+		m_recurringTime(0),
+		m_broadcastCount(0),
+		m_bounceCount(0),
+		m_bounceServers(),
+		m_refCount(1),
+		m_counterMessageToPayload(++ms_counterMessageToPayload)
+{
+	++ms_instanceCount;
+}
+
+// ----------------------------------------------------------------------
+
+MessageToPayloadImpl::MessageToPayloadImpl(MessageToPayloadImpl const & rhs) :
+		m_networkId(rhs.m_networkId),
+		m_messageId(rhs.m_messageId),
+		m_method(rhs.m_method),
+		m_packedData(rhs.m_packedData),
+		m_callTime(rhs.m_callTime),
+		m_guaranteed(rhs.m_guaranteed),
+		m_persisted(rhs.m_persisted),
+		m_deliveryType(rhs.m_deliveryType),
+		m_undeliveredCallbackObject(rhs.m_undeliveredCallbackObject),
+		m_undeliveredCallbackMethod(rhs.m_undeliveredCallbackMethod),
+		m_recurringTime(rhs.m_recurringTime),
+		m_broadcastCount(0),
+		m_bounceCount(0),
+		m_bounceServers(),
+		m_refCount(1),
+		m_counterMessageToPayload(rhs.m_counterMessageToPayload)
+{
+	++ms_instanceCount;
+}
+
+// ----------------------------------------------------------------------
+
+MessageToPayloadImpl::~MessageToPayloadImpl()
+{
+	--ms_instanceCount;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayloadImpl::setGuaranteed(bool guaranteed)
+{
+	WARNING_DEBUG_FATAL(m_refCount > 1,("Programmer bug:  attempted to set data on a MessageToPayloadImpl that had a refcount > 1.  This would overwrite data that is referenced in multiple places, which is not safe."));
+	m_guaranteed = guaranteed;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayloadImpl::setPersisted(bool persisted)
+{
+	WARNING_DEBUG_FATAL(m_refCount > 1,("Programmer bug:  attempted to set data on a MessageToPayloadImpl that had a refcount > 1.  This would overwrite data that is referenced in multiple places, which is not safe."));
+	m_persisted = persisted;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayloadImpl::pack(Archive::ByteStream &target) const
+{
+	Archive::put(target, m_networkId);
+	Archive::put(target, m_messageId);
+	Archive::put(target, m_method);
+	Archive::put(target, m_packedData);
+	Archive::put(target, m_callTime);
+	Archive::put(target, m_guaranteed);
+	Archive::put(target, m_persisted);
+	int temp = static_cast<int>(m_deliveryType);
+	Archive::put(target, temp);
+	Archive::put(target, m_undeliveredCallbackObject);
+	Archive::put(target, m_undeliveredCallbackMethod);
+	Archive::put(target, m_recurringTime);
+	Archive::put(target, m_broadcastCount);
+	Archive::put(target, m_bounceCount);
+	Archive::put(target, m_bounceServers);
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayloadImpl::unpack(Archive::ReadIterator &source)
+{
+	WARNING_DEBUG_FATAL(m_refCount > 1,("Programmer bug:  attempted to unpack a MessageToPayloadImpl that had a refcount > 1.  This would overwrite data that is referenced in multiple places, which is not safe."));
+	
+	Archive::get(source, m_networkId);
+	Archive::get(source, m_messageId);
+	Archive::get(source, m_method);
+	Archive::get(source, m_packedData);
+	Archive::get(source, m_callTime);
+	Archive::get(source, m_guaranteed);
+	Archive::get(source, m_persisted);
+	int temp;
+	Archive::get(source, temp);
+	m_deliveryType = static_cast<MessageToPayload::DeliveryType>(temp);
+	Archive::get(source, m_undeliveredCallbackObject);
+	Archive::get(source, m_undeliveredCallbackMethod);
+	Archive::get(source, m_recurringTime);
+	Archive::get(source, m_broadcastCount);
+	Archive::get(source, m_bounceCount);
+	Archive::get(source, m_bounceServers);
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & MessageToPayloadImpl::getUndeliveredCallbackObject() const
+{
+	return m_undeliveredCallbackObject;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & MessageToPayloadImpl::getUndeliveredCallbackMethod() const
+{
+	return m_undeliveredCallbackMethod;
+}
+
+// ----------------------------------------------------------------------
+
+std::string MessageToPayloadImpl::getDataAsString() const
+{
+	return std::string(m_packedData.begin(), m_packedData.end());
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageToPayloadImpl::operator==(MessageToPayloadImpl const & rhs) const
+{
+	return (m_messageId == rhs.m_messageId);
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageToPayloadImpl::operator!=(MessageToPayloadImpl const & rhs) const
+{
+	return (m_messageId != rhs.m_messageId);
+}
+
+// ----------------------------------------------------------------------
+
+int MessageToPayloadImpl::getRecurringTime() const
+{
+	return m_recurringTime;
+}
+
+// ----------------------------------------------------------------------
+
+int MessageToPayloadImpl::getInstanceCount()
+{
+	return ms_instanceCount;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayloadImpl::increaseRefCount()
+{
+	++m_refCount;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayloadImpl::decreaseRefCount()
+{
+	--m_refCount;
+}
+
+// ----------------------------------------------------------------------
+
+int MessageToPayloadImpl::getRefCount() const
+{
+	return m_refCount;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayloadImpl::addBroadcastCount()
+{
+	m_broadcastCount++;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayloadImpl::addBounceServer(uint32 serverProcessId)
+{
+	WARNING_DEBUG_FATAL(m_refCount > 1,("Programmer bug:  attempted to change a MessageToPayloadImpl that had a refcount > 1.  MessageToPayloadImpls do not have copy-on-write, so this is not safe."));
+	m_bounceServers.insert(serverProcessId);
+	m_bounceCount++;
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageToPayloadImpl::hasBounceServer(uint32 serverProcessId) const
+{
+	return (m_bounceServers.count(serverProcessId) > 0);
+}
+
+// ----------------------------------------------------------------------
+
+void MessageToPayloadImpl::clearBounceServers()
+{
+	m_bounceServers.clear();
+}
+
+// ======================================================================
+
+void Archive::put(ByteStream & target, const MessageToPayloadImpl & source)
+{
+	source.pack(target);
+}
+
+// ----------------------------------------------------------------------
+
+void Archive::get(ReadIterator & source, MessageToPayloadImpl & target)
+{
+	target.unpack(source);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.h
new file mode 100644
index 00000000..d9594c6a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.h
@@ -0,0 +1,188 @@
+// ======================================================================
+//
+// MessageToPayloadImpl.h
+// copyright (c) 2001 Sony Online Entertainment
+//const
+// ======================================================================
+
+#ifndef INCLUDED_MessageToPayloadImpl_H
+#define INCLUDED_MessageToPayloadImpl_H
+
+// ======================================================================
+
+#include "serverNetworkMessages/MessageToPayload.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+#include <string>
+#include <vector>
+
+// ======================================================================
+
+/** 
+ * Data associated with a MessageTo, used by several different network messages.
+ */
+class MessageToPayloadImpl
+{
+public:
+	MessageToPayloadImpl(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const	std::string &packedData, unsigned long callTime, bool guaranteed, MessageToPayload::DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime);
+	MessageToPayloadImpl(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const	stdvector<int8>::fwd &packedData, unsigned long callTime, bool guaranteed, MessageToPayload::DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime);
+	MessageToPayloadImpl();
+	~MessageToPayloadImpl();
+
+	bool operator==(MessageToPayloadImpl const & rhs) const;
+	bool operator!=(MessageToPayloadImpl const & rhs) const;
+
+	void pack(Archive::ByteStream &target) const;
+	void unpack(Archive::ReadIterator &source);
+
+	void setGuaranteed(bool guaranteed);
+	void setPersisted(bool persisted);
+	void addBroadcastCount();
+	void addBounceServer(uint32 serverProcessId);
+	bool hasBounceServer(uint32 serverProcessId) const;
+	void clearBounceServers();
+	
+	NetworkId const &getNetworkId() const;
+	MessageToId const &getMessageId() const;
+	std::string const &getMethod() const;
+	std::vector<int8> const &getPackedDataVector() const;
+	std::string getDataAsString() const;
+	unsigned long getCallTime() const;
+	bool getGuaranteed() const;
+	bool getPersisted() const;
+	MessageToPayload::DeliveryType getDeliveryType() const;
+	NetworkId const & getUndeliveredCallbackObject() const;
+	std::string const & getUndeliveredCallbackMethod() const;
+	int getRecurringTime() const;
+	uint64 getCounterMessageToPayload() const;
+	int getBroadcastCount() const;
+	int getBounceCount() const;
+	static int getInstanceCount();
+	void increaseRefCount();
+	void decreaseRefCount();
+	int getRefCount() const;
+
+private:
+	NetworkId m_networkId;
+	MessageToId m_messageId;
+	std::string m_method;
+	std::vector<int8> m_packedData;
+	unsigned long m_callTime;
+	bool m_guaranteed;
+	bool m_persisted;
+	MessageToPayload::DeliveryType m_deliveryType;
+	NetworkId m_undeliveredCallbackObject;
+	std::string m_undeliveredCallbackMethod;
+	int m_recurringTime;
+	int m_broadcastCount; // home many times this message has been broadcasted to find the recipient
+	int m_bounceCount; // how many times this message has been forwarded to a new server
+	std::set<uint32> m_bounceServers; // the servers which have forwarded this message, to catch circular forwarding
+	int m_refCount;
+
+	// there is no need to pack this var, it is used to "mark" each MessageToPayloadImpl
+	// on a per game server execution basis, and is used as the second criterion
+	// when prioritizing messageTo that originated on the game server and has
+	// the same calltime, so that the messageTo will execute in the order that
+	// they were originated
+	uint64 m_counterMessageToPayload;
+
+	// used to assign m_counterMessageToPayload
+	static uint64 ms_counterMessageToPayload;
+
+	// used to count how many messages there are at one time
+	static int ms_instanceCount;
+
+private:
+	MessageToPayloadImpl & operator=(MessageToPayloadImpl const & rhs); // disable
+	MessageToPayloadImpl(MessageToPayloadImpl const & rhs); // disable
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &MessageToPayloadImpl::getNetworkId() const
+{
+	return m_networkId;
+}
+
+// ----------------------------------------------------------------------
+
+inline MessageToId const &MessageToPayloadImpl::getMessageId() const
+{
+	return m_messageId;
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &MessageToPayloadImpl::getMethod() const
+{
+	return m_method;
+}
+
+// ----------------------------------------------------------------------
+
+inline std::vector<int8> const &MessageToPayloadImpl::getPackedDataVector() const
+{
+	return m_packedData;
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned long MessageToPayloadImpl::getCallTime() const
+{
+	return m_callTime;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool MessageToPayloadImpl::getGuaranteed() const
+{
+	return m_guaranteed;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool MessageToPayloadImpl::getPersisted() const
+{
+	return m_persisted;
+}
+
+// ----------------------------------------------------------------------
+
+inline MessageToPayload::DeliveryType MessageToPayloadImpl::getDeliveryType() const
+{
+	return m_deliveryType;
+}
+
+// ----------------------------------------------------------------------
+
+inline uint64 MessageToPayloadImpl::getCounterMessageToPayload() const
+{
+	return m_counterMessageToPayload;
+}
+
+// ----------------------------------------------------------------------
+
+inline int MessageToPayloadImpl::getBroadcastCount() const
+{
+	return m_broadcastCount;
+}
+
+// ----------------------------------------------------------------------
+
+inline int MessageToPayloadImpl::getBounceCount() const
+{
+	return m_bounceCount;
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	void put(ByteStream & target, const MessageToPayloadImpl & source);
+	void get(ReadIterator & source, MessageToPayloadImpl & target);
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PlanetObjectIdMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PlanetObjectIdMessage.cpp
new file mode 100644
index 00000000..82404256
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PlanetObjectIdMessage.cpp
@@ -0,0 +1,50 @@
+//========================================================================
+//
+// PlanetObjectIdMessage.cpp - tells Centralserver we want all the objects in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/PlanetObjectIdMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param process		gameserver id that should receive the loaded objects
+ */
+PlanetObjectIdMessage::PlanetObjectIdMessage  (const std::string &sceneId, NetworkId planetObject) :
+	GameNetworkMessage("PlanetObjectIdMessage"),
+	m_sceneId(sceneId),
+	m_planetObject(planetObject)
+{
+	addVariable(m_sceneId);
+	addVariable(m_planetObject);
+}	
+
+//-----------------------------------------------------------------------
+
+PlanetObjectIdMessage::PlanetObjectIdMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("PlanetObjectIdMessage"),
+		m_sceneId(),
+		m_planetObject()
+{
+	addVariable(m_sceneId);
+	addVariable(m_planetObject);
+	
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+PlanetObjectIdMessage::~PlanetObjectIdMessage()
+{
+}	
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PlanetObjectIdMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PlanetObjectIdMessage.h
new file mode 100644
index 00000000..993a1a11
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PlanetObjectIdMessage.h
@@ -0,0 +1,53 @@
+//========================================================================
+//
+// PlanetObjectIdMessage.h - tells Centralserver we want all the objects in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_PlanetObjectIdMessage_H
+#define	_INCLUDED_PlanetObjectIdMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class PlanetObjectIdMessage : public GameNetworkMessage
+{
+public:
+	PlanetObjectIdMessage  (const std::string &sceneId, NetworkId planetObject);
+	PlanetObjectIdMessage  (Archive::ReadIterator & source);
+	~PlanetObjectIdMessage ();
+
+	std::string getSceneId    (void) const;
+	NetworkId getPlanetObject (void) const;
+
+private:
+	Archive::AutoVariable<std::string> m_sceneId;
+	Archive::AutoVariable<NetworkId> m_planetObject;
+
+	PlanetObjectIdMessage();
+	PlanetObjectIdMessage(const PlanetObjectIdMessage&);
+	PlanetObjectIdMessage& operator= (const PlanetObjectIdMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline std::string PlanetObjectIdMessage::getSceneId (void) const
+{
+	return m_sceneId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId PlanetObjectIdMessage::getPlanetObject (void) const
+{
+	return m_planetObject.get();
+}
+// ======================================================================
+
+#endif	// _INCLUDED_PlanetObjectIdMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PopulationListMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PopulationListMessage.cpp
new file mode 100644
index 00000000..a1de067f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PopulationListMessage.cpp
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// PopulationListMessage.cpp
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/PopulationListMessage.h"
+
+// ======================================================================
+
+PopulationListMessage::PopulationListMessage(const PopulationList &list) :
+		GameNetworkMessage("PopulationListMessage"),
+		m_list(list)
+{
+	addVariable(m_list);
+}
+
+// ----------------------------------------------------------------------
+
+PopulationListMessage::PopulationListMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("PopulationListMessage"),
+		m_list()
+{
+	addVariable(m_list);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+PopulationListMessage::~PopulationListMessage()
+{
+}
+   
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PopulationListMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PopulationListMessage.h
new file mode 100644
index 00000000..2cf7fd08
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PopulationListMessage.h
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// PopulationListMessage.h
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_PopulationListMessage_H
+#define INCLUDED_PopulationListMessage_H
+
+// ======================================================================
+
+#include "serverUtility/PopulationList.h"
+
+// ======================================================================
+
+class PopulationListMessage : public GameNetworkMessage
+{
+public:
+	PopulationListMessage  (const PopulationList &list);
+	PopulationListMessage  (Archive::ReadIterator & source);
+	~PopulationListMessage ();
+
+	const PopulationList& getList(void) const;
+
+private:
+	Archive::AutoVariable<PopulationList> m_list;        
+        
+	PopulationListMessage();
+	PopulationListMessage(const PopulationListMessage&);
+	PopulationListMessage& operator= (const PopulationListMessage&);
+};
+
+// ======================================================================
+
+inline const PopulationList& PopulationListMessage::getList(void) const
+{
+	return m_list.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadFinishedMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadFinishedMessage.cpp
new file mode 100644
index 00000000..41693d91
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadFinishedMessage.cpp
@@ -0,0 +1,41 @@
+//========================================================================
+//
+// PreloadFinishedMessage.cpp
+//
+// copyright 2002 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/PreloadFinishedMessage.h"
+
+#include <vector>
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+
+//-----------------------------------------------------------------------
+
+PreloadFinishedMessage::PreloadFinishedMessage(bool finished) :
+		GameNetworkMessage("PreloadFinishedMessage"),
+		m_finished(finished)
+{
+	addVariable(m_finished);
+}
+
+//-----------------------------------------------------------------------
+
+PreloadFinishedMessage::PreloadFinishedMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("PreloadFinishedMessage"),
+		m_finished(false)
+{
+	addVariable(m_finished);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+PreloadFinishedMessage::~PreloadFinishedMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadFinishedMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadFinishedMessage.h
new file mode 100644
index 00000000..fd7eb2d1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadFinishedMessage.h
@@ -0,0 +1,59 @@
+//========================================================================
+//
+// PreloadFinishedMessage.h
+//
+// copyright 2002 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_PreloadFinishedMessage_H
+#define	_INCLUDED_PreloadFinishedMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Sent From:  PlanetServer
+ * Sent To:    Central
+ * Action:     All the GameServers on this planet have/haven't finished preloading.
+ *
+ * Sent From:  LoginServer
+ * Sent To:    Central
+ * Action:     All the planets in the cluster have/haven't finished preloading.
+ *             If preloading is already finished when the login server connects,
+ *             this message is sent immediately.
+ */
+
+class PreloadFinishedMessage : public GameNetworkMessage
+{
+  public:
+	PreloadFinishedMessage  (bool finished);
+	PreloadFinishedMessage  (Archive::ReadIterator & source);
+	~PreloadFinishedMessage ();
+
+	const uint32 getGameServerId() const;
+
+	bool getFinished() const;
+        
+  private:
+	Archive::AutoVariable<bool>   m_finished;
+       
+  private:        
+	PreloadFinishedMessage(const PreloadFinishedMessage&);
+	PreloadFinishedMessage& operator= (const PreloadFinishedMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline bool PreloadFinishedMessage::getFinished() const
+{
+	return m_finished.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_PreloadFinishedMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadRequestCompleteMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadRequestCompleteMessage.cpp
new file mode 100644
index 00000000..e1697486
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadRequestCompleteMessage.cpp
@@ -0,0 +1,45 @@
+//========================================================================
+//
+// PreloadRequestCompleteMessage.cpp
+//
+// copyright 2002 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/PreloadRequestCompleteMessage.h"
+
+#include <vector>
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+
+//-----------------------------------------------------------------------
+
+PreloadRequestCompleteMessage::PreloadRequestCompleteMessage(uint32 gameServerId, uint32 preloadAreaId) :
+		GameNetworkMessage("PreloadRequestCompleteMessage"),
+		m_gameServerId(gameServerId),
+		m_preloadAreaId(preloadAreaId)
+{
+	addVariable(m_gameServerId);
+	addVariable(m_preloadAreaId);
+}
+
+//-----------------------------------------------------------------------
+
+PreloadRequestCompleteMessage::PreloadRequestCompleteMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("PreloadRequestCompleteMessage"),
+		m_gameServerId(),
+		m_preloadAreaId()
+{
+	addVariable(m_gameServerId);
+	addVariable(m_preloadAreaId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+PreloadRequestCompleteMessage::~PreloadRequestCompleteMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadRequestCompleteMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadRequestCompleteMessage.h
new file mode 100644
index 00000000..53da9dfb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/PreloadRequestCompleteMessage.h
@@ -0,0 +1,74 @@
+//========================================================================
+//
+// PreloadRequestCompleteMessage.h
+//
+// copyright 2002 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_PreloadRequestCompleteMessage_H
+#define	_INCLUDED_PreloadRequestCompleteMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Sent From:  PlanetServer
+ * Sent To:    DatabaseProcess (via Central)
+ * Action:     All the objects/chunks needed for preload have now been requested.
+ *             When pending loads are completed, notify the game server
+ *             that it has all of the preload stuff.
+ *
+ * Sent From:  DatabaseProcess
+ * Sent To:    GameServer
+ * Action:     The DatabaseProcess has sent the GameServer all the objects
+ *             it needs for preload.  When they are all instantiated, send this
+ *             message to the PlanetServer.
+ *
+ * Sent From:  GameServer
+ * Sent To:    PlanetServer
+ * Action:     The GameServer has instantiated all the objects from the
+ *             preload list.
+ */
+
+class PreloadRequestCompleteMessage : public GameNetworkMessage
+{
+  public:
+	PreloadRequestCompleteMessage  (uint32 gameServerId, uint32 preloadAreaId);
+	PreloadRequestCompleteMessage  (Archive::ReadIterator & source);
+	~PreloadRequestCompleteMessage ();
+
+	const uint32 getGameServerId() const;
+	const uint32 getPreloadAreaId() const;
+        
+  private:
+	Archive::AutoVariable<uint32> m_gameServerId;
+	Archive::AutoVariable<uint32> m_preloadAreaId;
+       
+  private:        
+	PreloadRequestCompleteMessage();
+	PreloadRequestCompleteMessage(const PreloadRequestCompleteMessage&);
+	PreloadRequestCompleteMessage& operator= (const PreloadRequestCompleteMessage&);
+};
+
+// ======================================================================
+
+inline const uint32 PreloadRequestCompleteMessage::getGameServerId() const
+{
+	return m_gameServerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const uint32 PreloadRequestCompleteMessage::getPreloadAreaId() const
+{
+	return m_preloadAreaId.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_PreloadRequestCompleteMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ReleaseAuthoritativeMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ReleaseAuthoritativeMessage.cpp
new file mode 100644
index 00000000..edeb9da8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ReleaseAuthoritativeMessage.cpp
@@ -0,0 +1,55 @@
+//========================================================================
+//
+// ReleaseAuthoritativeMessage.cpp - tells Centralserver an authoritative object
+// wants to release it's authority to a proxy.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ReleaseAuthoritativeMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id			id of object that is releasing it's authority
+ * @param process		process we would like to release the authority to (0 = any)
+ */
+ReleaseAuthoritativeMessage::ReleaseAuthoritativeMessage(const NetworkId& id, uint32 process) :
+	GameNetworkMessage("ReleaseAuthoritativeMessage"),
+	m_id(id),
+	m_process(process)
+{
+	addVariable(m_id);
+	addVariable(m_process);
+}	// ReleaseAuthoritativeMessage::ReleaseAuthoritativeMessage
+
+//-----------------------------------------------------------------------
+
+	ReleaseAuthoritativeMessage::ReleaseAuthoritativeMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ReleaseAuthoritativeMessage"),
+m_id(),
+m_process()
+{
+	addVariable(m_id);
+	addVariable(m_process);
+	unpack(source);
+}	// ReleaseAuthoritativeMessage::ReleaseAuthoritativeMessage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+ReleaseAuthoritativeMessage::~ReleaseAuthoritativeMessage()
+{
+}	// ReleaseAuthoritativeMessage::~ReleaseAuthoritativeMessage
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ReleaseAuthoritativeMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ReleaseAuthoritativeMessage.h
new file mode 100644
index 00000000..a4d9af4d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ReleaseAuthoritativeMessage.h
@@ -0,0 +1,52 @@
+//========================================================================
+//
+// ReleaseAuthoritativeMessage.h - tells Centralserver an authoritative object
+// wants to release it's authority to a proxy.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_ReleaseAuthoritativeMessage_H
+#define	_INCLUDED_ReleaseAuthoritativeMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ReleaseAuthoritativeMessage : public GameNetworkMessage
+{
+public:
+	explicit ReleaseAuthoritativeMessage  (const NetworkId& id, uint32 process = 0);
+	ReleaseAuthoritativeMessage           (Archive::ReadIterator & source);
+	~ReleaseAuthoritativeMessage ();
+
+	const NetworkId&          getId(void) const;
+	uint32              getProcess(void) const;
+
+private:
+	Archive::AutoVariable<NetworkId>    m_id;			// id of object that is releasing it's authority
+	Archive::AutoVariable<uint32> m_process;		// process we would like to release the authority to (-1 = any)
+
+	ReleaseAuthoritativeMessage();
+	ReleaseAuthoritativeMessage(const ReleaseAuthoritativeMessage&);
+	ReleaseAuthoritativeMessage& operator= (const ReleaseAuthoritativeMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId& ReleaseAuthoritativeMessage::getId(void) const
+{
+	return m_id.get();
+}	// ReleaseAuthoritativeMessage::getId
+
+inline uint32 ReleaseAuthoritativeMessage::getProcess(void) const
+{
+	return m_process.get();
+}	// ReleaseAuthoritativeMessage::getProcess
+
+
+#endif	// _INCLUDED_ReleaseAuthoritativeMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestChunkMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestChunkMessage.cpp
new file mode 100644
index 00000000..79a33f19
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestChunkMessage.cpp
@@ -0,0 +1,100 @@
+//========================================================================
+//
+// RequestChunkMessage.cpp - tells Centralserver we want all the objects in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/RequestChunkMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param process		gameserver id that should receive the loaded objects
+ */
+RequestChunkMessage::RequestChunkMessage  (std::vector<Chunk> chunks, const std::string &sceneId) :
+	GameNetworkMessage("RequestChunkMessage"),
+	m_chunks(),
+	m_sceneId(sceneId)
+{
+	m_chunks.set(chunks);
+	
+	addVariable(m_chunks);
+	addVariable(m_sceneId);
+}	
+
+//-----------------------------------------------------------------------
+
+RequestChunkMessage::RequestChunkMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("RequestChunkMessage"),
+		m_chunks(),
+		m_sceneId()
+{
+	addVariable(m_chunks);
+	addVariable(m_sceneId);
+	
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RequestChunkMessage::~RequestChunkMessage()
+{
+}	
+
+// ----------------------------------------------------------------------
+
+std::vector<RequestChunkMessage::Chunk> const & RequestChunkMessage::getChunks() const
+{
+	return m_chunks.get();
+}
+
+// ======================================================================
+
+RequestChunkMessage::Chunk::Chunk() :
+		m_process(),
+		m_nodeX(),
+		m_nodeZ()
+{
+}
+
+// ----------------------------------------------------------------------
+
+RequestChunkMessage::Chunk::Chunk(uint32 process, int nodeX, int nodeZ) :
+		m_process(process),
+		m_nodeX(nodeX),
+		m_nodeZ(nodeZ)
+{
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, RequestChunkMessage::Chunk & chunk)
+	{
+		get(source,chunk.m_process);
+		get(source,chunk.m_nodeX);
+		get(source,chunk.m_nodeZ);
+	}
+
+	// ----------------------------------------------------------------------
+
+	void put(ByteStream & target, const RequestChunkMessage::Chunk & chunk)
+	{
+		put(target,chunk.m_process);
+		put(target,chunk.m_nodeX);
+		put(target,chunk.m_nodeZ);
+	}
+	
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestChunkMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestChunkMessage.h
new file mode 100644
index 00000000..942e55bb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestChunkMessage.h
@@ -0,0 +1,69 @@
+//========================================================================
+//
+// RequestChunkMessage.h - tells Centralserver we want all the objects in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_RequestChunkMessage_H
+#define	_INCLUDED_RequestChunkMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class RequestChunkMessage : public GameNetworkMessage
+{
+public:
+	struct Chunk
+	{
+		uint32 m_process;
+		int m_nodeX;
+		int m_nodeZ;
+
+		Chunk();
+		Chunk(uint32 process, int nodeX, int nodeZ);
+	};
+	
+public:
+	RequestChunkMessage  (std::vector<Chunk> chunks, const std::string &sceneId);
+	RequestChunkMessage  (Archive::ReadIterator & source);
+	~RequestChunkMessage ();
+
+	std::vector<Chunk> const & getChunks() const;
+	std::string getSceneId (void) const;
+
+private:
+	Archive::AutoArray<Chunk> m_chunks;
+	Archive::AutoVariable<std::string> m_sceneId;
+
+	RequestChunkMessage();
+	RequestChunkMessage(const RequestChunkMessage&);
+	RequestChunkMessage& operator= (const RequestChunkMessage&);
+};
+
+// ======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+	
+	void get(ReadIterator & source, RequestChunkMessage::Chunk & chunk);
+	void put(ByteStream & target, const RequestChunkMessage::Chunk & chunk);
+}
+
+// ======================================================================
+
+inline std::string RequestChunkMessage::getSceneId (void) const
+{
+	return m_sceneId.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_RequestChunkMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectIdsMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectIdsMessage.cpp
new file mode 100644
index 00000000..7f2c752c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectIdsMessage.cpp
@@ -0,0 +1,46 @@
+//========================================================================
+//
+// RequestOIDsMessage.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/RequestObjectIdsMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+RequestOIDsMessage::RequestOIDsMessage(uint32 serverId, uint32 howMany, bool logRequest) :
+	GameNetworkMessage("RequestOIDsMessage"),
+	m_serverId(serverId),
+	m_howMany(howMany),
+	m_logRequest(logRequest)
+{
+	addVariable(m_serverId);
+	addVariable(m_howMany);
+	addVariable(m_logRequest);
+}	
+
+//-----------------------------------------------------------------------
+
+RequestOIDsMessage::RequestOIDsMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("RequestOIDsMessage")
+{
+	addVariable(m_serverId);
+	addVariable(m_howMany);
+	addVariable(m_logRequest);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RequestOIDsMessage::~RequestOIDsMessage()
+{
+}
+
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectIdsMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectIdsMessage.h
new file mode 100644
index 00000000..00f1b679
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectIdsMessage.h
@@ -0,0 +1,58 @@
+//========================================================================
+//
+// RequestOIDsMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_RequestOIDsMessage_H
+#define	_INCLUDED_RequestOIDsMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class RequestOIDsMessage : public GameNetworkMessage
+{
+public:
+	RequestOIDsMessage  (uint32 serverId, uint32 howMany, bool logRequest);
+	RequestOIDsMessage  (Archive::ReadIterator & source);
+	~RequestOIDsMessage ();
+
+	uint32              getHowMany(void) const;
+	uint32              getServerId(void) const;
+	bool                getLogRequest(void) const;
+
+private:
+	Archive::AutoVariable<uint32> m_serverId;
+	Archive::AutoVariable<uint32> m_howMany;
+	Archive::AutoVariable<bool> m_logRequest;
+
+	RequestOIDsMessage();
+	RequestOIDsMessage(const RequestOIDsMessage&);
+	RequestOIDsMessage& operator= (const RequestOIDsMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline uint32 RequestOIDsMessage::getHowMany(void) const
+{
+	return m_howMany.get();
+}
+
+inline uint32 RequestOIDsMessage::getServerId(void) const
+{
+	return m_serverId.get();
+}
+
+inline bool RequestOIDsMessage::getLogRequest(void) const
+{
+	return m_logRequest.get();
+}
+
+#endif	// _INCLUDED_RequestOIDsMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectMessage.cpp
new file mode 100644
index 00000000..c6ce3593
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectMessage.cpp
@@ -0,0 +1,55 @@
+//========================================================================
+//
+// RequestObjectMessage.cpp - tells Centralserver a Gameserver wants to create a
+// proxy of an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/RequestObjectMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id		id of object we want to create
+ * @param process	process requesting the object
+ */
+RequestObjectMessage::RequestObjectMessage(const NetworkId& id, uint32 process) :
+	GameNetworkMessage("RequestObjectMessage"),
+	m_id(id),
+	m_process(process)
+{
+	addVariable(m_id);
+	addVariable(m_process);
+}	// RequestObjectMessage::RequestObjectMessage
+
+//-----------------------------------------------------------------------
+
+	RequestObjectMessage::RequestObjectMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("RequestObjectMessage"),
+m_id(),
+m_process()
+{
+	addVariable(m_id);
+	addVariable(m_process);
+	unpack(source);
+}	// RequestObjectMessage::RequestObjectMessage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+RequestObjectMessage::~RequestObjectMessage()
+{
+}	// RequestObjectMessage::~RequestObjectMessage
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectMessage.h
new file mode 100644
index 00000000..31827f65
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestObjectMessage.h
@@ -0,0 +1,51 @@
+//========================================================================
+//
+// RequestObjectMessage.h - tells Centralserver a Gameserver wants to create a
+// proxy of an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_RequestObjectMessage_H
+#define	_INCLUDED_RequestObjectMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class RequestObjectMessage : public GameNetworkMessage
+{
+public:
+	RequestObjectMessage  (const NetworkId& id, uint32 process);
+	RequestObjectMessage  (Archive::ReadIterator & source);
+	~RequestObjectMessage ();
+
+	const NetworkId&          getId(void) const;
+	uint32              getProcess(void) const;
+
+private:
+	Archive::AutoVariable<NetworkId>    m_id;			// id of object we want to create
+	Archive::AutoVariable<uint32> m_process;		// process requesting the object
+
+	RequestObjectMessage();
+	RequestObjectMessage(const RequestObjectMessage&);
+	RequestObjectMessage& operator= (const RequestObjectMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId& RequestObjectMessage::getId(void) const
+{
+	return m_id.get();
+}	// RequestObjectMessage::getId
+
+inline uint32 RequestObjectMessage::getProcess(void) const
+{
+	return m_process.get();
+}	// RequestObjectMessage::getProcess
+
+#endif	// _INCLUDED_RequestObjectMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestPlanetObjectIdMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestPlanetObjectIdMessage.cpp
new file mode 100644
index 00000000..2b8a7d0c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestPlanetObjectIdMessage.cpp
@@ -0,0 +1,46 @@
+//========================================================================
+//
+// RequestPlanetObjectIdMessage.cpp - tells Centralserver we want all the objects in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/RequestPlanetObjectIdMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param process		gameserver id that should receive the loaded objects
+ */
+RequestPlanetObjectIdMessage::RequestPlanetObjectIdMessage  (const std::string &sceneId) :
+	GameNetworkMessage("RequestPlanetObjectIdMessage"),
+	m_sceneId(sceneId)
+{
+	addVariable(m_sceneId);
+}	
+
+//-----------------------------------------------------------------------
+
+RequestPlanetObjectIdMessage::RequestPlanetObjectIdMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("RequestPlanetObjectIdMessage"),
+		m_sceneId()
+{
+	addVariable(m_sceneId);
+	
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RequestPlanetObjectIdMessage::~RequestPlanetObjectIdMessage()
+{
+}	
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestPlanetObjectIdMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestPlanetObjectIdMessage.h
new file mode 100644
index 00000000..a30440d5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestPlanetObjectIdMessage.h
@@ -0,0 +1,45 @@
+//========================================================================
+//
+// RequestPlanetObjectIdMessage.h - tells Centralserver we want all the objects in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_RequestPlanetObjectIdMessage_H
+#define	_INCLUDED_RequestPlanetObjectIdMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class RequestPlanetObjectIdMessage : public GameNetworkMessage
+{
+public:
+	RequestPlanetObjectIdMessage  (const std::string &sceneId);
+	RequestPlanetObjectIdMessage  (Archive::ReadIterator & source);
+	~RequestPlanetObjectIdMessage ();
+
+	std::string getSceneId (void) const;
+
+private:
+	Archive::AutoVariable<std::string> m_sceneId;
+
+	RequestPlanetObjectIdMessage();
+	RequestPlanetObjectIdMessage(const RequestPlanetObjectIdMessage&);
+	RequestPlanetObjectIdMessage& operator= (const RequestPlanetObjectIdMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline std::string RequestPlanetObjectIdMessage::getSceneId (void) const
+{
+	return m_sceneId.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_RequestPlanetObjectIdMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestUnloadObjectMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestUnloadObjectMessage.cpp
new file mode 100644
index 00000000..5ecdffe4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestUnloadObjectMessage.cpp
@@ -0,0 +1,54 @@
+//========================================================================
+//
+// RequestUnloadObjectMessage.cpp - tells CentralServer we want to unload an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/RequestUnloadObjectMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id			id of object we want to unload
+ * @param process		process id of Gameserver that wants to unload the object
+ */
+RequestUnloadObjectMessage::RequestUnloadObjectMessage(const NetworkId& id, uint32 process) :
+	GameNetworkMessage("RequestUnloadObjectMessage"),
+	m_id(id),
+	m_process(process)
+{
+	addVariable(m_id);
+	addVariable(m_process);
+}	// RequestUnloadObjectMessage::RequestUnloadObjectMessage
+
+//-----------------------------------------------------------------------
+
+	RequestUnloadObjectMessage::RequestUnloadObjectMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("RequestUnloadObjectMessage"),
+m_id(),
+m_process()
+{
+	addVariable(m_id);
+	addVariable(m_process);
+	unpack(source);
+}	// RequestUnloadObjectMessage::RequestUnloadObjectMessage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+RequestUnloadObjectMessage::~RequestUnloadObjectMessage()
+{
+}	// RequestUnloadObjectMessage::~RequestUnloadObjectMessage
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestUnloadObjectMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestUnloadObjectMessage.h
new file mode 100644
index 00000000..905b10ea
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/RequestUnloadObjectMessage.h
@@ -0,0 +1,55 @@
+//========================================================================
+//
+// RequestUnloadObjectMessage.h - tells CentralServer we want to unload an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_RequestUnloadObjectMessage_H
+#define	_INCLUDED_RequestUnloadObjectMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class RequestUnloadObjectMessage : public GameNetworkMessage
+{
+public:
+	RequestUnloadObjectMessage  (const NetworkId& id, uint32 process);
+	RequestUnloadObjectMessage  (Archive::ReadIterator & source);
+	~RequestUnloadObjectMessage ();
+
+	const NetworkId&          getId(void) const;
+	uint32              getProcess(void) const;
+
+private:
+	Archive::AutoVariable<NetworkId>     m_id;			// id of object we want to unload
+	Archive::AutoVariable<uint32>  m_process;		// process id of Gameserver that wants to unload the object
+
+	RequestUnloadObjectMessage();
+	RequestUnloadObjectMessage(const RequestUnloadObjectMessage&);
+	RequestUnloadObjectMessage& operator= (const RequestUnloadObjectMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId& RequestUnloadObjectMessage::getId(void) const
+{
+	return m_id.get();
+}	// RequestUnloadObjectMessage::getId
+
+// ----------------------------------------------------------------------
+
+inline uint32 RequestUnloadObjectMessage::getProcess(void) const
+{
+	return m_process.get();
+}	// RequestUnloadObjectMessage::getProcess
+
+// ----------------------------------------------------------------------
+
+
+#endif	// _INCLUDED_RequestUnloadObjectMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.cpp
new file mode 100644
index 00000000..92b86d2c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.cpp
@@ -0,0 +1,150 @@
+// SceneTransferMessages.cpp
+// copyright 2001 Sony Online Entertainment
+//
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+
+#include "serverNetworkMessages/SceneTransferMessages.h"
+
+//-----------------------------------------------------------------------
+
+RequestSceneTransfer::RequestSceneTransfer(const NetworkId &oid, const std::string & sceneName, uint32 sourceGameServer, const Vector &position_p, const Vector &position_w, const NetworkId &containerId, const char * scriptCallback) :
+	GameNetworkMessage("RequestSceneTransfer"),
+	m_oid(oid),
+	m_sceneName(sceneName),
+	m_sourceGameServer(sourceGameServer),
+	m_position_p(position_p),
+	m_position_w(position_w),
+	m_containerId(containerId),
+	m_containerName(),
+	m_scriptCallback()
+{
+	if (scriptCallback != NULL)
+		m_scriptCallback.set(scriptCallback);
+
+	addVariable(m_oid);
+	addVariable(m_sceneName);
+	addVariable(m_sourceGameServer);
+	addVariable(m_position_p);
+	addVariable(m_position_w);
+	addVariable(m_containerId);
+	addVariable(m_containerName);
+	addVariable(m_scriptCallback);
+}
+
+//-----------------------------------------------------------------------
+
+RequestSceneTransfer::RequestSceneTransfer(const NetworkId &oid, const std::string & sceneName, uint32 sourceGameServer, const Vector &position_p, const Vector &position_w, const NetworkId &buildingId, const std::string &containerName, const char * scriptCallback) :
+	GameNetworkMessage("RequestSceneTransfer"),
+	m_oid(oid),
+	m_sceneName(sceneName),
+	m_sourceGameServer(sourceGameServer),
+	m_position_p(position_p),
+	m_position_w(position_w),
+	m_containerId(buildingId),
+	m_containerName(containerName),
+	m_scriptCallback()
+{
+	if (scriptCallback != NULL)
+		m_scriptCallback.set(scriptCallback);
+
+	addVariable(m_oid);
+	addVariable(m_sceneName);
+	addVariable(m_sourceGameServer);
+	addVariable(m_position_p);
+	addVariable(m_position_w);
+	addVariable(m_containerId);
+	addVariable(m_containerName);
+	addVariable(m_scriptCallback);
+}
+
+//-----------------------------------------------------------------------
+
+RequestSceneTransfer::RequestSceneTransfer(Archive::ReadIterator & source) :
+	GameNetworkMessage("RequestSceneTransfer"),
+	m_oid(NetworkId::cms_invalid),
+	m_sceneName(),
+	m_sourceGameServer(),
+	m_position_p(),
+	m_position_w(),
+	m_containerId(),
+	m_containerName(),
+	m_scriptCallback()
+{
+	addVariable(m_oid);
+	addVariable(m_sceneName);
+	addVariable(m_sourceGameServer);
+	addVariable(m_position_p);
+	addVariable(m_position_w);
+	addVariable(m_containerId);
+	addVariable(m_containerName);
+	addVariable(m_scriptCallback);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RequestSceneTransfer::~RequestSceneTransfer()
+{
+}
+
+// ======================================================================
+
+SceneTransferMessage::SceneTransferMessage(const RequestSceneTransfer &source, uint32 destinationGameServer) :
+	GameNetworkMessage("SceneTransferMessage"),
+	m_oid(source.getNetworkId()),
+	m_sceneName(source.getSceneName()),
+	m_sourceGameServer(source.getSourceGameServer()),
+	m_position_p(source.getPosition_p()),
+	m_position_w(source.getPosition_w()),
+	m_containerId(source.getContainerId()),
+	m_containerName(source.getContainerName()),
+	m_scriptCallback(source.getScriptCallback()),
+	m_destinationGameServer(destinationGameServer)
+{
+	addVariable(m_oid);
+	addVariable(m_sceneName);
+	addVariable(m_sourceGameServer);
+	addVariable(m_position_p);
+	addVariable(m_position_w);
+	addVariable(m_containerId);
+	addVariable(m_containerName);
+	addVariable(m_scriptCallback);
+	addVariable(m_destinationGameServer);
+}
+
+//-----------------------------------------------------------------------
+
+SceneTransferMessage::SceneTransferMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("SceneTransferMessage"),
+	m_oid(NetworkId::cms_invalid),
+	m_sceneName(),
+	m_sourceGameServer(),
+	m_position_p(),
+	m_position_w(),
+	m_containerId(),
+	m_containerName(),
+	m_scriptCallback(),
+	m_destinationGameServer()
+{
+	addVariable(m_oid);
+	addVariable(m_sceneName);
+	addVariable(m_sourceGameServer);
+	addVariable(m_position_p);
+	addVariable(m_position_w);
+	addVariable(m_containerId);
+	addVariable(m_containerName);
+	addVariable(m_scriptCallback);
+	addVariable(m_destinationGameServer);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+SceneTransferMessage::~SceneTransferMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.h
new file mode 100644
index 00000000..e7780d16
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SceneTransferMessages.h
@@ -0,0 +1,223 @@
+// SceneTransferMessages.h
+// copyright 2001 Sony Online Entertainment
+//
+
+#ifndef _INCLUDED_SceneTransferMessages_H
+#define _INCLUDED_SceneTransferMessages_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/** 
+ * Initiate the process of transferring an object to a different scene.
+ *
+ * Sent from:  Gameserver 
+ * Sent to:  PlanetServer for new scene (via Central)
+ * Action:  Select a game server to receive the object.  Reply with
+ * SceneTransferMessage.
+ */
+class RequestSceneTransfer : public GameNetworkMessage
+{
+public:
+    
+	RequestSceneTransfer(const NetworkId &oid, const std::string & sceneName, uint32 sourceGameServer, const Vector &position_p, const Vector &position_w, const NetworkId &containerId, const char * scriptCallback = NULL);
+	RequestSceneTransfer(const NetworkId &oid, const std::string & sceneName, uint32 sourceGameServer, const Vector &position_p, const Vector &position_w, const NetworkId &buildingId, const std::string &containerName, const char * scriptCallback = NULL);
+	RequestSceneTransfer(Archive::ReadIterator & source);
+	~RequestSceneTransfer();
+
+	const NetworkId &         getNetworkId() const;
+	const std::string &       getSceneName() const;
+	uint32                    getSourceGameServer() const;
+	const Vector &            getPosition_p() const;
+	const Vector &            getPosition_w() const;
+	const NetworkId &         getContainerId() const;
+	const std::string &       getContainerName() const;
+	const std::string &       getScriptCallback() const;
+        
+private:
+
+	Archive::AutoVariable<NetworkId>    m_oid;
+	Archive::AutoVariable<std::string>  m_sceneName;
+	Archive::AutoVariable<uint32>       m_sourceGameServer;
+	Archive::AutoVariable<Vector>       m_position_p;
+	Archive::AutoVariable<Vector>       m_position_w;
+	Archive::AutoVariable<NetworkId>    m_containerId;
+	Archive::AutoVariable<std::string>  m_containerName;
+	Archive::AutoVariable<std::string>  m_scriptCallback;
+    
+private:
+	RequestSceneTransfer();
+	RequestSceneTransfer(const RequestSceneTransfer&);
+	RequestSceneTransfer & operator= (const RequestSceneTransfer&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & RequestSceneTransfer::getNetworkId() const
+{
+	return m_oid.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & RequestSceneTransfer::getSceneName() const
+{
+	return m_sceneName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 RequestSceneTransfer::getSourceGameServer() const
+{
+	return m_sourceGameServer.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Vector & RequestSceneTransfer::getPosition_p() const
+{
+	return m_position_p.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Vector & RequestSceneTransfer::getPosition_w() const
+{
+	return m_position_w.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & RequestSceneTransfer::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string & RequestSceneTransfer::getContainerName() const
+{
+	return m_containerName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string & RequestSceneTransfer::getScriptCallback() const
+{
+	return m_scriptCallback.get();
+}
+
+// ======================================================================
+
+/** 
+ * Tell the Gameserver to transfer an object to a scene.  Usually (always?)
+ * sent in reply to RequestSceneTransfer
+ *
+ * Sent from:  PlanetServer
+ * Sent to:  Gameserver (via Central)
+ * Action:  Create a proxy on the specified game server, then make the
+ * proxy authoritative.  Remove all other proxies
+ */
+class SceneTransferMessage : public GameNetworkMessage
+{
+public:
+	SceneTransferMessage(const RequestSceneTransfer &source, uint32 destinationGameServer);
+	SceneTransferMessage(Archive::ReadIterator & source);
+	~SceneTransferMessage();
+
+public:
+	const NetworkId &   getNetworkId() const;
+	const std::string & getSceneName() const;
+	uint32              getSourceGameServer() const;
+	const Vector &      getPosition_p() const;
+	const Vector &      getPosition_w() const;
+	const NetworkId &   getContainerId() const;
+	const std::string & getContainerName() const;
+	const std::string & getScriptCallback() const;
+	uint32              getDestinationGameServer() const;
+	
+private:
+	Archive::AutoVariable<NetworkId>    m_oid;
+	Archive::AutoVariable<std::string>  m_sceneName;
+	Archive::AutoVariable<uint32>       m_sourceGameServer;
+	Archive::AutoVariable<Vector>       m_position_p;
+	Archive::AutoVariable<Vector>       m_position_w;
+	Archive::AutoVariable<NetworkId>    m_containerId;
+	Archive::AutoVariable<std::string>  m_containerName;
+	Archive::AutoVariable<std::string>  m_scriptCallback;
+	Archive::AutoVariable<uint32>       m_destinationGameServer;
+    
+private:
+	SceneTransferMessage();
+	SceneTransferMessage(const SceneTransferMessage&);
+	SceneTransferMessage & operator= (const SceneTransferMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & SceneTransferMessage::getNetworkId() const
+{
+	return m_oid.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string &SceneTransferMessage::getSceneName() const
+{
+	return m_sceneName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 SceneTransferMessage::getSourceGameServer() const
+{
+	return m_sourceGameServer.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Vector &SceneTransferMessage::getPosition_p() const
+{
+	return m_position_p.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Vector &SceneTransferMessage::getPosition_w() const
+{
+	return m_position_w.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &SceneTransferMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string &SceneTransferMessage::getContainerName() const
+{
+	return m_containerName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string & SceneTransferMessage::getScriptCallback() const
+{
+	return m_scriptCallback.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 SceneTransferMessage::getDestinationGameServer() const
+{
+	return m_destinationGameServer.get();
+}
+
+// ======================================================================
+
+#endif //_INCLUDED_SceneTransferMessages_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetAuthoritativeMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetAuthoritativeMessage.cpp
new file mode 100644
index 00000000..66989d79
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetAuthoritativeMessage.cpp
@@ -0,0 +1,66 @@
+// ======================================================================
+//
+// SetAuthoritativeMessage.cpp - tells a Gameserver which server is authoritative
+// over an object..
+//
+// copyright 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/SetAuthoritativeMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "sharedMathArchive/TransformArchive.h"
+
+// ======================================================================
+
+SetAuthoritativeMessage::SetAuthoritativeMessage(NetworkId const &id, uint32 process, bool sceneChange, bool handlingCrash, NetworkId const &goalCell, Transform const &goalTransform, bool goalIsValid) :
+	GameNetworkMessage("SetAuthoritativeMessage"),
+	m_id(id),
+	m_process(process),
+	m_sceneChange(sceneChange),
+	m_handlingCrash(handlingCrash),
+	m_goalCell(goalCell),
+	m_goalTransform(goalTransform),
+	m_goalIsValid(goalIsValid)
+{
+	addVariable(m_id);
+	addVariable(m_process);
+	addVariable(m_sceneChange);
+	addVariable(m_handlingCrash);
+	addVariable(m_goalCell);
+	addVariable(m_goalTransform);
+	addVariable(m_goalIsValid);
+}
+
+// ----------------------------------------------------------------------
+
+SetAuthoritativeMessage::SetAuthoritativeMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("SetAuthoritativeMessage"),
+	m_id(),
+	m_process(),
+	m_sceneChange(),
+	m_handlingCrash(),
+	m_goalCell(),
+	m_goalTransform(),
+	m_goalIsValid()
+{
+	addVariable(m_id);
+	addVariable(m_process);
+	addVariable(m_sceneChange);
+	addVariable(m_handlingCrash);
+	addVariable(m_goalCell);
+	addVariable(m_goalTransform);
+	addVariable(m_goalIsValid);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+SetAuthoritativeMessage::~SetAuthoritativeMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetAuthoritativeMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetAuthoritativeMessage.h
new file mode 100644
index 00000000..cec2e0b2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetAuthoritativeMessage.h
@@ -0,0 +1,101 @@
+// ======================================================================
+//
+// SetAuthoritativeMessage.h - tells a Gameserver which server is authoritative
+// over an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_SetAuthoritativeMessage_H
+#define	_INCLUDED_SetAuthoritativeMessage_H
+
+// ======================================================================
+
+#include "sharedMath/Transform.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class SetAuthoritativeMessage: public GameNetworkMessage
+{
+public:
+	SetAuthoritativeMessage(NetworkId const &id, uint32 process, bool sceneChange, bool handlingCrash, NetworkId const &goalCell, Transform const &goalTransform, bool goalIsValid);
+	SetAuthoritativeMessage(Archive::ReadIterator & source);
+	~SetAuthoritativeMessage();
+
+	NetworkId const &  getId() const;
+	uint32             getProcess() const;
+	bool               getSceneChange() const;
+	bool               getHandlingCrash() const;
+	NetworkId const &  getGoalCell() const;
+	Transform const &  getGoalTransform() const;
+	bool               getGoalIsValid() const;
+	
+private:
+	Archive::AutoVariable<NetworkId> m_id;             // id of object being made authoritative
+	Archive::AutoVariable<uint32>    m_process;        // process that is authoritative
+	Archive::AutoVariable<bool>      m_sceneChange;    // whether authority transfer due to scene change
+	Archive::AutoVariable<bool>      m_handlingCrash;  // whether authority transfer due to server crash
+	Archive::AutoVariable<NetworkId> m_goalCell;       // Cell we're trying to move into
+	Archive::AutoVariable<Transform> m_goalTransform;  // Transform we'd like to have when we move into the cell
+	Archive::AutoVariable<bool>      m_goalIsValid;    // Whether the goalCell and goalTransform should be used
+
+	SetAuthoritativeMessage();
+	SetAuthoritativeMessage(SetAuthoritativeMessage const &);
+	SetAuthoritativeMessage &operator=(SetAuthoritativeMessage const &);
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &SetAuthoritativeMessage::getId() const
+{
+	return m_id.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 SetAuthoritativeMessage::getProcess() const
+{
+	return m_process.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool SetAuthoritativeMessage::getSceneChange() const
+{
+	return m_sceneChange.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool SetAuthoritativeMessage::getHandlingCrash() const
+{
+	return m_handlingCrash.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &SetAuthoritativeMessage::getGoalCell() const
+{
+	return m_goalCell.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline Transform const &SetAuthoritativeMessage::getGoalTransform() const
+{
+	return m_goalTransform.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool SetAuthoritativeMessage::getGoalIsValid() const
+{
+	return m_goalIsValid.get();
+}
+
+// ======================================================================
+
+#endif // _INCLUDED_SetAuthoritativeMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetObjectPositionMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetObjectPositionMessage.cpp
new file mode 100644
index 00000000..99965c07
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetObjectPositionMessage.cpp
@@ -0,0 +1,62 @@
+//========================================================================
+//
+// SetObjectPositionMessage.cpp - tells where to put an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/SetObjectPositionMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id		id of object that was created
+ */
+SetObjectPositionMessage::SetObjectPositionMessage(const NetworkId& id,
+	const std::string &scene, bool added, bool authoritative) :
+	GameNetworkMessage("SetObjectPositionMessage"),
+	m_added(added),
+	m_authoritative(authoritative),
+	m_id(id),
+	m_scene(scene)
+{
+	addVariable(m_added);
+	addVariable(m_authoritative);
+	addVariable(m_id);
+	addVariable(m_scene);
+}
+
+//-----------------------------------------------------------------------
+
+SetObjectPositionMessage::SetObjectPositionMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("SetObjectPositionMessage"),
+m_added(false),
+m_authoritative(false),
+m_id(),
+m_scene()
+{
+	addVariable(m_added);
+	addVariable(m_authoritative);
+	addVariable(m_id);
+	addVariable(m_scene);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+SetObjectPositionMessage::~SetObjectPositionMessage()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetObjectPositionMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetObjectPositionMessage.h
new file mode 100644
index 00000000..acee1ab9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetObjectPositionMessage.h
@@ -0,0 +1,70 @@
+//========================================================================
+//
+// SetObjectPositionMessage.h - tells where to put an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_SetObjectPositionMessage_H
+#define	_INCLUDED_SetObjectPositionMessage_H
+
+//-----------------------------------------------------------------------
+
+#include <string>
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Vector.h"
+
+//-----------------------------------------------------------------------
+
+class SetObjectPositionMessage : public GameNetworkMessage
+{
+public:
+	SetObjectPositionMessage  (const NetworkId& id, const std::string &scene, bool added, bool authoritative);
+	SetObjectPositionMessage  (Archive::ReadIterator & source);
+	~SetObjectPositionMessage ();
+
+	bool                      getAdded() const;
+	bool                      getAuthoritative() const;
+	const NetworkId&          getId(void) const;
+	const std::string&        getScene(void) const;
+
+private:
+	Archive::AutoVariable<bool>              m_added;
+	Archive::AutoVariable<bool>              m_authoritative;
+	Archive::AutoVariable<NetworkId>         m_id;			// id of object that was created
+	Archive::AutoVariable<std::string>       m_scene;		// scene (planet) the object is in
+
+	SetObjectPositionMessage();
+	SetObjectPositionMessage(const SetObjectPositionMessage&);
+	SetObjectPositionMessage& operator= (const SetObjectPositionMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+inline bool SetObjectPositionMessage::getAdded() const
+{
+	return m_added.get();
+}	
+//-----------------------------------------------------------------------
+
+inline bool SetObjectPositionMessage::getAuthoritative() const
+{
+	return m_authoritative.get();
+}	
+//-----------------------------------------------------------------------
+
+inline const NetworkId& SetObjectPositionMessage::getId(void) const
+{
+	return m_id.get();
+}	
+//-----------------------------------------------------------------------
+
+inline const std::string& SetObjectPositionMessage::getScene(void) const
+{
+	return m_scene.get();
+}	
+//-----------------------------------------------------------------------
+
+
+#endif	// _INCLUDED_SetObjectPositionMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetPlanetServerMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetPlanetServerMessage.cpp
new file mode 100644
index 00000000..fc4ae3e1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetPlanetServerMessage.cpp
@@ -0,0 +1,45 @@
+//========================================================================
+//
+// SetPlanetServerMessage.cpp - tells Centralserver we want all the objects in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/SetPlanetServerMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+SetPlanetServerMessage::SetPlanetServerMessage(const std::string &address, uint16 port) :
+	GameNetworkMessage("SetPlanetServerMessage"),
+	m_address(address),
+	m_port(port)
+{
+	addVariable(m_address);
+	addVariable(m_port);
+}
+
+//-----------------------------------------------------------------------
+
+SetPlanetServerMessage::SetPlanetServerMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("SetPlanetServerMessage"),
+		m_address(),
+		m_port()
+{
+	addVariable(m_address);
+	addVariable(m_port);
+	
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+SetPlanetServerMessage::~SetPlanetServerMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetPlanetServerMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetPlanetServerMessage.h
new file mode 100644
index 00000000..5f3a5c91
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetPlanetServerMessage.h
@@ -0,0 +1,52 @@
+// ======================================================================
+//
+// SetPlanetServerMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_SetPlanetServerMessage_H
+#define INCLUDED_SetPlanetServerMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class SetPlanetServerMessage : public GameNetworkMessage
+{
+public:
+	SetPlanetServerMessage  (const std::string &address, uint16 port);
+	SetPlanetServerMessage  (Archive::ReadIterator & source);
+	virtual ~SetPlanetServerMessage ();
+
+	const std::string &getAddress() const;
+	uint16 getPort() const;
+	
+private:
+	Archive::AutoVariable<std::string> m_address;
+	Archive::AutoVariable<uint16> m_port;
+
+	SetPlanetServerMessage();
+	SetPlanetServerMessage(const SetPlanetServerMessage&);
+	SetPlanetServerMessage& operator= (const SetPlanetServerMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string& SetPlanetServerMessage::getAddress(void) const
+{
+	return m_address.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint16 SetPlanetServerMessage::getPort(void) const
+{
+	return m_port.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif	
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetUniverseAuthoritativeMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetUniverseAuthoritativeMessage.cpp
new file mode 100644
index 00000000..1e5ece2d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetUniverseAuthoritativeMessage.cpp
@@ -0,0 +1,46 @@
+//========================================================================
+//
+// SetUniverseAuthoritativeMessage.cpp - tells Centralserver we want all the objects in a chunk.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/SetUniverseAuthoritativeMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param process		gameserver id that should receive the loaded objects
+ */
+SetUniverseAuthoritativeMessage::SetUniverseAuthoritativeMessage  (uint32 process) :
+		GameNetworkMessage("SetUniverseAuthoritativeMessage"),
+		m_process(process)
+{
+	addVariable(m_process);
+}	
+
+//-----------------------------------------------------------------------
+
+SetUniverseAuthoritativeMessage::SetUniverseAuthoritativeMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("SetUniverseAuthoritativeMessage"),
+		m_process()
+{
+	addVariable(m_process);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+SetUniverseAuthoritativeMessage::~SetUniverseAuthoritativeMessage()
+{
+}	
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetUniverseAuthoritativeMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetUniverseAuthoritativeMessage.h
new file mode 100644
index 00000000..d6beb42f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/SetUniverseAuthoritativeMessage.h
@@ -0,0 +1,54 @@
+//========================================================================
+//
+// SetUniverseAuthoritativeMessage.h - tells Gameserver another Gameserver wants to load a
+// proxy from an authoritative object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_SetUniverseAuthoritativeMessage_H
+#define	_INCLUDED_SetUniverseAuthoritativeMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Central
+ * Sent to:  all GameServers
+ * Action:  Tells the GameServers which one should be authoritative for
+ *          universe objects.
+ */
+
+class SetUniverseAuthoritativeMessage : public GameNetworkMessage
+{
+  public:
+	SetUniverseAuthoritativeMessage  (uint32 process);
+	SetUniverseAuthoritativeMessage  (Archive::ReadIterator & source);
+	~SetUniverseAuthoritativeMessage ();
+
+	uint32              getProcess(void) const;
+        
+  private:
+	Archive::AutoVariable<uint32>      m_process;		
+
+  private:
+	SetUniverseAuthoritativeMessage();
+	SetUniverseAuthoritativeMessage(const SetUniverseAuthoritativeMessage&);
+	SetUniverseAuthoritativeMessage& operator= (const SetUniverseAuthoritativeMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline uint32 SetUniverseAuthoritativeMessage::getProcess(void) const
+{
+	return m_process.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif	// _INCLUDED_SetUniverseAuthoritativeMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/StructureListMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/StructureListMessage.cpp
new file mode 100644
index 00000000..9b9c0ebe
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/StructureListMessage.cpp
@@ -0,0 +1,110 @@
+// ======================================================================
+//
+// StructureListMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/StructureListMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+StructureListMessage::StructureListMessage(uint32 toolId, uint32 loginServerId, const NetworkId &characterId, const std::vector<StructureListMessageData> &data) :
+		GameNetworkMessage("StructureListMessage"),
+		m_data(),
+		m_toolId(toolId),
+		m_loginServerId(loginServerId),
+		m_characterId(characterId)
+{
+	m_data.set(data);
+
+	addVariable(m_data);
+	addVariable(m_toolId);
+	addVariable(m_loginServerId);
+	addVariable(m_characterId);
+}
+
+//-----------------------------------------------------------------------
+
+StructureListMessage::StructureListMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("StructureListMessage"),
+		m_data(),
+		m_toolId(),
+		m_loginServerId(),
+		m_characterId()
+{
+	addVariable(m_data);
+	addVariable(m_toolId);
+	addVariable(m_loginServerId);
+	addVariable(m_characterId);
+	
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+StructureListMessage::~StructureListMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+const std::vector<StructureListMessageData> &StructureListMessage::getData() const
+{
+	return m_data.get();
+}		
+
+// ----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get(ReadIterator & source, StructureListMessageData &c)
+	{
+		get(source,c.m_objectTemplate);
+		get(source,c.m_structureId);
+		get(source,c.m_location);
+		get(source,c.m_coordinates);
+		get(source,c.m_deleted);
+	}
+
+	void put(ByteStream & target, const StructureListMessageData &c)
+	{
+		put(target,c.m_objectTemplate);
+		put(target,c.m_structureId);
+		put(target,c.m_location);
+		put(target,c.m_coordinates);
+		put(target,c.m_deleted);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+StructureListMessageData::StructureListMessageData(const std::string &objectTemplate, 
+						   const NetworkId &structureId, 
+						   const std::string &location, 
+						   const Vector &coordinates, 
+						   const int32 deleted) :
+		m_objectTemplate(objectTemplate),
+		m_structureId(structureId),
+		m_location(location),
+		m_coordinates(coordinates),
+		m_deleted(deleted)
+{
+}
+
+// ----------------------------------------------------------------------
+
+StructureListMessageData::StructureListMessageData() :
+		m_objectTemplate(),
+		m_structureId(),
+		m_location(),
+		m_coordinates(),
+		m_deleted()
+{
+}
+	
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/StructureListMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/StructureListMessage.h
new file mode 100644
index 00000000..686cc00f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/StructureListMessage.h
@@ -0,0 +1,96 @@
+// ======================================================================
+//
+// CharacterListMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_StructureListMessage_H
+#define INCLUDED_StructureListMessage_H
+
+// ======================================================================
+
+#include <string>
+
+#include "Unicode.h"
+#include "sharedMath/Vector.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * This is declared as a separate class so that it can be forwarded.
+ * Otherwise, it would be nested in StructureListMessage
+ */
+class StructureListMessageData
+{
+  public:
+	std::string m_objectTemplate;
+	NetworkId m_structureId;
+	std::string m_location;
+	Vector m_coordinates;
+	int32 m_deleted;
+
+	StructureListMessageData();
+	StructureListMessageData( const std::string &objectTemplate, const NetworkId &structureId, const std::string &location, const Vector &coordinates, const int32 deleted);
+};
+
+// ----------------------------------------------------------------------
+
+/**
+ * List a character for an account
+ * Sent from:  DBProcess
+ * Sent to:  Central
+ * Action:  Forward the character list to the client.
+ */
+class StructureListMessage : public GameNetworkMessage
+{
+  public:
+	StructureListMessage  (uint32 toolId, uint32 loginServerId, const NetworkId& characterId, const std::vector<StructureListMessageData> &data);
+	StructureListMessage  (Archive::ReadIterator & source);
+	~StructureListMessage ();
+	
+	uint32 			     getToolId() const;
+	uint32 			     getLoginServerId() const;
+	const NetworkId&             getCharacterId() const;
+	const std::vector<StructureListMessageData> &getData() const;
+
+  private:
+	Archive::AutoArray<StructureListMessageData>  m_data;
+	Archive::AutoVariable<uint32> m_toolId;
+	Archive::AutoVariable<uint32> m_loginServerId;
+	Archive::AutoVariable<NetworkId> m_characterId;
+	
+	StructureListMessage();
+	StructureListMessage(const StructureListMessage&);
+	StructureListMessage& operator= (const StructureListMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline uint32 StructureListMessage::getLoginServerId(void) const
+{
+	return m_loginServerId.get();
+}
+
+inline uint32 StructureListMessage::getToolId(void) const
+{
+	return m_toolId.get();
+}
+
+inline const NetworkId& StructureListMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+// ----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get(ReadIterator & source, StructureListMessageData &c);
+	void put(ByteStream & target, const StructureListMessageData &c);
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ToggleAvatarLoginStatus.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ToggleAvatarLoginStatus.cpp
new file mode 100644
index 00000000..1686a8f3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ToggleAvatarLoginStatus.cpp
@@ -0,0 +1,60 @@
+//========================================================================
+//
+// ToggleAvatarLoginStatus.cpp - disable a character on a server
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ToggleAvatarLoginStatus.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id		id of object that was created
+ */
+ToggleAvatarLoginStatus::ToggleAvatarLoginStatus(std::string const & clusterName, unsigned int stationId, const NetworkId & characterId, bool enabled) :
+GameNetworkMessage("ToggleAvatarLoginStatus"),
+m_clusterName(clusterName),
+m_characterId(characterId),
+m_stationId(stationId),
+m_enabled(enabled)
+{
+	addVariable(m_clusterName);
+	addVariable(m_characterId);
+	addVariable(m_stationId);
+	addVariable(m_enabled);
+}	// ToggleAvatarLoginStatus::ToggleAvatarLoginStatus
+
+//-----------------------------------------------------------------------
+
+ToggleAvatarLoginStatus::ToggleAvatarLoginStatus(Archive::ReadIterator & source) :
+GameNetworkMessage("ToggleAvatarLoginStatus"),
+m_clusterName(),
+m_characterId(),
+m_stationId(),
+m_enabled()
+{
+	addVariable(m_clusterName);
+	addVariable(m_characterId);
+	addVariable(m_stationId);
+	addVariable(m_enabled);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+ToggleAvatarLoginStatus::~ToggleAvatarLoginStatus()
+{
+}	// ToggleAvatarLoginStatus::~ToggleAvatarLoginStatus
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ToggleAvatarLoginStatus.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ToggleAvatarLoginStatus.h
new file mode 100644
index 00000000..3a7d4d98
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/ToggleAvatarLoginStatus.h
@@ -0,0 +1,74 @@
+//========================================================================
+//
+// ToggleAvatarLoginStatus.h - tells Centralserver a new object is being created.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_ToggleAvatarLoginStatus_H
+#define	_INCLUDED_ToggleAvatarLoginStatus_H
+
+//-----------------------------------------------------------------------
+
+#include <string>
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Vector.h"
+#include "sharedFoundation/NetworkId.h"
+
+//-----------------------------------------------------------------------
+
+class ToggleAvatarLoginStatus : public GameNetworkMessage
+{
+public:
+	ToggleAvatarLoginStatus  (std::string const & clusterName, unsigned int stationId, const NetworkId & toCharacterId, bool enabled);
+	ToggleAvatarLoginStatus  (Archive::ReadIterator & source);
+	~ToggleAvatarLoginStatus ();
+
+	const std::string & getClusterName () const;
+	const NetworkId &  getCharacterId  () const;
+	unsigned int       getStationId    () const;
+	bool               getEnabled      () const;
+
+private:
+	Archive::AutoVariable<std::string>   m_clusterName;
+	Archive::AutoVariable<NetworkId>     m_characterId;
+	Archive::AutoVariable<unsigned int>  m_stationId;
+	Archive::AutoVariable<bool>          m_enabled;
+
+	ToggleAvatarLoginStatus();
+	ToggleAvatarLoginStatus(const ToggleAvatarLoginStatus&);
+	ToggleAvatarLoginStatus& operator= (const ToggleAvatarLoginStatus&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ToggleAvatarLoginStatus::getClusterName() const
+{
+	return m_clusterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned int ToggleAvatarLoginStatus::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & ToggleAvatarLoginStatus::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ToggleAvatarLoginStatus::getEnabled() const
+{
+	return m_enabled.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ToggleAvatarLoginStatus_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UnloadObjectMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UnloadObjectMessage.cpp
new file mode 100644
index 00000000..54c7a148
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UnloadObjectMessage.cpp
@@ -0,0 +1,49 @@
+//========================================================================
+//
+// UnloadObjectMessage.cpp - tells Gameserver to unload an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/UnloadObjectMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id			id of object we want to unload
+ */
+UnloadObjectMessage::UnloadObjectMessage(const NetworkId& id) :
+	GameNetworkMessage("UnloadObjectMessage"),
+	m_id(id)
+{
+	addVariable(m_id);
+}	// UnloadObjectMessage::UnloadObjectMessage
+
+//-----------------------------------------------------------------------
+
+	UnloadObjectMessage::UnloadObjectMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("UnloadObjectMessage"),
+m_id()
+{
+	addVariable(m_id);
+	unpack(source);
+}	// UnloadObjectMessage::UnloadObjectMessage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+UnloadObjectMessage::~UnloadObjectMessage()
+{
+}	// UnloadObjectMessage::~UnloadObjectMessage
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UnloadObjectMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UnloadObjectMessage.h
new file mode 100644
index 00000000..9adf4e8d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UnloadObjectMessage.h
@@ -0,0 +1,45 @@
+//========================================================================
+//
+// UnloadObjectMessage.h - tells Gameserver to unload an object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_UnloadObjectMessage_H
+#define	_INCLUDED_UnloadObjectMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class UnloadObjectMessage : public GameNetworkMessage
+{
+public:
+	explicit UnloadObjectMessage  (const NetworkId& id);
+	UnloadObjectMessage           (Archive::ReadIterator & source);
+	~UnloadObjectMessage ();
+
+	const NetworkId&          getId(void) const;
+
+private:
+	Archive::AutoVariable<NetworkId>     m_id;			// id of object we want to unload
+
+	UnloadObjectMessage();
+	UnloadObjectMessage(const UnloadObjectMessage&);
+	UnloadObjectMessage& operator= (const UnloadObjectMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId& UnloadObjectMessage::getId(void) const
+{
+	return m_id.get();
+}	// UnloadObjectMessage::getId
+
+// ----------------------------------------------------------------------
+
+#endif	// _INCLUDED_UnloadObjectMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UploadCharacterMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UploadCharacterMessage.cpp
new file mode 100644
index 00000000..fbdb80f7
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UploadCharacterMessage.cpp
@@ -0,0 +1,65 @@
+//========================================================================
+//
+// UploadCharacterMessage.cpp - tells Centralserver a new object is being created.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/UploadCharacterMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id		id of object that was created
+ */
+UploadCharacterMessage::UploadCharacterMessage(unsigned int stationId, const std::string & packedCharacterData, unsigned int gameServerId, const NetworkId & fromCharacterId, bool isAdmin) :
+GameNetworkMessage("UploadCharacterMessage"),
+m_stationId(stationId),
+m_packedCharacterData(packedCharacterData),
+m_fromGameServerId(gameServerId),
+m_fromCharacterId(fromCharacterId),
+m_isAdmin(isAdmin)
+{
+	addVariable(m_stationId);
+	addVariable(m_packedCharacterData);
+	addVariable(m_fromGameServerId);
+	addVariable(m_fromCharacterId);
+	addVariable(m_isAdmin);
+}	// UploadCharacterMessage::UploadCharacterMessage
+
+//-----------------------------------------------------------------------
+
+UploadCharacterMessage::UploadCharacterMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("UploadCharacterMessage"),
+m_stationId(),
+m_packedCharacterData(),
+m_fromGameServerId(),
+m_fromCharacterId(),
+m_isAdmin()
+{
+	addVariable(m_stationId);
+	addVariable(m_packedCharacterData);
+	addVariable(m_fromGameServerId);
+	addVariable(m_fromCharacterId);
+	addVariable(m_isAdmin);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+UploadCharacterMessage::~UploadCharacterMessage()
+{
+}	// UploadCharacterMessage::~UploadCharacterMessage
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UploadCharacterMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UploadCharacterMessage.h
new file mode 100644
index 00000000..99edaee0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralGameServer/UploadCharacterMessage.h
@@ -0,0 +1,82 @@
+//========================================================================
+//
+// UploadCharacterMessage.h - tells Centralserver a new object is being created.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_UploadCharacterMessage_H
+#define	_INCLUDED_UploadCharacterMessage_H
+
+//-----------------------------------------------------------------------
+
+#include <string>
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Vector.h"
+
+//-----------------------------------------------------------------------
+
+class UploadCharacterMessage : public GameNetworkMessage
+{
+public:
+	UploadCharacterMessage  (unsigned int stationId, const std::string & packedCharacterData, const unsigned int fromGameServerId, const NetworkId & fromCharacterId, bool isAdmin);
+	UploadCharacterMessage  (Archive::ReadIterator & source);
+	~UploadCharacterMessage ();
+
+	unsigned int         getStationId            () const;
+	const std::string &  getPackedCharacterData  () const;
+	unsigned int         getFromGameServerId     () const;
+	const NetworkId &    getFromCharacterId      () const;
+	bool                 getIsAdmin              () const;
+
+private:
+	Archive::AutoVariable<unsigned int>  m_stationId;
+	Archive::AutoVariable<std::string>   m_packedCharacterData;
+	Archive::AutoVariable<unsigned int>  m_fromGameServerId;
+	Archive::AutoVariable<NetworkId>     m_fromCharacterId;
+	Archive::AutoVariable<bool>          m_isAdmin;
+
+	UploadCharacterMessage();
+	UploadCharacterMessage(const UploadCharacterMessage&);
+	UploadCharacterMessage& operator= (const UploadCharacterMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+inline unsigned int UploadCharacterMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned int UploadCharacterMessage::getFromGameServerId() const
+{
+	return m_fromGameServerId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & UploadCharacterMessage::getFromCharacterId() const
+{
+	return m_fromCharacterId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & UploadCharacterMessage::getPackedCharacterData() const
+{
+	return m_packedCharacterData.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool UploadCharacterMessage::getIsAdmin() const
+{
+	return m_isAdmin.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_UploadCharacterMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/CentralPlanetServerConnect.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/CentralPlanetServerConnect.cpp
new file mode 100644
index 00000000..ffeb5c5c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/CentralPlanetServerConnect.cpp
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// CentralPlanetServerConnect.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CentralPlanetServerConnect.h"
+
+// ======================================================================
+
+CentralPlanetServerConnect::CentralPlanetServerConnect (const std::string &sceneId, const std::string &connectionAddress, uint16 gameServerPort) :
+		GameNetworkMessage("CentralPlanetServerConnect"),
+		m_sceneId(sceneId),
+		m_connectionAddress(connectionAddress),
+		m_gameServerPort(gameServerPort)
+{
+	addVariable(m_sceneId);
+	addVariable(m_connectionAddress);
+	addVariable(m_gameServerPort);
+}
+
+// ----------------------------------------------------------------------
+
+CentralPlanetServerConnect::CentralPlanetServerConnect (Archive::ReadIterator &source) :
+		GameNetworkMessage("CentralPlanetServerConnect"),
+		m_sceneId()
+{
+	addVariable(m_sceneId);
+	addVariable(m_connectionAddress);
+	addVariable(m_gameServerPort);
+	
+	unpack(source);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/CentralPlanetServerConnect.h b/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/CentralPlanetServerConnect.h
new file mode 100644
index 00000000..0f5f86ce
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/CentralPlanetServerConnect.h
@@ -0,0 +1,70 @@
+// ======================================================================
+//
+// CentralPlanetServerConnect.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_CentralPlanetServerConnect_H
+#define INCLUDED_CentralPlanetServerConnect_H
+
+// ======================================================================
+
+#include <string>
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Identify the Planet Server to Central
+ * Sent From:  Planet Server
+ * Sent To:  Central
+ * Action:  Identifies which scene this Planet Server handles.
+ */
+
+class CentralPlanetServerConnect : public GameNetworkMessage
+{
+  public:
+	CentralPlanetServerConnect (const std::string &sceneId, const std::string &connectionAddress, uint16 gameServerPort);
+	CentralPlanetServerConnect (Archive::ReadIterator &source);
+
+	const std::string &getSceneId() const;
+	const std::string &getConnectionAddress() const;
+	uint16 getGameServerPort() const;
+	
+  private:
+	Archive::AutoVariable<std::string> m_sceneId;
+	Archive::AutoVariable<std::string> m_connectionAddress;
+	Archive::AutoVariable<uint16> m_gameServerPort;
+	
+  private:
+	CentralPlanetServerConnect ();
+	CentralPlanetServerConnect(const CentralPlanetServerConnect&);
+	CentralPlanetServerConnect& operator= (const CentralPlanetServerConnect&);
+};
+
+// ----------------------------------------------------------------------
+
+inline const std::string &CentralPlanetServerConnect::getSceneId() const
+{
+	return m_sceneId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string &CentralPlanetServerConnect::getConnectionAddress() const
+{
+	return m_connectionAddress.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint16 CentralPlanetServerConnect::getGameServerPort() const
+{
+	return m_gameServerPort.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/GameServerForLoginMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/GameServerForLoginMessage.cpp
new file mode 100644
index 00000000..8ea34288
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/GameServerForLoginMessage.cpp
@@ -0,0 +1,49 @@
+// ======================================================================
+//
+// GameServerForLoginMessage.cpp
+//
+// Copyright 2001-2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GameServerForLoginMessage.h"
+
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+GameServerForLoginMessage::GameServerForLoginMessage(uint32 stationId, uint32 server, const NetworkId & characterId) :
+	GameNetworkMessage("GameServerForLoginMessage"),
+	m_stationId(stationId),
+	m_server(server),
+	m_characterId(characterId)
+{
+	addVariable(m_stationId);
+	addVariable(m_server);
+	addVariable(m_characterId);
+}
+
+// ----------------------------------------------------------------------
+
+GameServerForLoginMessage::GameServerForLoginMessage(Archive::ReadIterator &source) :
+		GameNetworkMessage("GameServerForLoginMessage"),
+		m_stationId(),
+		m_server(),
+		m_characterId()
+{
+	addVariable(m_stationId);
+	addVariable(m_server);
+	addVariable(m_characterId);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+GameServerForLoginMessage::~GameServerForLoginMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/GameServerForLoginMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/GameServerForLoginMessage.h
new file mode 100644
index 00000000..6b8e69d6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/GameServerForLoginMessage.h
@@ -0,0 +1,70 @@
+// ======================================================================
+//
+// GameServerForLoginMessage.h
+//
+// Copyright 2001-2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_GameServerForLoginMessage_H
+#define INCLUDED_GameServerForLoginMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+// ======================================================================
+
+/** 
+ * Reply to RequestGameServerForLoginMessage.  Identifies the game server
+ * to use to log in.
+ *
+ * Sent from:  PlanetServer 
+ * Sent to:  ConnectionServer (via Central)
+ * Action:  Connect the client to the specified game server
+ */
+class GameServerForLoginMessage : public GameNetworkMessage
+{
+public:
+	GameServerForLoginMessage(uint32 stationId, uint32 server, const NetworkId & characterId);
+	GameServerForLoginMessage(Archive::ReadIterator &source);
+	~GameServerForLoginMessage();
+
+public:
+	uint32 getStationId() const;
+	uint32 getServer() const;
+	const NetworkId& getCharacterId() const;
+
+private:
+	Archive::AutoVariable<uint32> m_stationId;
+	Archive::AutoVariable<uint32> m_server;
+	Archive::AutoVariable<NetworkId> m_characterId;
+
+private:
+	GameServerForLoginMessage();
+	GameServerForLoginMessage(const GameServerForLoginMessage&);
+	GameServerForLoginMessage& operator= (const GameServerForLoginMessage&);
+};
+
+// ======================================================================
+
+inline uint32 GameServerForLoginMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 GameServerForLoginMessage::getServer() const
+{
+	return m_server.get();
+}
+
+inline const NetworkId & GameServerForLoginMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/RequestGameServerForLoginMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/RequestGameServerForLoginMessage.cpp
new file mode 100644
index 00000000..797981e1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/RequestGameServerForLoginMessage.cpp
@@ -0,0 +1,60 @@
+// ======================================================================
+//
+// RequestGameServerForLoginMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/RequestGameServerForLoginMessage.h"
+
+//#include "PlanetGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+RequestGameServerForLoginMessage::RequestGameServerForLoginMessage(uint32 stationId, const NetworkId &characterId, const NetworkId &containerId, const std::string &scene, const Vector &coordinates, bool forCtsSourceCharacter) :
+		GameNetworkMessage("RequestGameServerForLoginMessage"),
+		m_stationId(stationId),
+		m_characterId(characterId),
+		m_containerId(containerId),
+		m_scene(scene),
+		m_coordinates(coordinates),
+		m_forCtsSourceCharacter(forCtsSourceCharacter)
+{
+	addVariable(m_stationId);
+	addVariable(m_characterId);
+	addVariable(m_containerId);
+	addVariable(m_scene);
+	addVariable(m_coordinates);
+	addVariable(m_forCtsSourceCharacter);
+}
+
+// ----------------------------------------------------------------------
+
+RequestGameServerForLoginMessage::RequestGameServerForLoginMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("RequestGameServerForLoginMessage"),
+		m_stationId(),
+		m_characterId(),
+		m_containerId(),
+		m_scene(),
+		m_coordinates(),
+		m_forCtsSourceCharacter()
+{
+	addVariable(m_stationId);
+	addVariable(m_characterId);
+	addVariable(m_containerId);
+	addVariable(m_scene);
+	addVariable(m_coordinates);
+	addVariable(m_forCtsSourceCharacter);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RequestGameServerForLoginMessage::~RequestGameServerForLoginMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/RequestGameServerForLoginMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/RequestGameServerForLoginMessage.h
new file mode 100644
index 00000000..81c8d9d8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralPlanetServer/RequestGameServerForLoginMessage.h
@@ -0,0 +1,98 @@
+// ======================================================================
+//
+// RequestGameServerForLoginMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_RequestGameServerForLoginMessage_H
+#define INCLUDED_RequestGameServerForLoginMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Pick a game server for login
+ *
+ * Sent from:  ConnectionServer 
+ * Sent to:  PlanetServer (via Central)
+ * Action:  Pick a good game server to use based on the coordinates
+ * specified.  Reply with GameServerForLoginMessage.
+ */
+class RequestGameServerForLoginMessage : public GameNetworkMessage
+{
+  public:
+	RequestGameServerForLoginMessage  (uint32 stationId, const NetworkId &characterId, const NetworkId &containerId, const std::string &scene, const Vector &coordinates, bool forCtsSourceCharacter);
+	RequestGameServerForLoginMessage  (Archive::ReadIterator & source);
+	~RequestGameServerForLoginMessage ();
+
+  public:
+	const std::string &  getScene() const;
+	const Vector &       getCoordinates() const;
+	uint32               getStationId() const;
+	const NetworkId &    getContainerId() const;
+	const NetworkId &    getCharacterId() const;
+	bool                 getForCtsSourceCharacter() const;
+	
+  private:
+	Archive::AutoVariable<uint32> m_stationId;
+	Archive::AutoVariable<NetworkId> m_characterId;
+	Archive::AutoVariable<NetworkId> m_containerId;
+	Archive::AutoVariable<std::string> m_scene;
+	Archive::AutoVariable<Vector> m_coordinates;
+	Archive::AutoVariable<bool> m_forCtsSourceCharacter;
+
+  private:
+	RequestGameServerForLoginMessage();
+	RequestGameServerForLoginMessage(const RequestGameServerForLoginMessage&);
+	RequestGameServerForLoginMessage& operator= (const RequestGameServerForLoginMessage&);
+};
+
+// ======================================================================
+
+inline const std::string &RequestGameServerForLoginMessage::getScene() const
+{
+	return m_scene.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Vector &RequestGameServerForLoginMessage::getCoordinates() const
+{
+	return m_coordinates.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 RequestGameServerForLoginMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &RequestGameServerForLoginMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &RequestGameServerForLoginMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool RequestGameServerForLoginMessage::getForCtsSourceCharacter() const
+{
+	return m_forCtsSourceCharacter.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/CentralTaskMessages.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/CentralTaskMessages.cpp
new file mode 100644
index 00000000..5cf15a48
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/CentralTaskMessages.cpp
@@ -0,0 +1,69 @@
+// CentralTaskMessages.cpp
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CentralTaskMessages.h"
+
+//-----------------------------------------------------------------------
+
+SpawnGameServer::SpawnGameServer(const std::string & newVolumeName, const std::string & newClusterName) :
+GameNetworkMessage("SpawnGameServer"),
+clusterName(newClusterName),
+volumeName(newVolumeName)
+{
+	addVariable(clusterName);
+	addVariable(volumeName);
+}
+
+//-----------------------------------------------------------------------
+
+SpawnGameServer::SpawnGameServer(Archive::ReadIterator & source) :
+GameNetworkMessage("SpawnGameServer"),
+clusterName(),
+volumeName()
+{
+	addVariable(clusterName);
+	addVariable(volumeName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+SpawnGameServer::~SpawnGameServer()
+{
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServiceAddress::CentralGameServiceAddress(const std::string & newClientServiceAddress, const uint16 newClientServicePort) :
+GameNetworkMessage("CentralGameServiceAddress"),
+clientServiceAddress(newClientServiceAddress),
+clientServicePort(newClientServicePort)
+{
+	addVariable(clientServiceAddress);
+	addVariable(clientServicePort);
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServiceAddress::CentralGameServiceAddress(Archive::ReadIterator & source) :
+GameNetworkMessage("CentralGameServiceAddress"),
+clientServiceAddress(),
+clientServicePort()
+{
+	addVariable(clientServiceAddress);
+	addVariable(clientServicePort);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+CentralGameServiceAddress::~CentralGameServiceAddress()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/CentralTaskMessages.h b/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/CentralTaskMessages.h
new file mode 100644
index 00000000..31c71522
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/CentralTaskMessages.h
@@ -0,0 +1,92 @@
+// CentralTaskMessages.h
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_CentralTaskMessages_H
+#define	_CentralTaskMessages_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+namespace CentralTaskMessageConstants
+{
+	const unsigned char   SpawnGameServer             = 1;
+	const unsigned char   CentralGameServiceAddress = 2;
+}
+
+//-----------------------------------------------------------------------
+
+class SpawnGameServer : public GameNetworkMessage
+{
+public:
+	SpawnGameServer(const std::string & newVolumeName, const std::string & newClusterName);
+	SpawnGameServer(Archive::ReadIterator & source);
+	~SpawnGameServer();
+
+	const std::string &  getClusterName(void) const;
+	const std::string &   getVolumeName(void) const;
+
+private:
+	Archive::AutoVariable<std::string>          clusterName;
+	Archive::AutoVariable<std::string>          volumeName;
+
+	SpawnGameServer();
+	SpawnGameServer(const SpawnGameServer&);
+	SpawnGameServer& operator= (const SpawnGameServer&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & SpawnGameServer::getClusterName(void) const
+{
+	return clusterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & SpawnGameServer::getVolumeName(void) const
+{
+	return volumeName.get();
+}
+
+//-----------------------------------------------------------------------
+
+class CentralGameServiceAddress : public GameNetworkMessage
+{
+public:
+	CentralGameServiceAddress(const std::string & newClientServiceAddress, const uint16 newClientServicePort);
+	CentralGameServiceAddress(Archive::ReadIterator & source);
+	~CentralGameServiceAddress();
+
+	const std::string & getGameServiceAddress (void) const;
+	const uint16          getGameServicePort    (void) const;
+private:
+	Archive::AutoVariable<std::string> clientServiceAddress;
+	Archive::AutoVariable<uint16>      clientServicePort;
+
+	CentralGameServiceAddress();
+	CentralGameServiceAddress(const CentralGameServiceAddress&);
+	CentralGameServiceAddress& operator= (const CentralGameServiceAddress&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CentralGameServiceAddress::getGameServiceAddress(void) const
+{
+	return clientServiceAddress.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 CentralGameServiceAddress::getGameServicePort(void) const
+{
+	return clientServicePort.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _CentralTaskMessages_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/TaskProcessDiedMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/TaskProcessDiedMessage.cpp
new file mode 100644
index 00000000..3661270d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/TaskProcessDiedMessage.cpp
@@ -0,0 +1,53 @@
+//========================================================================
+//
+// TaskProcessDiedMessage.cpp - tells Gameserver object baseline data has ended.
+//
+// copyright 2003 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/TaskProcessDiedMessage.h"
+
+#include "serverNetworkMessages/GameGameServerMessages.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id		id of object we are updating
+ */
+TaskProcessDiedMessage::TaskProcessDiedMessage(const int id, const std::string & processName) :
+	GameNetworkMessage("TaskProcessDiedMessage"),
+	m_processId(id),
+	m_processName(processName)
+{
+	addVariable(m_processId);
+	addVariable(m_processName);
+
+}	// TaskProcessDiedMessage::TaskProcessDiedMessage
+
+//-----------------------------------------------------------------------
+
+TaskProcessDiedMessage::TaskProcessDiedMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("TaskProcessDiedMessage"),
+m_processId(),
+m_processName()
+{
+	addVariable(m_processId);
+	addVariable(m_processName);
+	unpack(source);
+}	// TaskProcessDiedMessage::TaskProcessDiedMessage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+TaskProcessDiedMessage::~TaskProcessDiedMessage()
+{
+}	// TaskProcessDiedMessage::~TaskProcessDiedMessage
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/TaskProcessDiedMessage.h b/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/TaskProcessDiedMessage.h
new file mode 100644
index 00000000..bc8b2adb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/centralTaskManager/TaskProcessDiedMessage.h
@@ -0,0 +1,55 @@
+//========================================================================
+//
+// TaskProcessDiedMessage.h - tells Gameserver object baseline data has ended.
+//
+// copyright 2003 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_TaskProcessDiedMessage_H
+#define	_INCLUDED_TaskProcessDiedMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class TaskProcessDiedMessage : public GameNetworkMessage
+{
+public:
+	explicit TaskProcessDiedMessage  (const int processId, const std::string & processName);
+	TaskProcessDiedMessage(Archive::ReadIterator & source);
+	~TaskProcessDiedMessage ();
+
+	const int &          getProcessId(void) const;
+	const std::string &  getProcessName(void) const;
+
+private:
+	Archive::AutoVariable<int>          m_processId;
+	Archive::AutoVariable<std::string>  m_processName;
+
+	TaskProcessDiedMessage();
+	TaskProcessDiedMessage(const TaskProcessDiedMessage&);
+	TaskProcessDiedMessage& operator= (const TaskProcessDiedMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const int & TaskProcessDiedMessage::getProcessId() const
+{
+	return m_processId.get();
+}	// TaskProcessDiedMessage::getId
+//-----------------------------------------------------------------------
+
+inline const std::string & TaskProcessDiedMessage::getProcessName() const
+{
+    return m_processName.get();
+}
+
+//-----------------------------------------------------------------------
+
+
+#endif	// _INCLUDED_TaskProcessDiedMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionBidMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionBidMessage.cpp
new file mode 100644
index 00000000..9633d9a8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionBidMessage.cpp
@@ -0,0 +1,38 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "CMCreateAuctionBidMessage.h"
+
+CMCreateAuctionBidMessage::CMCreateAuctionBidMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("CMCreateAuctionBidMessage"),
+	m_itemId(),
+	m_bidderId(),
+	m_bid(),
+	m_maxProxyBid()
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_bidderId);
+	AutoByteStream::addVariable(m_bid);
+	AutoByteStream::addVariable(m_maxProxyBid);
+	unpack(source);
+}
+
+CMCreateAuctionBidMessage::CMCreateAuctionBidMessage(
+	const NetworkId &    itemId,
+	const NetworkId &    bidderId,
+	int                  bid,
+	int                  maxProxyBid
+):
+	GameNetworkMessage("CMCreateAuctionBidMessage"),
+	m_itemId(itemId),
+	m_bidderId(bidderId),
+	m_bid(bid),
+	m_maxProxyBid(maxProxyBid)
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_bidderId);
+	AutoByteStream::addVariable(m_bid);
+	AutoByteStream::addVariable(m_maxProxyBid);
+}
+
+CMCreateAuctionBidMessage::~CMCreateAuctionBidMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionBidMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionBidMessage.h
new file mode 100644
index 00000000..638de9f9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionBidMessage.h
@@ -0,0 +1,37 @@
+#ifndef CMCREATEAUCTIONBIDMESSAGE_H
+#define CMCREATEAUCTIONBIDMESSAGE_H
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class CMCreateAuctionBidMessage : public GameNetworkMessage
+{
+
+public:
+	explicit CMCreateAuctionBidMessage(
+		const NetworkId &    itemId,
+		const NetworkId &    bidderId,
+		int                  bid,
+		int                  maxProxyBid
+	);
+
+	CMCreateAuctionBidMessage(Archive::ReadIterator & source);
+	~CMCreateAuctionBidMessage();
+
+	const NetworkId &      GetItemId()        const {return m_itemId.get();}
+	const NetworkId &      GetBidderId()      const {return m_bidderId.get();}
+	int                    GetBid()           const {return m_bid.get();}
+	int                    GetMaxProxyBid()   const {return m_maxProxyBid.get();}
+		
+protected:
+
+private:
+	Archive::AutoVariable<NetworkId>    m_itemId;
+	Archive::AutoVariable<NetworkId>    m_bidderId;
+	Archive::AutoVariable<int>          m_bid;
+	Archive::AutoVariable<int>          m_maxProxyBid;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionMessage.cpp
new file mode 100644
index 00000000..6d3a4501
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionMessage.cpp
@@ -0,0 +1,105 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "CMCreateAuctionMessage.h"
+
+CMCreateAuctionMessage::CMCreateAuctionMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("CMCreateAuctionMessage"),
+	m_creatorId(),
+	m_minimumBid(),
+	m_auctionTimer(),
+	m_buyNowPrice(),
+	m_userDescriptionLength(),
+	m_userDescription(),
+	m_attributes(),
+	m_locationId(),
+	m_itemId(),
+	m_itemType(),
+	m_itemTemplateId(),
+	m_expireTimer(),
+	m_itemNameLength(),
+	m_itemName(),
+	m_ownerId(),
+	m_flags(),
+	m_itemSize()
+{
+	AutoByteStream::addVariable(m_creatorId);
+	AutoByteStream::addVariable(m_minimumBid);
+	AutoByteStream::addVariable(m_auctionTimer);
+	AutoByteStream::addVariable(m_buyNowPrice);
+	AutoByteStream::addVariable(m_userDescriptionLength);
+	AutoByteStream::addVariable(m_userDescription);
+	AutoByteStream::addVariable(m_attributes);
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_itemType);
+	AutoByteStream::addVariable(m_itemTemplateId);
+	AutoByteStream::addVariable(m_expireTimer);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_flags);
+	AutoByteStream::addVariable(m_itemSize);
+	unpack(source);
+}
+
+CMCreateAuctionMessage::CMCreateAuctionMessage(
+	const NetworkId &       creatorId,
+	int                     minimumBid,
+	int                     auctionTimer,
+	int                     buyNowPrice,
+	int                     userDescriptionLength,
+	const Unicode::String & userDescription,
+	std::vector<std::pair<std::string, Unicode::String> > const & attributes,
+	const NetworkId &       locationId,
+	const NetworkId &       itemId,
+	int                     itemType,
+	int                     itemTemplateId,
+	int                     expireTimer,
+	int                     itemNameLength,
+	const Unicode::String & itemName,
+	const NetworkId &       ownerId,
+	int                     flags,
+	int                     itemSize
+):
+	GameNetworkMessage("CMCreateAuctionMessage"),
+	m_creatorId(creatorId),
+	m_minimumBid(minimumBid),
+	m_auctionTimer(auctionTimer),
+	m_buyNowPrice(buyNowPrice),
+	m_userDescriptionLength(userDescriptionLength),
+	m_userDescription(userDescription),
+	m_attributes(),
+	m_locationId(locationId),
+	m_itemId(itemId),
+	m_itemType(itemType),
+	m_itemTemplateId(itemTemplateId),
+	m_expireTimer(expireTimer),
+	m_itemNameLength(itemNameLength),
+	m_itemName(itemName),
+	m_ownerId(ownerId),
+	m_flags(flags),
+	m_itemSize(itemSize)
+{
+	m_attributes.set(attributes);
+	
+	AutoByteStream::addVariable(m_creatorId);
+	AutoByteStream::addVariable(m_minimumBid);
+	AutoByteStream::addVariable(m_auctionTimer);
+	AutoByteStream::addVariable(m_buyNowPrice);
+	AutoByteStream::addVariable(m_userDescriptionLength);
+	AutoByteStream::addVariable(m_userDescription);
+	AutoByteStream::addVariable(m_attributes);
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_itemType);
+	AutoByteStream::addVariable(m_itemTemplateId);
+	AutoByteStream::addVariable(m_expireTimer);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_flags);
+	AutoByteStream::addVariable(m_itemSize);
+}
+
+CMCreateAuctionMessage::~CMCreateAuctionMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionMessage.h
new file mode 100644
index 00000000..b087306d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateAuctionMessage.h
@@ -0,0 +1,76 @@
+#ifndef CMCREATEAUCTIONMESSAGE_H
+#define CMCREATEAUCTIONMESSAGE_H
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class CMCreateAuctionMessage : public GameNetworkMessage
+{
+
+public:
+	explicit CMCreateAuctionMessage(
+		const NetworkId &      creatorId,
+		int                     minimumBid,
+		int                     auctionTimer,
+		int                     buyNowPrice,
+		int                     userDescriptionLength,
+		const Unicode::String & userDescription,
+		std::vector<std::pair<std::string, Unicode::String> > const & attributes,
+		const NetworkId &       locationId,
+		const NetworkId &       itemId,
+		int                     itemType,
+		int                     itemTemplateId,
+		int                     expireTimer,
+		int                     itemNameLength,
+		const Unicode::String & itemName,
+		const NetworkId &       ownerId,
+		int                     flags,
+		int                     itemSize
+	);
+
+	CMCreateAuctionMessage(Archive::ReadIterator & source);
+	~CMCreateAuctionMessage();
+
+	const NetworkId &      GetCreatorId()       const {return m_creatorId.get();}
+	int                    GetMinimumBid()      const {return m_minimumBid.get();}
+	int                    GetAuctionTimer()    const {return m_auctionTimer.get();}
+	int                    GetBuyNowPrice()     const {return m_buyNowPrice.get();}
+	int                    GetUserDescLength()  const {return m_userDescriptionLength.get();}
+	const Unicode::String &GetUserDescription() const {return m_userDescription.get();}
+	std::vector<std::pair<std::string, Unicode::String> > const & GetAttributes() const {return m_attributes.get();}
+	const NetworkId &      GetLocationId()      const {return m_locationId.get();}
+	const NetworkId &      GetItemId()          const {return m_itemId.get();}
+	int                    GetItemType()        const {return m_itemType.get();}
+	int                    GetItemTemplateId()  const {return m_itemTemplateId.get();}
+	int                    GetExpireTimer()     const {return m_expireTimer.get();}
+	int                    GetItemNameLength()  const {return m_itemNameLength.get();}
+	const Unicode::String &GetItemName()        const {return m_itemName.get();}
+	const NetworkId &      GetOwnerId()         const {return m_ownerId.get();}
+	int                    GetFlags()           const {return m_flags.get();}
+	int                    GetItemSize()        const {return m_itemSize.get();}
+		
+protected:
+
+private:
+	Archive::AutoVariable<NetworkId>       m_creatorId;
+	Archive::AutoVariable<int>             m_minimumBid;
+	Archive::AutoVariable<int>             m_auctionTimer;
+	Archive::AutoVariable<int>             m_buyNowPrice;
+	Archive::AutoVariable<int>             m_userDescriptionLength;
+	Archive::AutoVariable<Unicode::String> m_userDescription;
+	Archive::AutoArray<std::pair<std::string, Unicode::String> > m_attributes;
+	Archive::AutoVariable<NetworkId>       m_locationId;
+	Archive::AutoVariable<NetworkId>       m_itemId;
+	Archive::AutoVariable<int>             m_itemType;
+	Archive::AutoVariable<int>             m_itemTemplateId;
+	Archive::AutoVariable<int>             m_expireTimer;
+	Archive::AutoVariable<int>             m_itemNameLength;
+	Archive::AutoVariable<Unicode::String> m_itemName;
+	Archive::AutoVariable<NetworkId>       m_ownerId;
+	Archive::AutoVariable<int>             m_flags;
+	Archive::AutoVariable<int>             m_itemSize;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateLocationMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateLocationMessage.cpp
new file mode 100644
index 00000000..b70e8d8f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateLocationMessage.cpp
@@ -0,0 +1,75 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "CMCreateLocationMessage.h"
+
+
+CMCreateLocationMessage::CMCreateLocationMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("CMCreateLocationMessage"),
+	m_locationId(),
+	m_locationString(),
+	m_ownerId(),
+	m_salesTax(),
+	m_bankId(),
+	m_emptyDate(),
+	m_lastAccessDate(),
+	m_inactiveDate(),
+	m_status(),
+	m_searchEnabled(),
+	m_entranceCharge()
+{
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_locationString);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_salesTax);
+	AutoByteStream::addVariable(m_bankId);
+	AutoByteStream::addVariable(m_emptyDate);
+	AutoByteStream::addVariable(m_lastAccessDate);
+	AutoByteStream::addVariable(m_inactiveDate);
+	AutoByteStream::addVariable(m_status);
+	AutoByteStream::addVariable(m_searchEnabled);
+	AutoByteStream::addVariable(m_entranceCharge);
+	unpack(source);
+}
+
+CMCreateLocationMessage::CMCreateLocationMessage(
+	const NetworkId &    locationId,
+	const std::string &  locationString,
+	const NetworkId &    ownerId,
+	int                  salesTax,
+	const NetworkId &    bankId,
+	int                  emptyDate,
+	int                  lastAccessDate,
+	int                  inactiveDate,
+	int                  status,
+	bool                 searchEnabled,
+	int                  entranceCharge
+):
+	GameNetworkMessage("CMCreateLocationMessage"),
+	m_locationId(locationId),
+	m_locationString(locationString),
+	m_ownerId(ownerId),
+	m_salesTax(salesTax),
+	m_bankId(bankId),
+	m_emptyDate(emptyDate),
+	m_lastAccessDate(lastAccessDate),
+	m_inactiveDate(inactiveDate),
+	m_status(status),
+	m_searchEnabled(searchEnabled),
+	m_entranceCharge(entranceCharge)
+{
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_locationString);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_salesTax);
+	AutoByteStream::addVariable(m_bankId);
+	AutoByteStream::addVariable(m_emptyDate);
+	AutoByteStream::addVariable(m_lastAccessDate);
+	AutoByteStream::addVariable(m_inactiveDate);
+	AutoByteStream::addVariable(m_status);
+	AutoByteStream::addVariable(m_searchEnabled);
+	AutoByteStream::addVariable(m_entranceCharge);
+}
+
+CMCreateLocationMessage::~CMCreateLocationMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateLocationMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateLocationMessage.h
new file mode 100644
index 00000000..3cebbf96
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMCreateLocationMessage.h
@@ -0,0 +1,57 @@
+#ifndef CMCREATELOCATIONMESSAGE_H
+#define CMCREATELOCATIONMESSAGE_H
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class CMCreateLocationMessage : public GameNetworkMessage
+{
+
+public:
+	explicit CMCreateLocationMessage(
+		const NetworkId &    locationId,
+		const std::string &  locationString,
+		const NetworkId &    ownerId,
+		int                  salesTax,
+		const NetworkId &    bankId,
+		int                  emptyDate,
+		int                  lastAccessDate,
+		int                  inactiveDate,
+		int                  status,
+		bool		     searchEnabled,
+		int                  entranceCharge
+	);
+
+	CMCreateLocationMessage(Archive::ReadIterator & source);
+	~CMCreateLocationMessage();
+
+	const NetworkId &      GetLocationId()        const {return m_locationId.get();}
+	const std::string &    GetLocationString()    const {return m_locationString.get();}
+	const NetworkId &      GetOwnerId()           const {return m_ownerId.get();}
+	int                    GetSalesTax()          const {return m_salesTax.get();}
+	const NetworkId &      GetBankId()            const {return m_bankId.get();}
+	int                    GetEmptyDate()         const {return m_emptyDate.get();}
+	int                    GetLastAccessDate()    const {return m_lastAccessDate.get();}
+	int                    GetInactiveDate()      const {return m_inactiveDate.get();}
+	int                    GetStatus()            const {return m_status.get();}
+	bool                   GetSearchEnabled()     const {return m_searchEnabled.get();}
+	int                    GetEntranceCharge()    const {return m_entranceCharge.get();}
+protected:
+
+private:
+	Archive::AutoVariable<NetworkId>    m_locationId;
+	Archive::AutoVariable<std::string>  m_locationString;
+	Archive::AutoVariable<NetworkId>    m_ownerId;
+	Archive::AutoVariable<int>          m_salesTax;
+	Archive::AutoVariable<NetworkId>    m_bankId;
+	Archive::AutoVariable<int>          m_emptyDate;
+	Archive::AutoVariable<int>          m_lastAccessDate;
+	Archive::AutoVariable<int>          m_inactiveDate;
+	Archive::AutoVariable<int>          m_status;
+	Archive::AutoVariable<bool>         m_searchEnabled;
+	Archive::AutoVariable<int>          m_entranceCharge;
+};
+
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteAuctionMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteAuctionMessage.cpp
new file mode 100644
index 00000000..70f92589
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteAuctionMessage.cpp
@@ -0,0 +1,23 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "CMDeleteAuctionMessage.h"
+
+CMDeleteAuctionMessage::CMDeleteAuctionMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("CMDeleteAuctionMessage"),
+	m_itemId()
+{
+	AutoByteStream::addVariable(m_itemId);
+	unpack(source);
+}
+
+CMDeleteAuctionMessage::CMDeleteAuctionMessage(
+	const NetworkId &    itemId
+):
+	GameNetworkMessage("CMDeleteAuctionMessage"),
+	m_itemId(itemId)
+{
+	AutoByteStream::addVariable(m_itemId);
+}
+
+CMDeleteAuctionMessage::~CMDeleteAuctionMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteAuctionMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteAuctionMessage.h
new file mode 100644
index 00000000..44088ec3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteAuctionMessage.h
@@ -0,0 +1,28 @@
+#ifndef CMDELETEAUCTIONMESSAGE_H
+#define CMDELETEAUCTIONMESSAGE_H
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class CMDeleteAuctionMessage : public GameNetworkMessage
+{
+
+public:
+	explicit CMDeleteAuctionMessage(
+		const NetworkId &    itemId
+	);
+
+	CMDeleteAuctionMessage(Archive::ReadIterator & source);
+	~CMDeleteAuctionMessage();
+
+	const NetworkId &      GetItemId()        const {return m_itemId.get();}
+		
+protected:
+
+private:
+	Archive::AutoVariable<NetworkId>    m_itemId;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteLocationMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteLocationMessage.cpp
new file mode 100644
index 00000000..56533789
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteLocationMessage.cpp
@@ -0,0 +1,23 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "CMDeleteLocationMessage.h"
+
+CMDeleteLocationMessage::CMDeleteLocationMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("CMDeleteLocationMessage"),
+	m_locationId()
+{
+	AutoByteStream::addVariable(m_locationId);
+	unpack(source);
+}
+
+CMDeleteLocationMessage::CMDeleteLocationMessage(
+	const NetworkId &    locationId
+):
+	GameNetworkMessage("CMDeleteLocationMessage"),
+	m_locationId(locationId)
+{
+	AutoByteStream::addVariable(m_locationId);
+}
+
+CMDeleteLocationMessage::~CMDeleteLocationMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteLocationMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteLocationMessage.h
new file mode 100644
index 00000000..227961f7
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMDeleteLocationMessage.h
@@ -0,0 +1,28 @@
+#ifndef CMDELETELOCATIONMESSAGE_H
+#define CMDELETELOCATIONMESSAGE_H
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class CMDeleteLocationMessage : public GameNetworkMessage
+{
+
+public:
+	explicit CMDeleteLocationMessage(
+		const NetworkId &    locationId
+	);
+
+	CMDeleteLocationMessage(Archive::ReadIterator & source);
+	~CMDeleteLocationMessage();
+
+	const NetworkId &      GetLocationId()        const {return m_locationId.get();}
+		
+protected:
+
+private:
+	Archive::AutoVariable<NetworkId>    m_locationId;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateAuctionMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateAuctionMessage.cpp
new file mode 100644
index 00000000..6b0407be
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateAuctionMessage.cpp
@@ -0,0 +1,33 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "CMUpdateAuctionMessage.h"
+
+CMUpdateAuctionMessage::CMUpdateAuctionMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("CMUpdateAuctionMessage"),
+	m_itemId(),
+	m_ownerId(),
+	m_flags()
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_flags);
+	unpack(source);
+}
+
+CMUpdateAuctionMessage::CMUpdateAuctionMessage(
+	const NetworkId &    itemId,
+	const NetworkId &    ownerId,
+	int                  flags
+):
+	GameNetworkMessage("CMUpdateAuctionMessage"),
+	m_itemId(itemId),
+	m_ownerId(ownerId),
+	m_flags(flags)
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_flags);
+}
+
+CMUpdateAuctionMessage::~CMUpdateAuctionMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateAuctionMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateAuctionMessage.h
new file mode 100644
index 00000000..5a1a8f97
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateAuctionMessage.h
@@ -0,0 +1,34 @@
+#ifndef CMUPDATEAUCTIONMESSAGE_H
+#define CMUPDATEAUCTIONMESSAGE_H
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class CMUpdateAuctionMessage : public GameNetworkMessage
+{
+
+public:
+	explicit CMUpdateAuctionMessage(
+		const NetworkId &    itemId,
+		const NetworkId &    ownerId,
+		int                  flags
+	);
+
+	CMUpdateAuctionMessage(Archive::ReadIterator & source);
+	~CMUpdateAuctionMessage();
+
+	const NetworkId &      GetItemId()        const {return m_itemId.get();}
+	const NetworkId &      GetOwnerId()         const {return m_ownerId.get();}
+	int                    GetFlags()         const {return m_flags.get();}
+		
+protected:
+
+private:
+	Archive::AutoVariable<NetworkId>    m_itemId;
+	Archive::AutoVariable<NetworkId>    m_ownerId;
+	Archive::AutoVariable<int>          m_flags;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateLocationMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateLocationMessage.cpp
new file mode 100644
index 00000000..bba9e2a4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateLocationMessage.cpp
@@ -0,0 +1,75 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "CMUpdateLocationMessage.h"
+
+
+CMUpdateLocationMessage::CMUpdateLocationMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("CMUpdateLocationMessage"),
+	m_locationId(),
+	m_ownerId(),
+	m_locationString(),
+	m_salesTax(),
+	m_bankId(),
+	m_emptyDate(),
+	m_lastAccessDate(),
+	m_inactiveDate(),
+	m_status(),
+	m_searchEnabled(),
+	m_entranceCharge()
+{
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_locationString);
+	AutoByteStream::addVariable(m_salesTax);
+	AutoByteStream::addVariable(m_bankId);
+	AutoByteStream::addVariable(m_emptyDate);
+	AutoByteStream::addVariable(m_lastAccessDate);
+	AutoByteStream::addVariable(m_inactiveDate);
+	AutoByteStream::addVariable(m_status);
+	AutoByteStream::addVariable(m_searchEnabled);
+	AutoByteStream::addVariable(m_entranceCharge);
+	unpack(source);
+}
+
+CMUpdateLocationMessage::CMUpdateLocationMessage(
+	const NetworkId &    locationId,
+	const NetworkId &    ownerId,
+	const std::string &  locationString,
+	int                  salesTax,
+	const NetworkId &    bankId,
+	int                  emptyDate,
+	int                  lastAccessDate,
+	int                  inactiveDate,
+	int                  status,
+	bool                 searchEnabled,
+	int                  entranceCharge
+):
+	GameNetworkMessage("CMUpdateLocationMessage"),
+	m_locationId(locationId),
+	m_ownerId(ownerId),
+	m_locationString(locationString),
+	m_salesTax(salesTax),
+	m_bankId(bankId),
+	m_emptyDate(emptyDate),
+	m_lastAccessDate(lastAccessDate),
+	m_inactiveDate(inactiveDate),
+	m_status(status),
+	m_searchEnabled(searchEnabled),
+	m_entranceCharge(entranceCharge)
+{
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_locationString);
+	AutoByteStream::addVariable(m_salesTax);
+	AutoByteStream::addVariable(m_bankId);
+	AutoByteStream::addVariable(m_emptyDate);
+	AutoByteStream::addVariable(m_lastAccessDate);
+	AutoByteStream::addVariable(m_inactiveDate);
+	AutoByteStream::addVariable(m_status);
+	AutoByteStream::addVariable(m_searchEnabled);
+	AutoByteStream::addVariable(m_entranceCharge);
+}
+
+CMUpdateLocationMessage::~CMUpdateLocationMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateLocationMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateLocationMessage.h
new file mode 100644
index 00000000..ce6ace6d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CMUpdateLocationMessage.h
@@ -0,0 +1,58 @@
+#ifndef CMUPDATELOCATIONMESSAGE_H
+#define CMUPDATELOCATIONMESSAGE_H
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+//#include "Unicode.h"
+
+class CMUpdateLocationMessage : public GameNetworkMessage
+{
+
+public:
+	explicit CMUpdateLocationMessage(
+		const NetworkId &    locationId,
+		const NetworkId &    ownerId,
+		const std::string &  locationString,
+		int                  salesTax,
+		const NetworkId &    bankId,
+		int                  emptyDate,
+		int                  lastAccessDate,
+		int                  inactiveDate,
+		int                  status,
+		bool                 searchEnabled,
+		int                  entranceCharge
+	);
+
+	CMUpdateLocationMessage(Archive::ReadIterator & source);
+	~CMUpdateLocationMessage();
+
+	const NetworkId &      GetLocationId()        const {return m_locationId.get();}
+	const NetworkId &      GetOwnerId()           const {return m_ownerId.get();}
+	const std::string &    GetLocationString()    const {return m_locationString.get();}
+	int                    GetSalesTax()          const {return m_salesTax.get();}
+	const NetworkId &      GetBankId()            const {return m_bankId.get();}
+	int                    GetEmptyDate()         const {return m_emptyDate.get();}
+	int                    GetLastAccessDate()    const {return m_lastAccessDate.get();}
+	int                    GetInactiveDate()      const {return m_inactiveDate.get();}
+	int                    GetStatus()            const {return m_status.get();}
+	int                    GetEntranceCharge()    const {return m_entranceCharge.get();}
+	bool                   GetSearchEnabled()     const {return m_searchEnabled.get();}
+protected:
+
+private:
+	Archive::AutoVariable<NetworkId>    m_locationId;
+	Archive::AutoVariable<NetworkId>    m_ownerId;
+	Archive::AutoVariable<std::string>  m_locationString;
+	Archive::AutoVariable<int>          m_salesTax;
+	Archive::AutoVariable<NetworkId>    m_bankId;
+	Archive::AutoVariable<int>          m_emptyDate;
+	Archive::AutoVariable<int>          m_lastAccessDate;
+	Archive::AutoVariable<int>          m_inactiveDate;
+	Archive::AutoVariable<int>          m_status;
+	Archive::AutoVariable<bool>         m_searchEnabled;
+	Archive::AutoVariable<int>          m_entranceCharge;
+};
+
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CommoditiesLoadDoneMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CommoditiesLoadDoneMessage.cpp
new file mode 100644
index 00000000..1dd42e77
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CommoditiesLoadDoneMessage.cpp
@@ -0,0 +1,38 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "CommoditiesLoadDoneMessage.h"
+
+CommoditiesLoadDoneMessage::CommoditiesLoadDoneMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("CommoditiesLoadDone"),
+	m_auctionLocationsCount(),
+	m_marketAuctionsCount(),
+	m_marketAuctionAttributesCount(),
+	m_marketAuctionBidsCount()
+{
+	AutoByteStream::addVariable(m_auctionLocationsCount);
+	AutoByteStream::addVariable(m_marketAuctionsCount);
+	AutoByteStream::addVariable(m_marketAuctionAttributesCount);
+	AutoByteStream::addVariable(m_marketAuctionBidsCount);
+	unpack(source);
+}
+
+CommoditiesLoadDoneMessage::CommoditiesLoadDoneMessage(
+	const int            auctionLocationsCount,
+	const int            marketAuctionsCount,
+	const int            marketAuctionAttributesCount,
+	const int            marketAuctionBidsCount
+):
+	GameNetworkMessage("CommoditiesLoadDone"),
+	m_auctionLocationsCount(auctionLocationsCount),
+	m_marketAuctionsCount(marketAuctionsCount),
+	m_marketAuctionAttributesCount(marketAuctionAttributesCount),
+	m_marketAuctionBidsCount(marketAuctionBidsCount)
+{
+	AutoByteStream::addVariable(m_auctionLocationsCount);
+	AutoByteStream::addVariable(m_marketAuctionsCount);
+	AutoByteStream::addVariable(m_marketAuctionAttributesCount);
+	AutoByteStream::addVariable(m_marketAuctionBidsCount);
+}
+
+CommoditiesLoadDoneMessage::~CommoditiesLoadDoneMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CommoditiesLoadDoneMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CommoditiesLoadDoneMessage.h
new file mode 100644
index 00000000..8fda371f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/CommoditiesLoadDoneMessage.h
@@ -0,0 +1,36 @@
+#ifndef CommoditiesLoadDoneMessage_H
+#define CommoditiesLoadDoneMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class CommoditiesLoadDoneMessage : public GameNetworkMessage
+{
+
+public:
+	explicit CommoditiesLoadDoneMessage(
+		const int            auctionLocationsCount,
+		const int            marketAuctionsCount,
+		const int            marketAuctionAttributesCount,
+		const int            marketAuctionBidsCount
+	);
+
+	CommoditiesLoadDoneMessage(Archive::ReadIterator & source);
+	~CommoditiesLoadDoneMessage();
+
+	const int              getAuctionLocationsCount()	const {return m_auctionLocationsCount.get();}
+	const int              getMarketAuctionsCount()		const {return m_marketAuctionsCount.get();}
+	const int              getMarketAuctionAttributesCount() const {return m_marketAuctionAttributesCount.get();}
+	const int              getMarketAuctionBidsCount()	const {return m_marketAuctionBidsCount.get();}
+		
+protected:
+
+private:
+	Archive::AutoVariable<int>	m_auctionLocationsCount;
+	Archive::AutoVariable<int>	m_marketAuctionsCount;
+	Archive::AutoVariable<int>	m_marketAuctionAttributesCount;
+	Archive::AutoVariable<int>	m_marketAuctionBidsCount;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetAuctionLocationsMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetAuctionLocationsMessage.cpp
new file mode 100644
index 00000000..971d2f9f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetAuctionLocationsMessage.cpp
@@ -0,0 +1,53 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "GetAuctionLocationsMessage.h"
+
+GetAuctionLocationsMessage::GetAuctionLocationsMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("GetAuctionLocationsMessage"),
+	m_auctionLocations()
+{
+	AutoByteStream::addVariable(m_auctionLocations);
+	unpack(source);
+}
+
+GetAuctionLocationsMessage::GetAuctionLocationsMessage() :
+	GameNetworkMessage("GetAuctionLocationsMessage"),
+	m_auctionLocations()
+{
+	AutoByteStream::addVariable(m_auctionLocations);
+}
+
+GetAuctionLocationsMessage::~GetAuctionLocationsMessage()
+{
+}
+
+void GetAuctionLocationsMessage::addAuctionLocation(
+	const NetworkId &   locationId,
+	int                 locationNameLength,
+	const std::string & locationName,
+	const NetworkId &   ownerId,
+	int                 salesTax,
+	const NetworkId &   salesTaxBankId,
+	int                 emptyDate,
+	int                 lastAccessDate,
+	int                 inactiveDate,
+	int                 status,
+	bool		        searchEnabled,
+	int                 entranceCharge
+)
+{
+	GetAuctionLocationsMessage::AuctionLocation auctionLocation;
+	auctionLocation.locationId         = locationId;
+	auctionLocation.locationNameLength = locationNameLength;
+	auctionLocation.locationName       = locationName;
+	auctionLocation.ownerId            = ownerId;
+	auctionLocation.salesTax           = salesTax;
+	auctionLocation.salesTaxBankId     = salesTaxBankId;
+	auctionLocation.emptyDate          = emptyDate;
+	auctionLocation.lastAccessDate     = lastAccessDate;
+	auctionLocation.inactiveDate       = inactiveDate;
+	auctionLocation.status             = status;
+	auctionLocation.searchEnabled      = searchEnabled;
+	auctionLocation.entranceCharge     = entranceCharge;
+
+	m_auctionLocations.get().push_back(auctionLocation);
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetAuctionLocationsMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetAuctionLocationsMessage.h
new file mode 100644
index 00000000..f3993922
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetAuctionLocationsMessage.h
@@ -0,0 +1,91 @@
+#ifndef GetAuctionLocationsMessage_H
+#define GetAuctionLocationsMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class GetAuctionLocationsMessage : public GameNetworkMessage
+{
+public:
+	struct AuctionLocation
+	{
+		NetworkId   locationId;
+		int         locationNameLength;
+		std::string locationName;
+		NetworkId   ownerId;
+		int         salesTax;
+		NetworkId   salesTaxBankId;
+		int         emptyDate;
+		int         lastAccessDate;
+		int         inactiveDate;
+		int         status;
+		bool		searchEnabled;
+		int         entranceCharge;
+	};
+
+	GetAuctionLocationsMessage();
+	GetAuctionLocationsMessage(Archive::ReadIterator & source);
+	~GetAuctionLocationsMessage();
+
+	void addAuctionLocation(
+		const NetworkId &   locationId,
+		int                 locationNameLength,
+		const std::string & locationName,
+		const NetworkId &   ownerId,
+		int                 salesTax,
+		const NetworkId &   salesTaxBankId,
+		int                 emptyDate,
+		int                 lastAccessDate,
+		int                 inactiveDate,
+		int                 status,
+		bool		        searchEnabled,
+		int                 entranceCharge
+	);
+
+	void clearAllAuctionLocations() {m_auctionLocations.get().clear();}
+
+	const std::list<AuctionLocation> & getAuctionLocations() const {return m_auctionLocations.get();}
+
+protected:
+
+private:
+	Archive::AutoList<AuctionLocation> m_auctionLocations;
+};
+
+namespace Archive
+{
+	inline void get(ReadIterator & source, GetAuctionLocationsMessage::AuctionLocation & target)
+	{
+		Archive::get(source, target.locationId);
+		Archive::get(source, target.locationNameLength);
+		Archive::get(source, target.locationName);
+		Archive::get(source, target.ownerId);
+		Archive::get(source, target.salesTax);
+		Archive::get(source, target.salesTaxBankId);
+		Archive::get(source, target.emptyDate);
+		Archive::get(source, target.lastAccessDate);
+		Archive::get(source, target.inactiveDate);
+		Archive::get(source, target.status);
+		Archive::get(source, target.searchEnabled);
+		Archive::get(source, target.entranceCharge);
+	}
+
+	inline void put(ByteStream & target, const GetAuctionLocationsMessage::AuctionLocation & source)
+	{
+		Archive::put(target, source.locationId);
+		Archive::put(target, source.locationNameLength);
+		Archive::put(target, source.locationName);
+		Archive::put(target, source.ownerId);
+		Archive::put(target, source.salesTax);
+		Archive::put(target, source.salesTaxBankId);
+		Archive::put(target, source.emptyDate);
+		Archive::put(target, source.lastAccessDate);
+		Archive::put(target, source.inactiveDate);
+		Archive::put(target, source.status);
+		Archive::put(target, source.searchEnabled);
+		Archive::put(target, source.entranceCharge);
+	}
+}
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionAttributesMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionAttributesMessage.cpp
new file mode 100644
index 00000000..3650411b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionAttributesMessage.cpp
@@ -0,0 +1,35 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "GetMarketAuctionAttributesMessage.h"
+
+GetMarketAuctionAttributesMessage::GetMarketAuctionAttributesMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("GetMarketAuctionAttributesMessage"),
+	m_attributes()
+{
+	AutoByteStream::addVariable(m_attributes);
+	unpack(source);
+}
+
+GetMarketAuctionAttributesMessage::GetMarketAuctionAttributesMessage() :
+	GameNetworkMessage("GetMarketAuctionAttributesMessage"),
+	m_attributes()
+{
+	AutoByteStream::addVariable(m_attributes);
+}
+
+GetMarketAuctionAttributesMessage::~GetMarketAuctionAttributesMessage()
+{
+}
+
+void GetMarketAuctionAttributesMessage::addAttribute(
+	const NetworkId &    itemId,
+	const std::string &  attributeName,
+	const Unicode::String & attributeValue
+)
+{
+	GetMarketAuctionAttributesMessage::MarketAuctionAttribute attribute;
+	attribute.itemId = itemId;
+	attribute.attributeName = attributeName;
+	attribute.attributeValue = attributeValue;
+
+	m_attributes.get().push_back(attribute);
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionAttributesMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionAttributesMessage.h
new file mode 100644
index 00000000..14b6eb8d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionAttributesMessage.h
@@ -0,0 +1,55 @@
+#ifndef GetMarketAuctionAttributesMessage_H
+#define GetMarketAuctionAttributesMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+class GetMarketAuctionAttributesMessage : public GameNetworkMessage
+{
+public:
+	struct MarketAuctionAttribute
+	{
+		NetworkId itemId;
+		std::string attributeName;
+		Unicode::String attributeValue;
+	};
+
+	GetMarketAuctionAttributesMessage();
+	GetMarketAuctionAttributesMessage(Archive::ReadIterator & source);
+	~GetMarketAuctionAttributesMessage();
+
+	void addAttribute(
+		const NetworkId &    itemId,
+		const std::string &  attributeName,
+		const Unicode::String & attributeValue
+	);
+
+	void clearAllAttributes() {m_attributes.get().clear();}
+
+	const std::list<MarketAuctionAttribute> & getAttributes() const {return m_attributes.get();}
+
+protected:
+
+private:
+	Archive::AutoList<MarketAuctionAttribute> m_attributes;
+};
+
+namespace Archive
+{
+	inline void get(ReadIterator & source, GetMarketAuctionAttributesMessage::MarketAuctionAttribute & target)
+	{
+		Archive::get(source, target.itemId);
+		Archive::get(source, target.attributeName);
+		Archive::get(source, target.attributeValue);
+	}
+
+	inline void put(ByteStream & target, const GetMarketAuctionAttributesMessage::MarketAuctionAttribute & source)
+	{
+		Archive::put(target, source.itemId);
+		Archive::put(target, source.attributeName);
+		Archive::put(target, source.attributeValue);
+	}
+}
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionBidsMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionBidsMessage.cpp
new file mode 100644
index 00000000..4268bde8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionBidsMessage.cpp
@@ -0,0 +1,37 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "GetMarketAuctionBidsMessage.h"
+
+GetMarketAuctionBidsMessage::GetMarketAuctionBidsMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("GetMarketAuctionBidsMessage"),
+	m_marketAuctionBids()
+{
+	AutoByteStream::addVariable(m_marketAuctionBids);
+	unpack(source);
+}
+
+GetMarketAuctionBidsMessage::GetMarketAuctionBidsMessage() :
+	GameNetworkMessage("GetMarketAuctionBidsMessage"),
+	m_marketAuctionBids()
+{
+	AutoByteStream::addVariable(m_marketAuctionBids);
+}
+
+GetMarketAuctionBidsMessage::~GetMarketAuctionBidsMessage()
+{
+}
+
+void GetMarketAuctionBidsMessage::addMarketAuctionBid(
+	const NetworkId & itemId,
+	const NetworkId & bidderId,
+	int               bid,
+	int               maxProxyBid
+)
+{
+	GetMarketAuctionBidsMessage::MarketAuctionBid marketAuctionBid;
+	marketAuctionBid.itemId      = itemId;
+	marketAuctionBid.bidderId    = bidderId;
+	marketAuctionBid.bid         = bid;
+	marketAuctionBid.maxProxyBid = maxProxyBid;
+
+	m_marketAuctionBids.get().push_back(marketAuctionBid);
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionBidsMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionBidsMessage.h
new file mode 100644
index 00000000..fd5fbfd6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionBidsMessage.h
@@ -0,0 +1,59 @@
+#ifndef GetMarketAuctionBidsMessage_H
+#define GetMarketAuctionBidsMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class GetMarketAuctionBidsMessage : public GameNetworkMessage
+{
+public:
+	struct MarketAuctionBid
+	{
+		NetworkId itemId;
+		NetworkId bidderId;
+		int       bid;
+		int       maxProxyBid;
+	};
+
+	GetMarketAuctionBidsMessage();
+	GetMarketAuctionBidsMessage(Archive::ReadIterator & source);
+	~GetMarketAuctionBidsMessage();
+
+	void addMarketAuctionBid(
+		const NetworkId & itemId,
+		const NetworkId & bidderId,
+		int               bid,
+		int               maxProxyBid
+	);
+
+	void clearAllMarketAuctionBids() {m_marketAuctionBids.get().clear();}
+
+	const std::list<MarketAuctionBid> & getMarketAuctionBids() const {return m_marketAuctionBids.get();}
+		
+protected:
+
+private:
+	Archive::AutoList<MarketAuctionBid> m_marketAuctionBids;
+};
+
+namespace Archive
+{
+	inline void get(ReadIterator & source, GetMarketAuctionBidsMessage::MarketAuctionBid & target)
+	{
+		Archive::get(source, target.itemId);
+		Archive::get(source, target.bidderId);
+		Archive::get(source, target.bid);
+		Archive::get(source, target.maxProxyBid);
+	}
+
+	inline void put(ByteStream & target, const GetMarketAuctionBidsMessage::MarketAuctionBid & source)
+	{
+		Archive::put(target, source.itemId);
+		Archive::put(target, source.bidderId);
+		Archive::put(target, source.bid);
+		Archive::put(target, source.maxProxyBid);
+	}
+}
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionsMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionsMessage.cpp
new file mode 100644
index 00000000..a50d7e99
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionsMessage.cpp
@@ -0,0 +1,65 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "GetMarketAuctionsMessage.h"
+
+GetMarketAuctionsMessage::GetMarketAuctionsMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("GetMarketAuctionsMessage"),
+	m_auctions()
+{
+	AutoByteStream::addVariable(m_auctions);
+	unpack(source);
+}
+
+GetMarketAuctionsMessage::GetMarketAuctionsMessage() :
+	GameNetworkMessage("GetMarketAuctionsMessage"),
+	m_auctions()
+{	
+	AutoByteStream::addVariable(m_auctions);
+}
+
+GetMarketAuctionsMessage::~GetMarketAuctionsMessage()
+{
+}
+
+void GetMarketAuctionsMessage::addAuction(
+	const NetworkId &    itemId,
+	const NetworkId &    ownerId,
+	const NetworkId &    creatorId,
+	const NetworkId &    locationId,
+	int                  minBid,
+	int                  buyNowPrice,
+	int                  auctionTimer,
+	int                  oobLength,
+	const std::string &  oob,
+	int                  userDescriptionLength,
+	const Unicode::String &userDescription,
+	int                  category,
+	int                  itemTemplateId,
+	int                  itemNameLength,
+	const Unicode::String &itemName,
+	int                  itemTimer,
+	int                  active,
+	int                  itemSize
+)
+{
+	GetMarketAuctionsMessage::MarketAuction auction;
+	auction.itemId                = itemId;
+	auction.ownerId               = ownerId;
+	auction.creatorId             = creatorId;
+	auction.locationId            = locationId;
+	auction.minBid                = minBid;
+	auction.buyNowPrice           = buyNowPrice;
+	auction.auctionTimer          = auctionTimer;
+	auction.oobLength             = oobLength;
+	auction.oob                   = oob;
+	auction.userDescriptionLength = userDescriptionLength;
+	auction.userDescription       = userDescription;
+	auction.category              = category;
+	auction.itemTemplateId        = itemTemplateId;
+	auction.itemNameLength        = itemNameLength;
+	auction.itemName              = itemName;
+	auction.itemTimer             = itemTimer;
+	auction.active                = active;
+	auction.itemSize              = itemSize;
+
+	m_auctions.get().push_back(auction);
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionsMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionsMessage.h
new file mode 100644
index 00000000..54809144
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/GetMarketAuctionsMessage.h
@@ -0,0 +1,115 @@
+#ifndef GetMarketAuctionsMessage_H
+#define GetMarketAuctionsMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+class GetMarketAuctionsMessage : public GameNetworkMessage
+{
+public:
+	struct MarketAuction
+	{
+		NetworkId       itemId;
+		NetworkId       ownerId;
+		NetworkId       creatorId;
+		NetworkId       locationId;
+		int             minBid;
+		int             buyNowPrice;
+		int             auctionTimer;
+		int             oobLength;
+		std::string     oob;
+		int             userDescriptionLength;
+		Unicode::String userDescription;
+		int             category;
+		int             itemTemplateId;
+		int             itemNameLength;
+		Unicode::String itemName;
+		int             itemTimer;
+		int             active;
+		int             itemSize;
+	};
+
+	GetMarketAuctionsMessage();
+	GetMarketAuctionsMessage(Archive::ReadIterator & source);
+	~GetMarketAuctionsMessage();
+
+	void addAuction(
+		const NetworkId &    itemId,
+		const NetworkId &    ownerId,
+		const NetworkId &    creatorId,
+		const NetworkId &    locationId,
+		int                  minBid,
+		int                  buyNowPrice,
+		int                  auctionTimer,
+		int                  oobLength,
+		const std::string &  oob,
+		int                  userDescriptionLength,
+		const Unicode::String &userDescription,
+		int                  category,
+		int                  itemTemplateId,
+		int                  itemNameLength,
+		const Unicode::String &itemName,
+		int                  itemTimer,
+		int                  active,
+		int                  itemSize
+	);
+
+	void clearAllAuctions() {m_auctions.get().clear();}
+
+	const std::list<MarketAuction> & getAuctions() const {return m_auctions.get();}
+		
+protected:
+
+private:
+	Archive::AutoList<MarketAuction> m_auctions;
+};
+
+namespace Archive
+{
+	inline void get(ReadIterator & source, GetMarketAuctionsMessage::MarketAuction & target)
+	{
+		Archive::get(source, target.itemId);
+		Archive::get(source, target.ownerId);
+		Archive::get(source, target.creatorId);
+		Archive::get(source, target.locationId);
+		Archive::get(source, target.minBid);
+		Archive::get(source, target.buyNowPrice);
+		Archive::get(source, target.auctionTimer);
+		Archive::get(source, target.oobLength);
+		Archive::get(source, target.oob);
+		Archive::get(source, target.userDescriptionLength);
+		Archive::get(source, target.userDescription);
+		Archive::get(source, target.category);
+		Archive::get(source, target.itemTemplateId);
+		Archive::get(source, target.itemNameLength);
+		Archive::get(source, target.itemName);
+		Archive::get(source, target.itemTimer);
+		Archive::get(source, target.active);
+		Archive::get(source, target.itemSize);
+	}
+
+	inline void put(ByteStream & target, const GetMarketAuctionsMessage::MarketAuction & source)
+	{
+		Archive::put(target, source.itemId);
+		Archive::put(target, source.ownerId);
+		Archive::put(target, source.creatorId);
+		Archive::put(target, source.locationId);
+		Archive::put(target, source.minBid);
+		Archive::put(target, source.buyNowPrice);
+		Archive::put(target, source.auctionTimer);
+		Archive::put(target, source.oobLength);
+		Archive::put(target, source.oob);
+		Archive::put(target, source.userDescriptionLength);
+		Archive::put(target, source.userDescription);
+		Archive::put(target, source.category);
+		Archive::put(target, source.itemTemplateId);
+		Archive::put(target, source.itemNameLength);
+		Archive::put(target, source.itemName);
+		Archive::put(target, source.itemTimer);
+		Archive::put(target, source.active);
+		Archive::put(target, source.itemSize);
+	}
+}
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/LoadCommoditiesMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/LoadCommoditiesMessage.cpp
new file mode 100644
index 00000000..e34cab82
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/LoadCommoditiesMessage.cpp
@@ -0,0 +1,23 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "LoadCommoditiesMessage.h"
+
+LoadCommoditiesMessage::LoadCommoditiesMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("LoadCommodities"),
+	m_payload()
+{
+	AutoByteStream::addVariable(m_payload);
+	unpack(source);
+}
+
+LoadCommoditiesMessage::LoadCommoditiesMessage(
+	const int            payload
+):
+	GameNetworkMessage("LoadCommodities"),
+	m_payload(payload)
+{
+	AutoByteStream::addVariable(m_payload);
+}
+
+LoadCommoditiesMessage::~LoadCommoditiesMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/LoadCommoditiesMessage.h b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/LoadCommoditiesMessage.h
new file mode 100644
index 00000000..7243f50c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/commoditiesSwgDatabase/LoadCommoditiesMessage.h
@@ -0,0 +1,27 @@
+#ifndef LoadCommoditiesMessage_H
+#define LoadCommoditiesMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class LoadCommoditiesMessage : public GameNetworkMessage
+{
+
+public:
+	explicit LoadCommoditiesMessage(
+		const int            payload
+	);
+
+	LoadCommoditiesMessage(Archive::ReadIterator & source);
+	~LoadCommoditiesMessage();
+
+	const int              getPayload() const {return m_payload.get();}
+		
+protected:
+
+private:
+	Archive::AutoVariable<int> m_payload;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/core/FirstServerNetworkMessages.h b/engine/server/library/serverNetworkMessages/src/shared/core/FirstServerNetworkMessages.h
new file mode 100644
index 00000000..cf5b0a2c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/core/FirstServerNetworkMessages.h
@@ -0,0 +1,13 @@
+#ifndef INCLUDED_FirstServerNetworkMessages_H
+#define INCLUDED_FirstServerNetworkMessages_H
+
+#include "sharedFoundation/FirstSharedFoundation.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/core/SetupServerNetworkMessages.cpp b/engine/server/library/serverNetworkMessages/src/shared/core/SetupServerNetworkMessages.cpp
new file mode 100644
index 00000000..d976dd62
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/core/SetupServerNetworkMessages.cpp
@@ -0,0 +1,1618 @@
+// ======================================================================
+//
+// SetupServerNetworkMessages.cpp
+// copyright 1998 Bootprint Entertainment
+// copyright 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/SetupServerNetworkMessages.h"
+
+#include "StringId.h"
+#include "localizationArchive/StringIdArchive.h"
+#include "serverGame/CityInfo.h"
+#include "serverNetworkMessages/AiMovementMessage.h"
+#include "serverNetworkMessages/AiCreatureStateMessage.h"
+#include "serverNetworkMessages/GroupMemberParam.h"
+#include "serverNetworkMessages/GroupMemberParamArchive.h"
+#include "serverNetworkMessages/MessageQueueAlterAttribute.h"
+#include "serverNetworkMessages/MessageQueueCommandQueueEnqueueFwd.h"
+#include "serverNetworkMessages/MessageQueueCommandQueueForceExecuteCommandFwd.h"
+#include "serverNetworkMessages/MessageQueueGrantOfflineXp.h"
+#include "serverNetworkMessages/MessageQueuePvpCommand.h"
+#include "serverNetworkMessages/MessageQueueScriptTrigger.h"
+#include "serverNetworkMessages/MessageQueueSetState.h"
+#include "serverNetworkMessages/MessageQueueTeleportObject.h"
+#include "serverUtility/LocationData.h"
+#include "sharedFoundation/DynamicVariable.h"
+#include "sharedFoundation/DynamicVariableLocationData.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedGame/AttribMod.h"
+#include "sharedGame/AttribModArchive.h"
+#include "sharedGame/LfgCharacterData.h"
+#include "sharedUtility/Location.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/ProsePackageArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MapLocation.h"
+#include "sharedNetworkMessages/MapLocationArchive.h"
+#include "sharedNetworkMessages/MessageQueueDataTransformWithParent.h"
+#include "swgSharedUtility/Attributes.def"
+
+// ======================================================================
+
+namespace SetupServerNetworkMessagesNamespace
+{
+	static bool g_installed = false;
+
+	void packString(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::string> * msg = safe_cast<const MessageQueueGenericValueType<std::string> *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data* unpackString(Archive::ReadIterator &source)
+	{
+		std::string v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<std::string> * result = new MessageQueueGenericValueType<std::string>(v);
+		return result;
+	}
+
+	void packLocation(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<Location> * msg = safe_cast<const MessageQueueGenericValueType<Location> *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackLocation(Archive::ReadIterator & source)
+	{
+		Location location;
+		Archive::get(source, location);
+		MessageQueueGenericValueType<Location> * result = new MessageQueueGenericValueType<Location>(location);
+		return result;
+	}
+
+	void packGroupMemberParam(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<GroupMemberParam> * msg = safe_cast<const MessageQueueGenericValueType<GroupMemberParam> *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackGroupMemberParam(Archive::ReadIterator &source)
+	{
+		GroupMemberParam v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<GroupMemberParam> * result = new MessageQueueGenericValueType<GroupMemberParam>(v);
+		return result;
+	}
+	void packNetworkId(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<NetworkId> * msg = safe_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackNetworkId(Archive::ReadIterator &source)
+	{
+		NetworkId v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<NetworkId> * result = new MessageQueueGenericValueType<NetworkId>(v);
+		return result;
+	}
+	void packInt(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<int> * msg = safe_cast<const MessageQueueGenericValueType<int> *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackInt(Archive::ReadIterator &source)
+	{
+		int v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<int> * result = new MessageQueueGenericValueType<int>(v);
+		return result;
+	}
+	void packFloat(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<float> * msg = safe_cast<const MessageQueueGenericValueType<float> *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackFloat(Archive::ReadIterator &source)
+	{
+		float v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<float> * result = new MessageQueueGenericValueType<float>(v);
+		return result;
+	}
+
+	//----------------------------------------------------------------------
+
+	void packMapLocationTypePair(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<MapLocation, std::pair<int, int> > > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<MapLocation, std::pair<int, int> > > *>(data);
+		if (msg)
+		{
+			Archive::put (target, msg->getValue ());
+		}
+	}
+
+	//----------------------------------------------------------------------
+
+	MessageQueue::Data* unpackMapLocationTypePair(Archive::ReadIterator &source)
+	{
+		std::pair <MapLocation, std::pair<int, int> > v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<std::pair<MapLocation, std::pair<int, int> > > * result = new MessageQueueGenericValueType<std::pair<MapLocation, std::pair<int, int> > >(v);
+		return result;
+	}
+
+	//----------------------------------------------------------------------
+
+	void packStringId(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<StringId> * const msg = safe_cast<const MessageQueueGenericValueType<StringId> *>(data);
+		if (msg)
+		{
+			Archive::put (target, msg->getValue ());
+		}
+	}
+
+	MessageQueue::Data* unpackStringId(Archive::ReadIterator &source)
+	{
+		StringId v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<StringId> * result = new MessageQueueGenericValueType<StringId>(v);
+		return result;
+	}
+
+	void packStringIdProsePackage(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<StringId, ProsePackage> > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<StringId, ProsePackage> > *>(data);
+		if (msg)
+		{
+			Archive::put (target, msg->getValue ());
+		}
+	}
+
+	MessageQueue::Data* unpackStringIdProsePackage(Archive::ReadIterator & source)
+	{
+		std::pair<StringId, ProsePackage> v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<std::pair<StringId, ProsePackage> > * result = new MessageQueueGenericValueType<std::pair<StringId, ProsePackage> >(v);
+		return result;
+	}
+
+	void packStringNetworkIdStringIdProsePackage(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, std::pair<StringId, ProsePackage> > > > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, std::pair<StringId, ProsePackage> > > > *>(data);
+		if (msg)
+		{
+			Archive::put (target, msg->getValue ());
+		}
+	}
+
+	MessageQueue::Data* unpackStringNetworkIdStringIdProsePackage (Archive::ReadIterator & source)
+	{
+		std::pair<std::string, std::pair<NetworkId, std::pair<StringId, ProsePackage> > > v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, std::pair<StringId, ProsePackage> > > > * result = new MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, std::pair<StringId, ProsePackage> > > >(v);
+		return result;
+	}
+
+	void packUnsignedLong(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<unsigned long> * msg = safe_cast<const MessageQueueGenericValueType<unsigned long> *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackUnsignedLong(Archive::ReadIterator & source)
+	{
+		unsigned long v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<unsigned long>(v);
+	}
+
+	void packUnicodeString(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<Unicode::String> * msg = safe_cast<const MessageQueueGenericValueType<Unicode::String> *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackUnicodeString(Archive::ReadIterator & source)
+	{
+		Unicode::String v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<Unicode::String>(v);
+	}
+
+	void packNothing(const MessageQueue::Data *, Archive::ByteStream &)
+	{
+	}
+	MessageQueue::Data* unpackNothing(Archive::ReadIterator &)
+	{
+		return NULL;
+	}
+
+	void packVectorNetworkIdVector(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<Vector, std::pair<NetworkId, Vector> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<Vector, std::pair<NetworkId, Vector> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackVectorNetworkIdVector(Archive::ReadIterator & source)
+	{
+		std::pair<Vector, std::pair<NetworkId, Vector> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<Vector, std::pair<NetworkId, Vector> > >(v);
+	}
+
+	void packIntVector(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<int, Vector> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<int, Vector> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackIntVector(Archive::ReadIterator & source)
+	{
+		std::pair<int, Vector> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, Vector> >(v);
+	}
+
+	void packStringVector(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, Vector> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, Vector> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringVector(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, Vector> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, Vector> >(v);
+	}
+
+	void packBool(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<bool> * msg = safe_cast<const MessageQueueGenericValueType<bool> *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackBool(Archive::ReadIterator & source)
+	{
+		bool v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<bool>(v);
+	}
+
+	void packStringInt(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, int> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, int> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringInt(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, int> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, int> >(v);
+	}
+
+	void packStringInt64(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, int64> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, int64> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringInt64(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, int64> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, int64> >(v);
+	}
+
+	void packStringIntArray(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, std::vector<int> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::vector<int> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringIntArray(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, std::vector<int> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, std::vector<int> > >(v);
+	}
+
+	void packLocationData(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<LocationData> * msg = safe_cast<const MessageQueueGenericValueType<LocationData> *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackLocationData(Archive::ReadIterator & source)
+	{
+		LocationData v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<LocationData>(v);
+	}
+
+	void packBoolNetworkId(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<bool, NetworkId> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<bool, NetworkId> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackBoolNetworkId(Archive::ReadIterator & source)
+	{
+		std::pair<bool, NetworkId> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<bool, NetworkId> >(v);
+	}
+
+	void packIntNetworkId(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<int, NetworkId> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<int, NetworkId> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackIntNetworkId(Archive::ReadIterator & source)
+	{
+		std::pair<int, NetworkId> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, NetworkId> >(v);
+	}
+
+	void packNetworkIdInt(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<NetworkId, int> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, int> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackNetworkIdInt(Archive::ReadIterator & source)
+	{
+		std::pair<NetworkId, int> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<NetworkId, int> >(v);
+	}
+
+	void packNetworkIdFloat(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<NetworkId, float> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, float> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackNetworkIdFloat(Archive::ReadIterator & source)
+	{
+		std::pair<NetworkId, float> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<NetworkId, float> >(v);
+	}
+	
+	void packNetworkIdNetworkId(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackNetworkIdNetworkId(Archive::ReadIterator & source)
+	{
+		std::pair<NetworkId, NetworkId> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<NetworkId, NetworkId> >(v);
+	}
+
+	void packIntArray(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::vector<int> > * msg = safe_cast<const MessageQueueGenericValueType<std::vector<int> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackIntArray(Archive::ReadIterator & source)
+	{
+		std::vector<int> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::vector<int> >(v);
+	}
+
+	void packStringFloat(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, float> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, float> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringFloat(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, float> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, float> >(v);
+	}
+
+	void packStringFloatArray(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, std::vector<float> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::vector<float> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringFloatArray(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, std::vector<float> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, std::vector<float> > >(v);
+	}
+
+	void packStringIdArray(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::vector<StringId> > * msg = safe_cast<const MessageQueueGenericValueType<std::vector<StringId> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringIdArray(Archive::ReadIterator & source)
+	{
+		std::vector<StringId> v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<std::vector<StringId> > * result = new MessageQueueGenericValueType<std::vector<StringId> >(v);
+		return result;
+	}
+
+	void packAttributeIntNetworkId(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<Attributes::Enumerator, std::pair<int, NetworkId> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<Attributes::Enumerator, std::pair<int, NetworkId> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	void packUnicodeStringArray(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::vector<Unicode::String> > * msg = safe_cast<const MessageQueueGenericValueType<std::vector<Unicode::String> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackUnicodeStringArray(Archive::ReadIterator & source)
+	{
+		std::vector<Unicode::String> v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<std::vector<Unicode::String> > * result = new MessageQueueGenericValueType<std::vector<Unicode::String> >(v);
+		return result;
+	}
+
+	MessageQueue::Data * unpackAttributeIntNetworkId(Archive::ReadIterator & source)
+	{
+		std::pair<Attributes::Enumerator, std::pair<int, NetworkId> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<Attributes::Enumerator, std::pair<int, NetworkId> > >(v);
+	}
+
+	void packAttributeIntFloatFloatFloat(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<Attributes::Enumerator, std::pair<int, std::pair<float, std::pair<float, float> > > > > * const msg = safe_cast<const MessageQueueGenericValueType<std::pair<Attributes::Enumerator, std::pair<int, std::pair<float, std::pair<float, float> > > > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackAttributeIntFloatFloatFloat(Archive::ReadIterator & source)
+	{
+		std::pair<Attributes::Enumerator, std::pair<int, std::pair<float, std::pair<float, float> > > > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<Attributes::Enumerator, std::pair<int, std::pair<float, std::pair<float, float> > > > >(v);
+	}
+
+	void packAttribute(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<Attributes::Enumerator> * msg = safe_cast<const MessageQueueGenericValueType<Attributes::Enumerator> *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackAttribute(Archive::ReadIterator & source)
+	{
+		Attributes::Enumerator v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<Attributes::Enumerator>(v);
+	}
+
+	void packNetworkIdArray(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::vector<NetworkId> > * msg = safe_cast<const MessageQueueGenericValueType<std::vector<NetworkId> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackNetworkIdArray(Archive::ReadIterator & source)
+	{
+		std::vector<NetworkId> v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<std::vector<NetworkId> > * result = new MessageQueueGenericValueType<std::vector<NetworkId> >(v);
+		return result;
+	}
+
+	void packNetworkIdNetworkIdNetworkId(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<NetworkId, std::pair<NetworkId, NetworkId> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, std::pair<NetworkId, NetworkId> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * packNetworkIdNetworkIdNetworkId(Archive::ReadIterator & source)
+	{
+		std::pair<NetworkId, std::pair<NetworkId, NetworkId> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<NetworkId, std::pair<NetworkId, NetworkId> > >(v);
+	}
+
+	void packNetworkIdUint32(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<NetworkId, uint32> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, uint32> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackNetworkIdUint32(Archive::ReadIterator & source)
+	{
+		std::pair<NetworkId, uint32> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<NetworkId, uint32> >(v);
+	}
+
+	void packUint32Bool(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<uint32, bool> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<uint32, bool> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackUint32Bool(Archive::ReadIterator & source)
+	{
+		std::pair<uint32, bool> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<uint32, bool> >(v);
+	}
+
+	void packStringNetworkIdNetworkId(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, NetworkId> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, NetworkId> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringNetworkIdNetworkId(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, std::pair<NetworkId, NetworkId> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, NetworkId> > >(v);
+	}
+
+	void packDynamicVariableLocation(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, DynamicVariableLocationData> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, DynamicVariableLocationData> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackDynamicVariableLocation(Archive::ReadIterator &source)
+	{
+		std::pair<std::string, DynamicVariableLocationData> v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<std::pair<std::string, DynamicVariableLocationData> > * result = new MessageQueueGenericValueType<std::pair<std::string, DynamicVariableLocationData> >(v);
+		return result;
+	}
+
+	void packDynamicVariableLocationArray(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, std::vector<DynamicVariableLocationData> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::vector<DynamicVariableLocationData> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackDynamicVariableLocationArray(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, std::vector<DynamicVariableLocationData> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, std::vector<DynamicVariableLocationData> > >(v);
+	}
+	
+	void packStringNetworkId(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, NetworkId> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, NetworkId> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringNetworkId(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, NetworkId> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, NetworkId> >(v);
+	}
+
+	void packUnicodeStringNetworkId(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<Unicode::String, NetworkId> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<Unicode::String, NetworkId> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackUnicodeStringNetworkId(Archive::ReadIterator & source)
+	{
+		std::pair<Unicode::String, NetworkId> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<Unicode::String, NetworkId> >(v);
+	}
+
+	void packStringNetworkIdInt(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringNetworkIdInt(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, std::pair<NetworkId, int> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, std::pair<NetworkId, int> > >(v);
+	}
+
+	void packStringStringNetworkId(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, std::pair<std::string, NetworkId> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::pair<std::string, NetworkId> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringStringNetworkId(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, std::pair<std::string, NetworkId> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, std::pair<std::string, NetworkId> > >(v);
+	}
+
+	void packStringNetworkIdArray(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, std::vector<NetworkId> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::vector<NetworkId> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringNetworkIdArray(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, std::vector<NetworkId> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, std::vector<NetworkId> > >(v);
+	}
+
+	void packStringStringId(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, StringId> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, StringId> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringStringId(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, StringId> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, StringId> >(v);
+	}
+
+	void packStringStringIdArray(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, std::vector<StringId> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::vector<StringId> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringStringIdArray(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, std::vector<StringId> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, std::vector<StringId> > >(v);
+	}
+
+	void packIntString(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		MessageQueueGenericValueType<std::pair<int, std::string> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::string> > const *>(data);
+		if (msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data *unpackIntString(Archive::ReadIterator &source)
+	{
+		std::pair<int, std::string> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, std::string> >(v);
+	}
+
+	void packStringString(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, std::string> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::string> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringString(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, std::string> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, std::string> >(v);
+	}
+
+	void packIntStringString(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<int, std::pair<std::string, std::string> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<int, std::pair<std::string, std::string> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackIntStringString(Archive::ReadIterator & source)
+	{
+		std::pair<int, std::pair<std::string, std::string> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, std::pair<std::string, std::string> > >(v);
+	}
+
+	void packStringUnicodeString(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, Unicode::String> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, Unicode::String> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringUnicodeString(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, Unicode::String> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, Unicode::String> >(v);
+	}
+
+	void packStringNetworkIdUnicodeStringString(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::pair<std::string, NetworkId>, std::pair<Unicode::String, std::string> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::pair<std::string, NetworkId>, std::pair<Unicode::String, std::string> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringNetworkIdUnicodeStringString(Archive::ReadIterator & source)
+	{
+		std::pair<std::pair<std::string, NetworkId>, std::pair<Unicode::String, std::string> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::pair<std::string, NetworkId>, std::pair<Unicode::String, std::string> > >(v);
+	}
+
+	void packStringUnicodeStringArray(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::string, std::vector<Unicode::String> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::string, std::vector<Unicode::String> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackStringUnicodeStringArray(Archive::ReadIterator & source)
+	{
+		std::pair<std::string, std::vector<Unicode::String> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::string, std::vector<Unicode::String> > >(v);
+	}
+
+	void packIntInt(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		MessageQueueGenericValueType<std::pair<int, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, int> > const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackIntInt(Archive::ReadIterator &source)
+	{
+		std::pair<int, int> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, int> >(v);
+	}
+
+	void packIntUint32Bool(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		MessageQueueGenericValueType<std::pair<int, std::pair<uint32, bool> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::pair<uint32, bool> > > const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackIntUint32Bool(Archive::ReadIterator &source)
+	{
+		std::pair<int, std::pair<uint32, bool> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, std::pair<uint32, bool> > >(v);
+	}
+
+	void packIntIntInt(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		MessageQueueGenericValueType<std::pair<std::pair<int, int>, int> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, int>, int> > const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackIntIntInt(Archive::ReadIterator &source)
+	{
+		std::pair<std::pair<int, int>, int> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::pair<int, int>, int> >(v);
+	}
+
+	void packIntIntIntInt(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		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);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackIntIntIntInt(Archive::ReadIterator &source)
+	{
+		std::pair<std::pair<int, int>, std::pair<int, int> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::pair<int, int>, std::pair<int, int> > >(v);
+	}
+
+	void packInt32Int32(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		MessageQueueGenericValueType<std::pair<int32, int32> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int32, int32> > const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackInt32Int32(Archive::ReadIterator &source)
+	{
+		std::pair<int32, int32> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int32, int32> >(v);
+	}
+
+	void packIntFloat(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		MessageQueueGenericValueType<std::pair<int, float> > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, float> > const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackIntFloat(Archive::ReadIterator &source)
+	{
+		std::pair<int, float> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, float> >(v);
+	}
+
+	void packIntFloatFloat(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		MessageQueueGenericValueType<std::pair<int, std::pair<float, float> > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::pair<float, float> > > const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackIntFloatFloat(Archive::ReadIterator &source)
+	{
+		std::pair<int, std::pair<float, float> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, std::pair<float, float> > >(v);
+	}
+
+	void packIntFloatFloatFloat(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		MessageQueueGenericValueType<std::pair<int, std::pair<float, std::pair<float, float> > > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::pair<float, std::pair<float, float> > > > const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackIntFloatFloatFloat(Archive::ReadIterator &source)
+	{
+		std::pair<int, std::pair<float, std::pair<float, float> > > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, std::pair<float, std::pair<float, float> > > >(v);
+	}
+
+	void packIntFloatFloatFloatNetworkId(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		MessageQueueGenericValueType<std::pair<int, std::pair<float, std::pair<float, std::pair< float, NetworkId > > > > > const *msg = safe_cast<MessageQueueGenericValueType<std::pair<int, std::pair<float, std::pair<float, std::pair< float, NetworkId > > > > > const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackIntFloatFloatFloatNetworkId(Archive::ReadIterator &source)
+	{
+		std::pair<int, std::pair<float, std::pair<float, std::pair< float, NetworkId > > > > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, std::pair<float, std::pair<float, std::pair< float, NetworkId > > > > >(v);
+	}
+
+	void packIntStringIntInt(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		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);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackIntStringIntInt(Archive::ReadIterator &source)
+	{
+		std::pair<int, std::pair<std::string, std::pair<int, int> > > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, std::pair<std::string, std::pair<int, int> > > >(v);
+	}
+
+	void packIntVectorIntBool(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		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);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackIntVectorIntBool(Archive::ReadIterator &source)
+	{
+		std::pair<int, std::pair<Vector, std::pair<int, bool> > > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, std::pair<Vector, std::pair<int, bool> > > >(v);
+	}
+
+	void packIntVectorVectorNetworkIdNetworkId(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		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);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackIntVectorVectorNetworkIdNetworkId(Archive::ReadIterator &source)
+	{
+		std::pair<int, std::pair<Vector, std::pair<Vector, std::pair<NetworkId, NetworkId> > > > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, std::pair<Vector, std::pair<Vector, std::pair<NetworkId, NetworkId> > > > >(v);
+	}
+
+	void packAttribMod(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		MessageQueueGenericValueType<AttribMod::AttribMod> const *msg = safe_cast<MessageQueueGenericValueType<AttribMod::AttribMod> const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackAttribMod(Archive::ReadIterator &source)
+	{
+		AttribMod::AttribMod v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<AttribMod::AttribMod>(v);
+	}
+
+	void packIntIntNetworkId(MessageQueue::Data const *data, Archive::ByteStream &target)
+	{
+		MessageQueueGenericValueType<std::pair<std::pair<int, int>, NetworkId> > const * msg = safe_cast<MessageQueueGenericValueType<std::pair<std::pair<int, int>, NetworkId> > const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data *unpackIntIntNetworkId(Archive::ReadIterator &source)
+	{
+		std::pair<std::pair<int, int>, NetworkId> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::pair<int, int>, NetworkId> >(v);
+	}
+
+	void packNetworkIdIntFloat(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<std::pair<NetworkId, std::pair<int, float> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, std::pair<int, float> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data * unpackNetworkIdIntFloat(Archive::ReadIterator & source)
+	{
+		std::pair<NetworkId, std::pair<int, float> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<NetworkId, std::pair<int, float> > >(v);
+	}
+
+	void packNetworkIdLfgCharacterData(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::pair<NetworkId, LfgCharacterData> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, LfgCharacterData> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackNetworkIdLfgCharacterData(Archive::ReadIterator &source)
+	{
+		std::pair<NetworkId, LfgCharacterData> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<NetworkId, LfgCharacterData> >(v);
+	}
+
+	void packNetworkIdBitArray(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::pair<NetworkId, BitArray> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<NetworkId, BitArray> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackNetworkIdBitArray(Archive::ReadIterator &source)
+	{
+		std::pair<NetworkId, BitArray> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<NetworkId, BitArray> >(v);
+	}
+
+	void packIntNetworkIdStringInt(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackIntNetworkIdStringInt(Archive::ReadIterator &source)
+	{
+		std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, int> > >(v);
+	}
+
+	void packIntNetworkIdStringStringInt(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<std::string, int> > > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<std::string, int> > > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackIntNetworkIdStringStringInt(Archive::ReadIterator &source)
+	{
+		std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<std::string, int> > > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<std::string, int> > > >(v);
+	}
+
+	void packIntNetworkIdNetworkId(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, NetworkId> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, NetworkId> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackIntNetworkIdNetworkId(Archive::ReadIterator &source)
+	{
+		std::pair<std::pair<int, NetworkId>, NetworkId> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, NetworkId> >(v);
+	}
+
+	void packIntNetworkIdIntNetworkId(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<int, NetworkId> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<int, NetworkId> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackIntNetworkIdIntNetworkId(Archive::ReadIterator &source)
+	{
+		std::pair<std::pair<int, NetworkId>, std::pair<int, NetworkId> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<int, NetworkId> > >(v);
+	}
+
+	void packMapStringInt64(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::map<std::string, int64> > * msg = safe_cast<const MessageQueueGenericValueType<std::map<std::string, int64> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackMapStringInt64(Archive::ReadIterator &source)
+	{
+		std::map<std::string, int64> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::map<std::string, int64> >(v);
+	}
+
+	void packIntCityInfo(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::pair<int, CityInfo> > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<int, CityInfo> > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackIntCityInfo(Archive::ReadIterator &source)
+	{
+		std::pair<int, CityInfo> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<int, CityInfo> >(v);
+	}
+
+	void packIntNetworkIdStringNetworkIdInt(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<NetworkId, int> > > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<NetworkId, int> > > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackIntNetworkIdStringNetworkIdInt(Archive::ReadIterator &source)
+	{
+		std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<NetworkId, int> > > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<std::string, std::pair<NetworkId, int> > > >(v);
+	}
+
+	void packIntNetworkIdIntBool(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<int, bool> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<int, bool> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackIntNetworkIdIntBool(Archive::ReadIterator &source)
+	{
+		std::pair<std::pair<int, NetworkId>, std::pair<int, bool> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::pair<int, NetworkId>, std::pair<int, bool> > >(v);
+	}
+
+	void packIntStringIntBool(const MessageQueue::Data *data, Archive::ByteStream &target)
+	{
+		const MessageQueueGenericValueType<std::pair<std::pair<int, std::string>, std::pair<int, bool> > > * msg = safe_cast<const MessageQueueGenericValueType<std::pair<std::pair<int, std::string>, std::pair<int, bool> > > *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+	MessageQueue::Data* unpackIntStringIntBool(Archive::ReadIterator &source)
+	{
+		std::pair<std::pair<int, std::string>, std::pair<int, bool> > v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<std::pair<int, std::string>, std::pair<int, bool> > >(v);
+	}
+}
+
+using namespace SetupServerNetworkMessagesNamespace;
+
+SetupServerNetworkMessages::SetupServerNetworkMessages ()
+{
+}
+
+SetupServerNetworkMessages::~SetupServerNetworkMessages ()
+{
+}
+
+void SetupServerNetworkMessages::install ()
+{
+	SetupServerNetworkMessages setup;
+	setup.internalInstall();
+
+	ExitChain::add (SetupServerNetworkMessages::remove, "SetupServerNetworkMessages");
+}
+
+// ======================================================================
+
+void SetupServerNetworkMessages::internalInstall ()
+{
+	DEBUG_FATAL(g_installed, ("SetupServerNetworkMessages::install - is already installed"));
+
+	AiMovementMessage::install();
+	AiCreatureStateMessage::install();
+	MessageQueueAlterAttribute::install();
+	MessageQueueCommandQueueEnqueueFwd::install();
+	MessageQueueCommandQueueForceExecuteCommandFwd::install();
+	MessageQueueGrantOfflineXp::install();
+	MessageQueuePvpCommand::install();
+	MessageQueueScriptTrigger::install();
+	MessageQueueSetState::install();
+	MessageQueueTeleportObject::install();
+	
+	ControllerMessageFactory::registerControllerMessageHandler(CM_groupSetName, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_groupAddMember, packGroupMemberParam, unpackGroupMemberParam);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_groupRemoveMember, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_groupDisband, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setGroupInviter, packStringNetworkIdNetworkId, unpackStringNetworkIdNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_groupMakeLeader, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setPerformanceType, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCacheVersion, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setPerformanceListenTarget, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setPerformanceWatchTarget, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setPerformanceStartTime, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addNpcConversationResponse, packStringIdProsePackage, unpackStringIdProsePackage);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setObjectNameStringId, packStringId, unpackStringId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeNpcConversationResponse, packStringIdProsePackage, unpackStringIdProsePackage);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_sendNpcConversationResponses, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_persistObject, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_playerResponseToNpcConversation, packStringNetworkIdStringIdProsePackage, unpackStringNetworkIdStringIdProsePackage);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_transferAuthority, packUint32Bool, unpackUint32Bool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setObjectName, packUnicodeString, unpackUnicodeString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_updatePositionOnPlanetServer, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setPlayerControlled, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_customize, packStringInt, unpackStringInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_permanentlyDestroy, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addLocationTarget, packLocationData, unpackLocationData);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeLocationTarget, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setInCombat, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addAim, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clearAims, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_alterHitPoints, packIntNetworkId, unpackIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addResource, packNetworkIdFloat, unpackNetworkIdFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCombatTarget, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeCombatTarget, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCraftedId, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_startCraftingSession, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_stopCraftingSession, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addIngredientToHopper, packNetworkIdNetworkId, unpackNetworkIdNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeIngredientFromHopper, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addObjectToOutputSlot, packNetworkIdNetworkId, unpackNetworkIdNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCraftingManufactureSchematic, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clearCraftingManufactureSchematic, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCraftingPrototype, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clearCraftingPrototype, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setVisibleComponents, packIntArray, unpackIntArray);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setIsShield, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setAmmo, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addAllowed, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeAllowed, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addBanned, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeBanned, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setDefaultWeapon, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setModValue, packStringInt, unpackStringInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_grantCommand, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_grantExperiencePoints, packStringInt, unpackStringInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_grantSkill, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_revokeCommand, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_revokeSkill, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addAttributeModifier, packAttribMod, unpackAttribMod);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeAttributeModifiers, packAttribute, unpackAttribute);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeAllAttributeModifiers, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCombatTargets, packNetworkIdArray, unpackNetworkIdArray);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCurrentWeapon, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setGroup, packBoolNetworkId, unpackBoolNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setMood, packUnsignedLong, unpackUnsignedLong);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setIncapacitated, packBoolNetworkId, unpackBoolNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setSayMode, packUnsignedLong, unpackUnsignedLong);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setAnimationMood, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setScaleFactor, packFloat, unpackFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setShockWounds, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setLookAtTarget, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setIntendedTarget, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setMovementStationary, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setMovementWalk, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setMovementRun, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setSlopeModAngle, packFloat, unpackFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setSlopeModPercent, packFloat, unpackFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setWaterModPercent, packFloat, unpackFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setMovementPercent, packFloat, unpackFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setTurnPercent, packFloat, unpackFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setAccelPercent, packFloat, unpackFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_factoryAddObject, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addSchematic, packNetworkIdNetworkId, unpackNetworkIdNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_manufactureInstallationCreateObject, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setBattlefieldParticipant, packNetworkIdUint32, unpackNetworkIdUint32);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clearBattlefieldParticipants, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setIntDynamicVariable, packStringInt, unpackStringInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setIntArrayDynamicVariable, packStringIntArray, unpackStringIntArray);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setFloatDynamicVariable, packStringFloat, unpackStringFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setFloatArrayDynamicVariable, packStringFloatArray, unpackStringFloatArray);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setStringDynamicVariable, packStringUnicodeString, unpackStringUnicodeString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setStringArrayDynamicVariable, packStringUnicodeStringArray, unpackStringUnicodeStringArray);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setObjIdDynamicVariable, packStringNetworkId, unpackStringNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setObjIdArrayDynamicVariable, packStringNetworkIdArray, unpackStringNetworkIdArray);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setLocationDynamicVariable, packDynamicVariableLocation, unpackDynamicVariableLocation);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setLocationArrayDynamicVariable, packDynamicVariableLocationArray, unpackDynamicVariableLocationArray);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setStringIdDynamicVariable, packStringStringId, unpackStringStringId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setStringIdArrayDynamicVariable, packStringStringIdArray, unpackStringStringIdArray);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_copyDynamicVariable, packStringNetworkId, unpackStringNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_copyDynamicVariableToSubList, packStringStringNetworkId, unpackStringStringNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addNestedObjVarList, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeObjVarItem, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_eraseObjVarListEntries, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setObjVarItemVar, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildCreate, packIntStringString, unpackIntStringString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildRemoveMember, packIntNetworkId, unpackIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildAddCreatorMember, packIntNetworkIdStringStringInt, unpackIntNetworkIdStringStringInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildAddSponsorMember, packIntNetworkIdStringStringInt, unpackIntNetworkIdStringStringInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetMemberPermission, packIntIntNetworkId, unpackIntIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetMemberTitle, packStringNetworkIdInt, unpackStringNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetMemberAllegiance, packIntNetworkIdNetworkId, unpackIntNetworkIdNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetMemberPermissionAndAllegiance, packIntNetworkIdIntNetworkId, unpackIntNetworkIdIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetMemberNameAndPermission, packIntNetworkIdStringInt, unpackIntNetworkIdStringInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetMemberProfessionInfo, packIntNetworkIdStringInt, unpackIntNetworkIdStringInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildAddMemberRank, packStringNetworkIdInt, unpackStringNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildRemoveMemberRank, packStringNetworkIdInt, unpackStringNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildRemoveEnemy, packIntInt, unpackIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetEnemy, packIntInt, unpackIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildDisband, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetLeader, packIntNetworkId, unpackIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetGuildElectionEndTime, packIntIntInt, unpackIntIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetGuildFaction, packIntInt, unpackIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetGuildGcwDefenderRegion, packIntString, unpackIntString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetName, packIntString, unpackIntString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildSetAbbrev, packIntString, unpackIntString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_initDecay, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setDecay, packFloat, unpackFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setVolume, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setMasterId, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_planetRemoveTravelPoint, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCreatorId, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCreatorName, packUnicodeString, unpackUnicodeString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCreatorXp, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCreatorXpType, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCraftedType, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setForcePower, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setMaxForcePower, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setWeather, packIntVector, unpackIntVector);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_teleportNextFrame, MessageQueueDataTransformWithParent::pack, MessageQueueDataTransformWithParent::unpack);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_serverAddPlanetMapLocation,    packMapLocationTypePair, unpackMapLocationTypePair);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_serverRemovePlanetMapLocation, packNetworkId,           unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCondition, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clearCondition, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setHouse, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setGroupMemberDifficulty, packNetworkIdInt, unpackNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setDifficulty, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setLevel, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_recalculateLevel, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_cityCreate, packIntCityInfo, unpackIntCityInfo);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetName, packIntString, unpackIntString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetCityHall, packIntNetworkId, unpackIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetLocation, packIntStringIntInt, unpackIntStringIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetRadius, packIntInt, unpackIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetFaction, packIntUint32Bool, unpackIntUint32Bool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetGcwDefenderRegion, packIntStringIntBool, unpackIntStringIntBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetCreationTime, packIntInt, unpackIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetLeader, packIntNetworkId, unpackIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetIncomeTax, packIntInt, unpackIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetPropertyTax, packIntInt, unpackIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetSalesTax, packIntInt, unpackIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetTravelInfo, packIntVectorIntBool, unpackIntVectorIntBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetCloneInfo, packIntVectorVectorNetworkIdNetworkId, unpackIntVectorVectorNetworkIdNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_cityRemove, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetCitizen, packIntNetworkIdStringNetworkIdInt, unpackIntNetworkIdStringNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetCitizenProfessionInfo, packIntNetworkIdStringInt, unpackIntNetworkIdStringInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetCitizenAddRank, packStringNetworkIdInt, unpackStringNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetCitizenRemoveRank, packStringNetworkIdInt, unpackStringNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetCitizenTitle, packStringNetworkIdInt, unpackStringNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_cityRemoveCitizen, packIntNetworkId, unpackIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_citySetStructure, packIntNetworkIdIntBool, unpackIntNetworkIdIntBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_cityRemoveStructure, packIntNetworkId, unpackIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_adjustPgcRating, packStringNetworkIdInt, unpackStringNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_adjustPgcRatingData, packIntNetworkIdStringInt, unpackIntNetworkIdStringInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setPgcRatingData, packIntNetworkIdStringInt, unpackIntNetworkIdStringInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_fixPgcChroniclerName, packStringNetworkId, unpackStringNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setBuildingIsPublic, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setBuildingCityId, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_creatureSetBaseWalkSpeed, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_creatureSetBaseRunSpeed, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setDecayTime, packFloat, unpackFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clearDecayTime, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_aiSetMovementRun, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_aiSetMovementWalk, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_applyWound, packIntIntNetworkId, unpackIntIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setWound, packIntInt, unpackIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_makeDead, packNetworkIdNetworkId, unpackNetworkIdNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setGroupShipForMember, packNetworkIdNetworkId, unpackNetworkIdNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setGroupShipFormationSlotForMember, packNetworkIdInt, unpackNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addGroupPOBShipAndOwner, packNetworkIdNetworkId, unpackNetworkIdNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeGroupPOBShip, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setBioLink, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addHate, packNetworkIdFloat, unpackNetworkIdFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setHate, packNetworkIdFloat, unpackNetworkIdFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeHateTarget, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clearHateList, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_groupMakeLootMaster, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_groupSetLootRule, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_aiSetCreatureName, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_aiSetHomeLocation, packLocation, unpackLocation);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_aiSetFrozen, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_aiSetRetreating, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_aiSetLogging, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_aiEquipPrimaryWeapon, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_aiEquipSecondaryWeapon, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_aiUnEquipWeapons, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_aiMarkCombatStartLocation, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_resetHateTimer, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setRegenRate, packIntFloat, unpackIntFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_updateObserversCount, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setVisible, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_hideFromClient, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setHibernationDelay, packFloat, unpackFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setAttackableOverride, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_modifyCurrentGcwPoints, packIntInt, unpackIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_modifyCurrentGcwRating, packIntInt, unpackIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_modifyCurrentPvpKills, packIntInt, unpackIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_modifyLifetimeGcwPoints, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_modifyMaxGcwImperialRating, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_modifyMaxGcwRebelRating, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_modifyLifetimePvpKills, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_modifyNextGcwRatingCalcTime, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_cancelMessageTo, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clearSessionActivity, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addSessionActivity, packUnsignedLong, unpackUnsignedLong);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_incrementKillMeter, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addPassiveReveal, packIntIntNetworkId, unpackIntIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removePassiveReveal, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeAllPassiveReveal, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_modifyHologramType, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_modifyVisibleOnMapAndRadar, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCoverVisibility, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_modifyCollectionSlotValue, packStringInt64, unpackStringInt64);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_adjustLotCount, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_squelch, packStringNetworkIdInt, unpackStringNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_unsquelch, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setPriviledgedTitle, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_collectionRequestServerFirst, packStringNetworkIdUnicodeStringString, unpackStringNetworkIdUnicodeStringString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_collectionRevokeServerFirst, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addHateOverTime, packNetworkIdIntFloat, unpackNetworkIdIntFloat);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeAllAttributeAndSkillmodModifiers, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addBuff, packIntFloatFloatFloatNetworkId, unpackIntFloatFloatFloatNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeBuff, packInt, unpackInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setConnectedCharacterLfgData, packNetworkIdLfgCharacterData, unpackNetworkIdLfgCharacterData);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeConnectedCharacterData, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setConnectedCharacterGroupData, packNetworkIdNetworkId, unpackNetworkIdNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setConnectedCharacterPlanetData, packStringNetworkId, unpackStringNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setConnectedCharacterRegionData, packStringNetworkId, unpackStringNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setConnectedCharacterPlayerCityData, packStringNetworkId, unpackStringNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setConnectedCharacterBiographyData, packUnicodeStringNetworkId, unpackUnicodeStringNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeConnectedCharacterBiographyData, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setGroupMemberProfession, packNetworkIdUint32, unpackNetworkIdUint32);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setConnectedCharacterLevelData, packNetworkIdInt, unpackNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setConnectedCharacterProfessionData, packNetworkIdInt, unpackNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setConnectedCharacterSearchableByCtsSourceGalaxyData, packNetworkIdInt, unpackNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setConnectedCharacterDisplayLocationInSearchResultsData, packNetworkIdInt, unpackNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setConnectedCharacterAnonymousData, packNetworkIdInt, unpackNetworkIdInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setConnectedCharacterInterestsData, packNetworkIdBitArray, unpackNetworkIdBitArray);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setGroupPickupTimer, packInt32Int32, unpackInt32Int32);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setGroupPickupLocation, packStringVector, unpackStringVector);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addUniverseEvent, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeUniverseEvent, packString, unpackString);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_forceHateTarget, packNetworkId, unpackNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_addUserToAccessList, packIntNetworkId, unpackIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeUserFromAccessList, packIntNetworkId, unpackIntNetworkId);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clearUserAccessList, packBool, unpackBool);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_guildUpdateGuildWarKillTrackingData, packIntIntIntInt, unpackIntIntIntInt);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_adjustGcwImperialScore, packMapStringInt64, unpackMapStringInt64);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_adjustGcwRebelScore, packMapStringInt64, unpackMapStringInt64);
+
+	g_installed = true;
+}
+
+// ----------------------------------------------------------------------
+
+void SetupServerNetworkMessages::remove ( void )
+{
+	DEBUG_FATAL(!g_installed, ("SetupServerNetworkMessages::remove - not already installed"));
+
+	SetupServerNetworkMessages setup;
+	setup.internalRemove();
+}
+
+void SetupServerNetworkMessages::internalRemove ( void )
+{
+	g_installed = false;
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/core/SetupServerNetworkMessages.h b/engine/server/library/serverNetworkMessages/src/shared/core/SetupServerNetworkMessages.h
new file mode 100644
index 00000000..0850173e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/core/SetupServerNetworkMessages.h
@@ -0,0 +1,38 @@
+// ======================================================================
+//
+// SetupServerNetworkMessages.h
+// copyright 2001 Sony Online Entertainment
+// 
+// ======================================================================
+
+#ifndef INCLUDED_SetupServerNetworkMessages_H
+#define INCLUDED_SetupServerNetworkMessages_H
+
+#include "serverNetworkMessages/SetupServerNetworkMessages.h"
+
+
+// ======================================================================
+
+class SetupServerNetworkMessages
+{
+public:
+
+	static void install ( void );
+	static void remove();
+
+protected:
+	         SetupServerNetworkMessages();
+	virtual ~SetupServerNetworkMessages();
+
+	virtual void internalInstall();
+	virtual void internalRemove();
+
+private:
+
+	SetupServerNetworkMessages(const SetupServerNetworkMessages&);
+	SetupServerNetworkMessages& operator= (const SetupServerNetworkMessages&);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/core/TaskConsoleCommand.cpp b/engine/server/library/serverNetworkMessages/src/shared/core/TaskConsoleCommand.cpp
new file mode 100644
index 00000000..4884e110
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/core/TaskConsoleCommand.cpp
@@ -0,0 +1,43 @@
+// TaskConsoleCommand.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "TaskConsoleCommand.h"
+
+//-----------------------------------------------------------------------
+
+TaskConsoleCommand::TaskConsoleCommand(const std::string & consoleCommand) :
+GameNetworkMessage("TaskConsoleCommand"),
+m_command(consoleCommand)
+{
+	addVariable(m_command);
+}
+
+//-----------------------------------------------------------------------
+
+TaskConsoleCommand::TaskConsoleCommand(Archive::ReadIterator & source) :
+GameNetworkMessage("TaskConsoleCommand"),
+m_command()
+{
+	addVariable(m_command);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TaskConsoleCommand::~TaskConsoleCommand()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TaskConsoleCommand::getCommand() const
+{
+	return m_command.get();
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/core/TaskConsoleCommand.h b/engine/server/library/serverNetworkMessages/src/shared/core/TaskConsoleCommand.h
new file mode 100644
index 00000000..87beb29f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/core/TaskConsoleCommand.h
@@ -0,0 +1,34 @@
+// TaskConsoleCommand.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_TaskConsoleCommand_H
+#define	_INCLUDED_TaskConsoleCommand_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class TaskConsoleCommand : public GameNetworkMessage
+{
+public:
+	explicit TaskConsoleCommand(const std::string & command);
+	explicit TaskConsoleCommand(Archive::ReadIterator & source);
+	~TaskConsoleCommand();
+
+	const std::string & getCommand() const;
+
+private:
+	TaskConsoleCommand & operator = (const TaskConsoleCommand & rhs);
+	TaskConsoleCommand(const TaskConsoleCommand & source);
+
+	Archive::AutoVariable<std::string>  m_command;
+
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_TaskConsoleCommand_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AcceptHighBidMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AcceptHighBidMessage.cpp
new file mode 100644
index 00000000..afa65919
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AcceptHighBidMessage.cpp
@@ -0,0 +1,41 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "AcceptHighBidMessage.h"
+
+AcceptHighBidMessage::AcceptHighBidMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("AcceptHighBidMessage"),
+m_responseId(),
+m_trackId(),
+m_auctionId(),
+m_playerId()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_auctionId);
+	AutoByteStream::addVariable(m_playerId);
+	unpack(source);
+
+}
+
+AcceptHighBidMessage::AcceptHighBidMessage(
+		int requestId,
+		const NetworkId & auctionId,
+		const NetworkId & playerId
+) :
+GameNetworkMessage("AcceptHighBidMessage"),
+m_responseId(requestId),
+m_trackId(0),
+m_auctionId(auctionId),
+m_playerId(playerId)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_auctionId);
+	AutoByteStream::addVariable(m_playerId);
+
+}
+
+AcceptHighBidMessage::~AcceptHighBidMessage()
+{
+}
+
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AcceptHighBidMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AcceptHighBidMessage.h
new file mode 100644
index 00000000..1d0057c5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AcceptHighBidMessage.h
@@ -0,0 +1,32 @@
+#ifndef AcceptHighBidMessage_h
+#define AcceptHighBidMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class AcceptHighBidMessage : public GameNetworkMessage
+{
+
+public:
+	AcceptHighBidMessage( int requestId, const NetworkId & auctionId, const NetworkId & playerId );
+	explicit AcceptHighBidMessage(Archive::ReadIterator & source);
+	~AcceptHighBidMessage();
+
+	const NetworkId &      GetAuctionId() const {return m_auctionId.get();}
+	const NetworkId &      GetPlayerId() const {return m_playerId.get();}
+	int                    GetResponseId () const {return m_responseId.get();}
+	int                    GetTrackId    () const {return m_trackId.get();}
+	void                   SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>       m_responseId;
+	Archive::AutoVariable<int>       m_trackId;
+	Archive::AutoVariable<NetworkId> m_auctionId;
+	Archive::AutoVariable<NetworkId> m_playerId;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddAuctionMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddAuctionMessage.cpp
new file mode 100644
index 00000000..04081d6a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddAuctionMessage.cpp
@@ -0,0 +1,123 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "AddAuctionMessage.h"
+
+AddAuctionMessage::AddAuctionMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("AddAuctionMessage"),
+m_responseId(),
+m_trackId(),
+m_ownerId(),
+m_ownerName(),
+m_minimumBid(),
+m_auctionTimer(),
+m_itemId(),
+m_itemNameLength(),
+m_itemName(),
+m_itemType(),
+m_itemTemplateId(),
+m_expireTimer(),
+m_locationId(),
+m_location(),
+m_flags(),
+m_userDescriptionLength(),
+m_userDescription(),
+m_itemSize(),
+m_vendorLimit(),
+m_vendorItemLimit()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_ownerName);
+	AutoByteStream::addVariable(m_minimumBid);
+	AutoByteStream::addVariable(m_auctionTimer);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_itemType);
+	AutoByteStream::addVariable(m_itemTemplateId);
+	AutoByteStream::addVariable(m_expireTimer);
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_flags);
+	AutoByteStream::addVariable(m_userDescriptionLength);
+	AutoByteStream::addVariable(m_userDescription);
+	AutoByteStream::addVariable(m_attributes);
+	AutoByteStream::addVariable(m_itemSize);
+	AutoByteStream::addVariable(m_vendorLimit);
+	AutoByteStream::addVariable(m_vendorItemLimit);
+	unpack(source);
+}
+
+AddAuctionMessage::AddAuctionMessage(
+		int responseId,
+		const NetworkId & ownerId,
+		const std::string & ownerName,
+		int minimumBid,
+		int auctionTimer,
+		const NetworkId & itemId,
+		int itemNameLength,
+		const Unicode::String & itemName,
+		int itemType,
+		int itemTemplateId,
+		int expireTimer,
+		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) :
+GameNetworkMessage("AddAuctionMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_ownerId(ownerId),
+m_ownerName(ownerName),
+m_minimumBid(minimumBid),
+m_auctionTimer(auctionTimer),
+m_itemId(itemId),
+m_itemNameLength(itemNameLength),
+m_itemName(itemName),
+m_itemType(itemType),
+m_itemTemplateId(itemTemplateId),
+m_expireTimer(expireTimer),
+m_locationId(locationId),
+m_location(location),
+m_flags(flags),
+m_userDescriptionLength(userDescriptionLength),
+m_userDescription(userDescription),
+m_attributes(),
+m_itemSize(itemSize),
+m_vendorLimit(vendorLimit),
+m_vendorItemLimit(vendorItemLimit)
+{
+	m_attributes.set(attributes);
+	
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_ownerName);
+	AutoByteStream::addVariable(m_minimumBid);
+	AutoByteStream::addVariable(m_auctionTimer);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_itemType);
+	AutoByteStream::addVariable(m_itemTemplateId);
+	AutoByteStream::addVariable(m_expireTimer);
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_flags);
+	AutoByteStream::addVariable(m_userDescriptionLength);
+	AutoByteStream::addVariable(m_userDescription);
+	AutoByteStream::addVariable(m_attributes);
+	AutoByteStream::addVariable(m_itemSize);
+	AutoByteStream::addVariable(m_vendorLimit);
+	AutoByteStream::addVariable(m_vendorItemLimit);
+}
+
+AddAuctionMessage::~AddAuctionMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddAuctionMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddAuctionMessage.h
new file mode 100644
index 00000000..747a185c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddAuctionMessage.h
@@ -0,0 +1,91 @@
+#ifndef ADDAUCTIONMESSAGE_H
+#define ADDAUCTIONMESSAGE_H
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class AddAuctionMessage : public GameNetworkMessage
+{
+
+public:
+
+	explicit AddAuctionMessage(
+		int responseId,
+		const NetworkId & ownerId,
+		const std::string & ownerName,
+		int minimumBid,
+		int auctionTimer,
+		const NetworkId & itemId,
+		int itemNameLength,
+		const Unicode::String & itemName,
+		int itemType,
+		int itemTemplateId,
+		int expireTimer,
+		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);
+
+	AddAuctionMessage(Archive::ReadIterator & source);
+	~AddAuctionMessage();
+
+	const NetworkId &          GetOwnerId() const {return m_ownerId.get();}
+	const std::string &        GetOwnerName() const {return m_ownerName.get();}
+	int                        GetMinimumBid() const {return m_minimumBid.get();}
+	int                        GetAuctionTimer() const {return m_auctionTimer.get();}
+	const NetworkId &          GetItemId() const {return m_itemId.get();}
+	int                        GetItemNameLength() const {return m_itemNameLength.get();}
+	const Unicode::String &    GetItemName() const {return m_itemName.get();}
+	int                        GetItemType() const {return m_itemType.get();}
+	int                        GetItemTemplateId() const {return m_itemTemplateId.get();}
+	int                        GetExpireTimer() const {return m_expireTimer.get();}
+	const NetworkId &          GetLocationId() const {return m_locationId.get();}
+	const std::string &        GetLocation() const {return m_location.get();}
+	int                        GetFlags() const {return m_flags.get();}
+	int                        GetUserDescriptionLength() const {return m_userDescriptionLength.get();}
+	const Unicode::String &    GetUserDescription() const {return m_userDescription.get();}
+//	int                        GetOobLength() const {return m_oobLength.get();}
+//	const Unicode::String &    GetOobData() const {return m_oobData.get();}
+	std::vector<std::pair<std::string, Unicode::String> > const & GetAttributes() const {return m_attributes.get();}
+	int                        GetItemSize() const {return m_itemSize.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+	int                        GetVendorLimit() const {return m_vendorLimit.get();}
+	int                        GetVendorItemLimit() const {return m_vendorItemLimit.get();}
+
+protected:
+
+private:
+
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_ownerId;
+	Archive::AutoVariable<std::string>      m_ownerName;
+	Archive::AutoVariable<int>              m_minimumBid;
+	Archive::AutoVariable<int>              m_auctionTimer;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<int>              m_itemNameLength;
+	Archive::AutoVariable<Unicode::String>  m_itemName;
+	Archive::AutoVariable<int>              m_itemType;
+	Archive::AutoVariable<int>              m_itemTemplateId;
+	Archive::AutoVariable<int>              m_expireTimer;
+	Archive::AutoVariable<NetworkId>        m_locationId;
+	Archive::AutoVariable<std::string>      m_location;
+	Archive::AutoVariable<int>              m_flags;
+	Archive::AutoVariable<int>              m_userDescriptionLength;
+	Archive::AutoVariable<Unicode::String>  m_userDescription;
+	Archive::AutoArray<std::pair<std::string, Unicode::String> > m_attributes;
+	Archive::AutoVariable<int>              m_itemSize;
+	Archive::AutoVariable<int>              m_vendorLimit;
+	Archive::AutoVariable<int>              m_vendorItemLimit;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddBidMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddBidMessage.cpp
new file mode 100644
index 00000000..9e3ef67c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddBidMessage.cpp
@@ -0,0 +1,53 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "AddBidMessage.h"
+
+AddBidMessage::AddBidMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("AddBidMessage"),
+m_responseId(),
+m_trackId(),
+m_auctionId(),
+m_playerId(),
+m_bid(),
+m_maxProxyBid(),
+m_playerName()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+  AutoByteStream::addVariable(m_auctionId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_bid);
+	AutoByteStream::addVariable(m_maxProxyBid);
+	AutoByteStream::addVariable(m_playerName);
+	unpack(source);
+}
+
+AddBidMessage::AddBidMessage(
+		int requestId,
+		const NetworkId & auctionId,
+		const NetworkId & playerId,
+		int bid,
+		int maxProxyBid,
+		const std::string & playerName
+) :
+GameNetworkMessage("AddBidMessage"),
+m_responseId(requestId),
+m_trackId(0),
+m_auctionId(auctionId),
+m_playerId(playerId),
+m_bid(bid),
+m_maxProxyBid(maxProxyBid),
+m_playerName(playerName)
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+  AutoByteStream::addVariable(m_auctionId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_bid);
+	AutoByteStream::addVariable(m_maxProxyBid);
+	AutoByteStream::addVariable(m_playerName);
+}
+
+AddBidMessage::~AddBidMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddBidMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddBidMessage.h
new file mode 100644
index 00000000..6d426ad3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddBidMessage.h
@@ -0,0 +1,45 @@
+#ifndef AddBidMessage_h
+#define AddBidMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class AddBidMessage : public GameNetworkMessage
+{
+
+public:
+	AddBidMessage(
+		int requestId,
+		const NetworkId & auctionId,
+		const NetworkId & playerId,
+		int bid,
+		int maxProxyBid,
+		const std::string & playerName
+	);
+	AddBidMessage(Archive::ReadIterator & source);
+	~AddBidMessage();
+
+	const NetworkId &          GetAuctionId() const {return m_auctionId.get();}
+	const NetworkId &          GetPlayerId() const {return m_playerId.get();}
+	int                        GetBid() const {return m_bid.get();}
+	int                        GetMaxProxyBid() const {return m_maxProxyBid.get();}
+	const std::string &        GetPlayerName() const {return m_playerName.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_auctionId;
+	Archive::AutoVariable<NetworkId>        m_playerId;
+	Archive::AutoVariable<int>              m_bid;
+	Archive::AutoVariable<int>              m_maxProxyBid;
+	Archive::AutoVariable<std::string>      m_playerName;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddImmediateAuctionMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddImmediateAuctionMessage.cpp
new file mode 100644
index 00000000..facb8276
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddImmediateAuctionMessage.cpp
@@ -0,0 +1,124 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "AddImmediateAuctionMessage.h"
+
+AddImmediateAuctionMessage::AddImmediateAuctionMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("AddImmediateAuctionMessage"),
+m_responseId(),
+m_trackId(),
+m_ownerId(),
+m_ownerName(),
+m_price(),
+m_auctionTimer(),
+m_itemId(),
+m_itemNameLength(),
+m_itemName(),
+m_itemType(),
+m_itemTemplateId(),
+m_expireTimer(),
+m_locationId(),
+m_location(),
+m_flags(),
+m_userDescriptionLength(),
+m_userDescription(),
+m_attributes(),
+m_itemSize(),
+m_vendorLimit(),
+m_vendorItemLimit()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_ownerName);
+	AutoByteStream::addVariable(m_price);
+	AutoByteStream::addVariable(m_auctionTimer);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_itemType);
+	AutoByteStream::addVariable(m_itemTemplateId);
+	AutoByteStream::addVariable(m_expireTimer);
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_flags);
+	AutoByteStream::addVariable(m_userDescriptionLength);
+	AutoByteStream::addVariable(m_userDescription);
+	AutoByteStream::addVariable(m_attributes);
+	AutoByteStream::addVariable(m_itemSize);
+	AutoByteStream::addVariable(m_vendorLimit);
+	AutoByteStream::addVariable(m_vendorItemLimit);
+	unpack(source);
+}
+
+AddImmediateAuctionMessage::AddImmediateAuctionMessage(
+		int responseId,
+		const NetworkId & ownerId,
+		const std::string & ownerName,
+		int price,
+		int auctionTimer,
+		const NetworkId & itemId,
+		int itemNameLength,
+		const Unicode::String & itemName,
+		int itemType,
+		int itemTemplateId,
+		int expireTimer,
+		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) :
+GameNetworkMessage("AddImmediateAuctionMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_ownerId(ownerId),
+m_ownerName(ownerName),
+m_price(price),
+m_auctionTimer(auctionTimer),
+m_itemId(itemId),
+m_itemNameLength(itemNameLength),
+m_itemName(itemName),
+m_itemType(itemType),
+m_itemTemplateId(itemTemplateId),
+m_expireTimer(expireTimer),
+m_locationId(locationId),
+m_location(location),
+m_flags(flags),
+m_userDescriptionLength(userDescriptionLength),
+m_userDescription(userDescription),
+m_attributes(),
+m_itemSize(itemSize),
+m_vendorLimit(vendorLimit),
+m_vendorItemLimit(vendorItemLimit)
+{
+	m_attributes.set(attributes);
+	
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_ownerName);
+	AutoByteStream::addVariable(m_price);
+	AutoByteStream::addVariable(m_auctionTimer);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_itemType);
+	AutoByteStream::addVariable(m_itemTemplateId);
+	AutoByteStream::addVariable(m_expireTimer);
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_flags);
+	AutoByteStream::addVariable(m_userDescriptionLength);
+	AutoByteStream::addVariable(m_userDescription);
+	AutoByteStream::addVariable(m_attributes);
+	AutoByteStream::addVariable(m_itemSize);
+	AutoByteStream::addVariable(m_vendorLimit);
+	AutoByteStream::addVariable(m_vendorItemLimit);
+}
+
+AddImmediateAuctionMessage::~AddImmediateAuctionMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddImmediateAuctionMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddImmediateAuctionMessage.h
new file mode 100644
index 00000000..5f5ad2b8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AddImmediateAuctionMessage.h
@@ -0,0 +1,87 @@
+#ifndef AddImmediateAuction_h
+#define AddImmediateAuction_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class AddImmediateAuctionMessage : public GameNetworkMessage
+{
+
+public:
+	AddImmediateAuctionMessage(
+		int responseId,
+		const NetworkId & ownerId,
+		const std::string & ownerName,
+		int price,
+		int auctionTimer,
+		const NetworkId & itemId,
+		int itemNameLength,
+		const Unicode::String & itemName,
+		int itemType,
+		int itemTemplateId,
+		int expireTimer,
+		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);
+	AddImmediateAuctionMessage(Archive::ReadIterator & source);
+	~AddImmediateAuctionMessage();
+
+	const NetworkId &          GetOwnerId() const {return m_ownerId.get();}
+	const std::string &        GetOwnerName() const {return m_ownerName.get();}
+	int                        GetPrice() const {return m_price.get();}
+	int                        GetAuctionTimer() const {return m_auctionTimer.get();}
+	const NetworkId &          GetItemId() const {return m_itemId.get();}
+	int                        GetItemNameLength() const {return m_itemNameLength.get();}
+	const Unicode::String &    GetItemName() const {return m_itemName.get();}
+	int                        GetItemType() const {return m_itemType.get();}
+	int                        GetItemTemplateId() const {return m_itemTemplateId.get();}
+	int                        GetExpireTimer() const {return m_expireTimer.get();}
+	const std::string &        GetLocation() const {return m_location.get();}
+	const NetworkId &          GetLocationId() const {return m_locationId.get();}
+	int                        GetFlags() const {return m_flags.get();}
+	int                        GetUserDescriptionLength() const {return m_userDescriptionLength.get();}
+	const Unicode::String &    GetUserDescription() const {return m_userDescription.get();}
+	std::vector<std::pair<std::string, Unicode::String> > const & GetAttributes() const {return m_attributes.get();}
+	int                        GetItemSize() const {return m_itemSize.get();}
+	int                        GetVendorLimit() const {return m_vendorLimit.get();}
+	int                        GetVendorItemLimit() const {return m_vendorItemLimit.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_ownerId;
+	Archive::AutoVariable<std::string>      m_ownerName;
+	Archive::AutoVariable<int>              m_price;
+	Archive::AutoVariable<int>              m_auctionTimer;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<int>              m_itemNameLength;
+	Archive::AutoVariable<Unicode::String>  m_itemName;
+	Archive::AutoVariable<int>              m_itemType;
+	Archive::AutoVariable<int>              m_itemTemplateId;
+	Archive::AutoVariable<int>              m_expireTimer;
+	Archive::AutoVariable<NetworkId>        m_locationId;
+	Archive::AutoVariable<std::string>      m_location;
+	Archive::AutoVariable<int>              m_flags;
+	Archive::AutoVariable<int>              m_userDescriptionLength;
+	Archive::AutoVariable<Unicode::String>  m_userDescription;
+	Archive::AutoArray<std::pair<std::string, Unicode::String> > m_attributes;
+	Archive::AutoVariable<int>              m_itemSize;
+	Archive::AutoVariable<int>              m_vendorLimit;
+	Archive::AutoVariable<int>              m_vendorItemLimit;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionBase.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionBase.h
new file mode 100644
index 00000000..22bf6cc0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionBase.h
@@ -0,0 +1,76 @@
+#ifndef AUCTIONBASE_H
+#define AUCTIONBASE_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+
+// These ***MUST*** be kept in sync in src/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionData.h and src/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionBase.h
+#define AUCTION_ALWAYS_PRESENT    (1 << 5)
+#define AUCTION_PREMIUM_AUCTION   (1 << 10)
+#define AUCTION_ACTIVE            (1 << 11)
+#define AUCTION_VENDOR_TRANSFER   (1 << 12)
+#define AUCTION_OFFERED_ITEM      (1 << 14)
+
+#define MAX_AUCTIONS_PER_PLAYER   25
+
+#include "AuctionData.h"
+
+#ifndef max
+	#define max(a, b) ((a > b) ? a : b)
+#endif
+
+#ifndef min
+	#define min(a, b) ((a < b) ? a : b)
+#endif
+
+enum AuctionSearchType
+{
+	AST_ByCategory,
+	AST_ByLocation,
+	AST_ByAll,
+	AST_ByPlayerSales,
+	AST_ByPlayerBids,
+	AST_ByPlayerStockroom,
+	AST_ByVendorOffers,
+	AST_ByVendorSelling,
+	AST_ByVendorStockroom,
+	AST_ByPlayerOffersToVendor
+};
+
+// DANGER!!!!
+// If adding any values to this enumeration, add the values to the
+// end of the list.  There are hard-coded values in script that
+// rely upon these values not to change.
+enum AuctionResultCode
+{
+	ARC_Success = 0,
+	ARC_AuctionAlreadyExists,
+	ARC_AuctionExpired,
+	ARC_OwnerBidOnOwnItem,
+	ARC_BidTooLow,
+	ARC_AuctionDoesNotExist,
+	ARC_NotItemOwner,
+	ARC_NoBids,
+	ARC_LocationAlreadyExists,
+	ARC_AuctionAtVendorMarket,
+	ARC_NotVendorOwner,
+	ARC_SuccessPermanentAuction,
+	ARC_TooManyAuctions,
+	ARC_AuctionAlreadyCompleted,
+	ARC_VendorOwnerCanceledCompletedAuction,
+	ARC_BidTooHigh,
+	ARC_BidOutbid,
+	ARC_LocationVendorLimitExceeded,
+	ARC_AuctionVendorLimitExceeded,
+	ARC_AuctionVendorItemLimitExceeded,
+	ARC_VendorStatusEmpty,    // vendor status must be consecutive and appear between ARC_VendorStatusEmpty and ARC_VendorRemoved
+	ARC_VendorStatusNotEmpty,
+	ARC_VendorUnaccessed,
+	ARC_VendorEndangered,
+	ARC_VendorRemoved,
+	ARC_InvalidBid
+};
+
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionData.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionData.cpp
new file mode 100644
index 00000000..bae4e01e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionData.cpp
@@ -0,0 +1,54 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include <string.h>
+#include "AuctionData.h"
+
+AuctionDataHeader::AuctionDataHeader() :
+type(0),
+auctionId(),
+itemId(),
+itemNameLength(0),
+itemName(),
+minBid(0),
+highBid(0),
+timer(0),
+buyNowPrice(0),
+location(),
+ownerId(),
+highBidderId(),
+maxProxyBid(0),
+myBid(0),
+itemType(0),
+resourceContainerClassCrc(0),
+flags(0),
+entranceCharge(0)
+{
+
+}
+
+AuctionDataHeader::AuctionDataHeader(const AuctionDataHeader & original) :
+type(original.type),
+auctionId(original.auctionId),
+itemId(original.itemId),
+itemNameLength(original.itemNameLength),
+itemName(original.itemName),
+minBid(original.minBid),
+highBid(original.highBid),
+timer(original.timer),
+buyNowPrice(original.buyNowPrice),
+location(original.location),
+ownerId(original.ownerId),
+highBidderId(original.highBidderId),
+maxProxyBid(original.maxProxyBid),
+myBid(original.myBid),
+itemType(original.itemType),
+resourceContainerClassCrc(original.resourceContainerClassCrc),
+flags(original.flags),
+entranceCharge(original.entranceCharge)
+{
+
+}
+
+AuctionDataHeader::~AuctionDataHeader()
+{
+
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionData.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionData.h
new file mode 100644
index 00000000..e6987301
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/AuctionData.h
@@ -0,0 +1,45 @@
+// AuctionData.h
+#ifndef AUCTION_DATA_H
+#define AUCTION_DATA_H
+
+#include "sharedFoundation/FirstSharedFoundation.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+/// length of static memory used for storing location data
+const int LOCATION_LENGTH  = 256;
+const int NAME_LENGTH  = 64;
+const int DESCRIPTION_LENGTH = 512;
+
+// ----------------------------------------------------------------------
+
+struct AuctionDataHeader {
+    AuctionDataHeader();
+
+    /// copy constructor
+    AuctionDataHeader(const AuctionDataHeader & original);
+	virtual ~AuctionDataHeader();
+
+	int             type;                      /// was char
+	NetworkId       auctionId;                 ///< identifies the auction in both client and server
+	NetworkId       itemId;                    ///< identifies the item for sale
+	int             itemNameLength;
+	Unicode::String itemName;
+	int             minBid;                    ///< the minimum bid allowed for this auction
+	int             highBid;                   ///< if non-zero, the highest current valid bid
+	int             timer;                     ///< timeout for auction expiration
+	int             buyNowPrice;
+	std::string     location;                  ///< which auction house/spaceport is this item stored
+	NetworkId       ownerId;                   ///< the identifier for the player that created this auction
+	NetworkId       highBidderId;              ///< identifies the player with the current high bid
+	int             maxProxyBid;               ///< if non-zero, the highest bid the current bidder will place
+	int             myBid;
+	int             itemType;
+	int             resourceContainerClassCrc;
+	int             flags;
+	int             entranceCharge;
+};
+
+// ----------------------------------------------------------------------
+
+#endif //AUCTION_DATA_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CancelAuctionMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CancelAuctionMessage.cpp
new file mode 100644
index 00000000..8433420c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CancelAuctionMessage.cpp
@@ -0,0 +1,45 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "CancelAuctionMessage.h"
+
+// namespace CommoditiesNamespace {
+
+CancelAuctionMessage::CancelAuctionMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("CancelAuctionMessage"),
+m_responseId(),
+m_trackId(),
+m_auctionId(),
+m_playerId()
+{
+
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_auctionId);
+	AutoByteStream::addVariable(m_playerId);
+	unpack(source);
+
+}
+
+CancelAuctionMessage::CancelAuctionMessage(
+		int requestId,
+		const NetworkId & auctionId,
+		const NetworkId & playerId
+) :
+GameNetworkMessage("CancelAuctionMessage"),
+m_responseId(requestId),
+m_trackId(0),
+m_auctionId(auctionId),
+m_playerId(playerId)
+{
+
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_auctionId);
+	AutoByteStream::addVariable(m_playerId);
+
+}
+
+CancelAuctionMessage::~CancelAuctionMessage()
+{
+}
+
+// }
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CancelAuctionMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CancelAuctionMessage.h
new file mode 100644
index 00000000..7127c113
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CancelAuctionMessage.h
@@ -0,0 +1,32 @@
+#ifndef CancelAuctionMessage_h
+#define CancelAuctionMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class CancelAuctionMessage : public GameNetworkMessage
+{
+public:
+
+	explicit CancelAuctionMessage( int requestId, const NetworkId & auctionId, const NetworkId & playerId );
+	CancelAuctionMessage(Archive::ReadIterator & source);
+	~CancelAuctionMessage();
+
+	const NetworkId &      GetAuctionId() const {return m_auctionId.get();}
+	const NetworkId &      GetPlayerId() const {return m_playerId.get();}
+	int                    GetResponseId () const {return m_responseId.get();}
+	int                    GetTrackId    () const {return m_trackId.get();}
+	void                   SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>       m_responseId;
+	Archive::AutoVariable<int>       m_trackId;
+	Archive::AutoVariable<NetworkId> m_auctionId;
+	Archive::AutoVariable<NetworkId> m_playerId;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CleanupInvalidItemRetrievalMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CleanupInvalidItemRetrievalMessage.cpp
new file mode 100644
index 00000000..3835776c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CleanupInvalidItemRetrievalMessage.cpp
@@ -0,0 +1,30 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "CleanupInvalidItemRetrievalMessage.h"
+
+CleanupInvalidItemRetrievalMessage::CleanupInvalidItemRetrievalMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("CleanupInvalidItemRetrievalMessage"),
+m_responseId(),
+m_trackId(),
+m_itemId()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	unpack(source);
+}
+
+CleanupInvalidItemRetrievalMessage::CleanupInvalidItemRetrievalMessage( int responseId, const NetworkId & itemId) :
+GameNetworkMessage("CleanupInvalidItemRetrievalMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_itemId(itemId)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+}
+
+CleanupInvalidItemRetrievalMessage::~CleanupInvalidItemRetrievalMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CleanupInvalidItemRetrievalMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CleanupInvalidItemRetrievalMessage.h
new file mode 100644
index 00000000..1c225412
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CleanupInvalidItemRetrievalMessage.h
@@ -0,0 +1,29 @@
+#ifndef CleanupInvalidItemRetrievalMessage_h
+#define CleanupInvalidItemRetrievalMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class CleanupInvalidItemRetrievalMessage : public GameNetworkMessage
+{
+
+public:
+	CleanupInvalidItemRetrievalMessage(int responseId, const NetworkId &  itemId);
+
+	CleanupInvalidItemRetrievalMessage(Archive::ReadIterator & source);
+	~CleanupInvalidItemRetrievalMessage();
+
+	const NetworkId &          GetItemId() const {return m_itemId.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+private:
+	Archive::AutoVariable<int>       m_responseId;
+	Archive::AutoVariable<int>       m_trackId;
+	Archive::AutoVariable<NetworkId> m_itemId;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CreateVendorMarketMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CreateVendorMarketMessage.cpp
new file mode 100644
index 00000000..9444b025
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CreateVendorMarketMessage.cpp
@@ -0,0 +1,48 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "CreateVendorMarketMessage.h"
+
+CreateVendorMarketMessage::CreateVendorMarketMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("CreateVendorMarketMessage"),
+m_responseId(),
+m_trackId(),
+m_ownerId(),
+m_location(),
+m_playerVendorLimit(),
+m_entranceCharge()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_playerVendorLimit);
+	AutoByteStream::addVariable(m_entranceCharge);
+	unpack(source);
+}
+
+CreateVendorMarketMessage::CreateVendorMarketMessage(
+	int                 responseId,
+	const NetworkId &   ownerId,
+	const std::string & location,
+	int                 playerVendorLimit,
+	int                 entranceCharge
+) :
+GameNetworkMessage("CreateVendorMarketMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_ownerId(ownerId),
+m_location(location),
+m_playerVendorLimit(playerVendorLimit),
+m_entranceCharge(entranceCharge)
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_playerVendorLimit);
+	AutoByteStream::addVariable(m_entranceCharge);
+}
+
+CreateVendorMarketMessage::~CreateVendorMarketMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CreateVendorMarketMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CreateVendorMarketMessage.h
new file mode 100644
index 00000000..94dcbcad
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/CreateVendorMarketMessage.h
@@ -0,0 +1,41 @@
+#ifndef CreateVendorMarketMessage_h
+#define CreateVendorMarketMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class CreateVendorMarketMessage : public GameNetworkMessage
+{
+
+public:
+	CreateVendorMarketMessage(
+		int                 responseId,
+		const NetworkId &   ownerId,
+		const std::string & location,
+		int                 playerVendorLimit,
+		int                 entranceCharge);
+
+	CreateVendorMarketMessage(Archive::ReadIterator & source);
+	~CreateVendorMarketMessage();
+
+	const NetworkId &          GetOwnerId()     const {return m_ownerId.get();}
+	const std::string &        GetLocation()    const {return m_location.get();}
+	int                        GetVendorLimit() const {return m_playerVendorLimit.get();}
+	int                        GetEntranceCharge() const {return m_entranceCharge.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId       (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_ownerId;
+	Archive::AutoVariable<std::string>      m_location;
+	Archive::AutoVariable<int>              m_playerVendorLimit;
+	Archive::AutoVariable<int>              m_entranceCharge;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DeleteAuctionLocationMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DeleteAuctionLocationMessage.cpp
new file mode 100644
index 00000000..c9023d8f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DeleteAuctionLocationMessage.cpp
@@ -0,0 +1,38 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "DeleteAuctionLocationMessage.h"
+
+DeleteAuctionLocationMessage::DeleteAuctionLocationMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("DeleteAuctionLocationMessage"),
+m_responseId(),
+m_trackId(),
+m_locationId(),
+m_whoRequested()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_whoRequested);
+	unpack(source);
+}
+
+DeleteAuctionLocationMessage::DeleteAuctionLocationMessage(
+		int responseId,
+		const NetworkId & locationId,
+		const std::string & whoRequested
+) :
+GameNetworkMessage("DeleteAuctionLocationMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_locationId(locationId),
+m_whoRequested(whoRequested)
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_whoRequested);
+}
+
+DeleteAuctionLocationMessage::~DeleteAuctionLocationMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DeleteAuctionLocationMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DeleteAuctionLocationMessage.h
new file mode 100644
index 00000000..efd3cbd8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DeleteAuctionLocationMessage.h
@@ -0,0 +1,37 @@
+#ifndef DeleteAuctionLocationMessage_h
+#define DeleteAuctionLocationMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class DeleteAuctionLocationMessage : public GameNetworkMessage
+{
+
+public:
+	DeleteAuctionLocationMessage(
+		int responseId,
+		const NetworkId & locationId,
+		const std::string & whoRequested);
+
+
+	DeleteAuctionLocationMessage(Archive::ReadIterator & source);
+	~DeleteAuctionLocationMessage();
+
+	const NetworkId &          GetLocationId()       const {return m_locationId.get();}
+	const std::string &        GetWhoRequested()     const {return m_whoRequested.get();}
+	int                        GetResponseId ()      const {return m_responseId.get();}
+	int                        GetTrackId    ()      const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_locationId;
+	Archive::AutoVariable<std::string>      m_whoRequested;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DestroyVendorMarketMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DestroyVendorMarketMessage.cpp
new file mode 100644
index 00000000..2ed1fcd1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DestroyVendorMarketMessage.cpp
@@ -0,0 +1,43 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "DestroyVendorMarketMessage.h"
+
+DestroyVendorMarketMessage::DestroyVendorMarketMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("DestroyVendorMarketMessage"),
+m_responseId(),
+m_trackId(),
+m_ownerId(),
+m_ownerName(),
+m_location()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_ownerName);
+	AutoByteStream::addVariable(m_location);
+	unpack(source);
+}
+
+DestroyVendorMarketMessage::DestroyVendorMarketMessage(
+		int responseId,
+		const NetworkId & ownerId,
+		const std::string & ownerName,
+		const std::string & location
+) :
+GameNetworkMessage("DestroyVendorMarketMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_ownerId(ownerId),
+m_ownerName(ownerName),
+m_location(location)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_ownerName);
+	AutoByteStream::addVariable(m_location);
+}
+
+DestroyVendorMarketMessage::~DestroyVendorMarketMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DestroyVendorMarketMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DestroyVendorMarketMessage.h
new file mode 100644
index 00000000..b4a8147a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/DestroyVendorMarketMessage.h
@@ -0,0 +1,40 @@
+#ifndef DestroyVendorMarketMessage_h
+#define DestroyVendorMarketMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class DestroyVendorMarketMessage : public GameNetworkMessage
+{
+
+public:
+	DestroyVendorMarketMessage(
+		int responseId,
+		const NetworkId & ownerId,
+		const std::string & ownerName,
+		const std::string & location);
+
+
+	DestroyVendorMarketMessage(Archive::ReadIterator & source);
+	~DestroyVendorMarketMessage();
+
+	const NetworkId &          GetOwnerId() const {return m_ownerId.get();}
+	const std::string &        GetOwnerName() const {return m_ownerName.get();}
+	const std::string &        GetLocation() const {return m_location.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_ownerId;
+	Archive::AutoVariable<std::string>      m_ownerName;
+	Archive::AutoVariable<std::string>      m_location;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemDetailsMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemDetailsMessage.cpp
new file mode 100644
index 00000000..206b0375
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemDetailsMessage.cpp
@@ -0,0 +1,41 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "GetItemDetailsMessage.h"
+
+GetItemDetailsMessage::GetItemDetailsMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("GetItemDetailsMessage"),
+m_responseId(),
+m_trackId(),
+m_auctionId(),
+m_playerId()
+{
+
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_auctionId);
+	AutoByteStream::addVariable(m_playerId);
+	unpack(source);
+
+}
+
+GetItemDetailsMessage::GetItemDetailsMessage(
+		int requestId,
+		const NetworkId & auctionId,
+		const NetworkId & playerId
+) :
+GameNetworkMessage("GetItemDetailsMessage"),
+m_responseId(requestId),
+m_trackId(0),
+m_auctionId(auctionId),
+m_playerId(playerId)
+{
+
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_auctionId);
+	AutoByteStream::addVariable(m_playerId);
+
+}
+
+GetItemDetailsMessage::~GetItemDetailsMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemDetailsMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemDetailsMessage.h
new file mode 100644
index 00000000..cecbfcdb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemDetailsMessage.h
@@ -0,0 +1,33 @@
+#ifndef GetItemDetailsMessage_h
+#define GetItemDetailsMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class GetItemDetailsMessage : public GameNetworkMessage
+{
+
+public:
+
+	explicit GetItemDetailsMessage( int requestId, const NetworkId & auctionId, const NetworkId & playerId );
+	GetItemDetailsMessage(Archive::ReadIterator & source);
+	~GetItemDetailsMessage();
+
+	const NetworkId &          GetAuctionId() const {return m_auctionId.get();}
+	const NetworkId &          GetPlayerId() const {return m_playerId.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>       m_responseId;
+	Archive::AutoVariable<int>       m_trackId;
+	Archive::AutoVariable<NetworkId> m_auctionId;
+	Archive::AutoVariable<NetworkId> m_playerId;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemMessage.cpp
new file mode 100644
index 00000000..21f65588
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemMessage.cpp
@@ -0,0 +1,42 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "GetItemMessage.h"
+
+GetItemMessage::GetItemMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("GetItemMessage"),
+m_responseId(),
+m_trackId(),
+m_itemId(),
+m_playerId(),
+m_location()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_location);
+	unpack(source);
+}
+
+GetItemMessage::GetItemMessage(
+		int requestId,
+		const NetworkId & itemId,
+		const NetworkId & playerId,
+		const std::string & location
+) : 
+GameNetworkMessage("GetItemMessage"),
+m_responseId(requestId),
+m_trackId(0),
+m_itemId(itemId),
+m_playerId(playerId),
+m_location(location)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_location);
+}
+
+GetItemMessage::~GetItemMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemMessage.h
new file mode 100644
index 00000000..3cc38cfd
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetItemMessage.h
@@ -0,0 +1,39 @@
+#ifndef GetItemMessage_h
+#define GetItemMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class GetItemMessage : public GameNetworkMessage
+{
+
+public:
+	GetItemMessage(
+		int requestId,
+		const NetworkId &  itemId,
+		const NetworkId &  playerId,
+		const std::string & location
+	);
+	GetItemMessage(Archive::ReadIterator & source);
+	~GetItemMessage();
+
+	const NetworkId &          GetItemId()   const {return m_itemId.get();}
+	const NetworkId &          GetPlayerId() const {return m_playerId.get();}
+	const std::string &        GetLocation() const {return m_location.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<NetworkId>        m_playerId;
+	Archive::AutoVariable<std::string>      m_location;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetPlayerVendorCountMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetPlayerVendorCountMessage.cpp
new file mode 100644
index 00000000..fbbc01db
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetPlayerVendorCountMessage.cpp
@@ -0,0 +1,33 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "GetPlayerVendorCountMessage.h"
+
+GetPlayerVendorCountMessage::GetPlayerVendorCountMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("GetPlayerVendorCountMessage"),
+	m_responseId(),
+	m_trackId(),
+	m_playerId()
+{
+ 	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_playerId);
+	unpack(source);
+}
+
+GetPlayerVendorCountMessage::GetPlayerVendorCountMessage(
+	int responseId,
+	const NetworkId & playerId
+) :
+	GameNetworkMessage("GetPlayerVendorCountMessage"),
+	m_responseId(responseId),
+	m_trackId(0),
+	m_playerId(playerId)
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_playerId);
+}
+
+GetPlayerVendorCountMessage::~GetPlayerVendorCountMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetPlayerVendorCountMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetPlayerVendorCountMessage.h
new file mode 100644
index 00000000..cb0a7364
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetPlayerVendorCountMessage.h
@@ -0,0 +1,30 @@
+#ifndef GetPlayerVendorCountMessage_h
+#define GetPlayerVendorCountMessage_h
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+class GetPlayerVendorCountMessage : public GameNetworkMessage
+{
+public:
+	GetPlayerVendorCountMessage(
+		int responseId,
+		const NetworkId & playerId);
+
+
+	GetPlayerVendorCountMessage(Archive::ReadIterator & source);
+	~GetPlayerVendorCountMessage();
+
+	const NetworkId &          GetPlayerId() const {return m_playerId.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_playerId;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorOwnerMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorOwnerMessage.cpp
new file mode 100644
index 00000000..3b072d9d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorOwnerMessage.cpp
@@ -0,0 +1,38 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "GetVendorOwnerMessage.h"
+
+GetVendorOwnerMessage::GetVendorOwnerMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("GetVendorOwnerMessage"),
+m_responseId(),
+m_trackId(),
+m_ownerId(),
+m_location()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_location);
+	unpack(source);
+}
+
+GetVendorOwnerMessage::GetVendorOwnerMessage(
+		int responseId,
+		const NetworkId & ownerId,
+		const std::string & location
+) :
+GameNetworkMessage("GetVendorOwnerMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_ownerId(ownerId),
+m_location(location)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_location);
+}
+
+GetVendorOwnerMessage::~GetVendorOwnerMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorOwnerMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorOwnerMessage.h
new file mode 100644
index 00000000..e22b2c54
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorOwnerMessage.h
@@ -0,0 +1,36 @@
+#ifndef GetVendorOwnerMessage_h
+#define GetVendorOwnerMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class GetVendorOwnerMessage : public GameNetworkMessage
+{
+
+public:
+	GetVendorOwnerMessage(
+		int responseId,
+		const NetworkId & ownerId,
+		const std::string & location);
+
+
+	GetVendorOwnerMessage(Archive::ReadIterator & source);
+	~GetVendorOwnerMessage();
+
+	const NetworkId &          GetOwnerId() const {return m_ownerId.get();}
+	const std::string &        GetLocation() const {return m_location.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_ownerId;
+	Archive::AutoVariable<std::string>      m_location;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorValueMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorValueMessage.cpp
new file mode 100644
index 00000000..d82620a3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorValueMessage.cpp
@@ -0,0 +1,33 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "GetVendorValueMessage.h"
+
+GetVendorValueMessage::GetVendorValueMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("GetVendorValueMessage"),
+m_responseId(),
+m_trackId(),
+m_location()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_location);
+	unpack(source);
+}
+
+GetVendorValueMessage::GetVendorValueMessage(
+		int responseId,
+		const std::string & location
+) :
+GameNetworkMessage("GetVendorValueMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_location(location)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_location);
+}
+
+GetVendorValueMessage::~GetVendorValueMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorValueMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorValueMessage.h
new file mode 100644
index 00000000..26e3b4be
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/GetVendorValueMessage.h
@@ -0,0 +1,31 @@
+#ifndef GetVendorValueMessage_h
+#define GetVendorValueMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+class GetVendorValueMessage : public GameNetworkMessage
+{
+public:
+	GetVendorValueMessage(
+		int responseId,
+		const std::string & location);
+
+
+	GetVendorValueMessage(Archive::ReadIterator & source);
+	~GetVendorValueMessage();
+
+	const std::string &        GetLocation() const {return m_location.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<std::string>      m_location;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/ItemMovedMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/ItemMovedMessage.cpp
new file mode 100644
index 00000000..fde12936
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/ItemMovedMessage.cpp
@@ -0,0 +1,33 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "ItemMovedMessage.h"
+
+ItemMovedMessage::ItemMovedMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("ItemMovedMessage"),
+	m_playerId(),
+	m_locationNameLength(),
+	m_locationName()
+{
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_locationNameLength);
+	AutoByteStream::addVariable(m_locationName);
+	unpack(source);
+}
+
+ItemMovedMessage::ItemMovedMessage(
+	const NetworkId &    playerId,
+	const int            locationNameLength,
+	const std::string &  locationName
+):
+	GameNetworkMessage("ItemMovedMessage"),
+	m_playerId(playerId),
+	m_locationNameLength(locationNameLength),
+	m_locationName(locationName)
+{
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_locationNameLength);
+	AutoByteStream::addVariable(m_locationName);
+}
+
+ItemMovedMessage::~ItemMovedMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/ItemMovedMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/ItemMovedMessage.h
new file mode 100644
index 00000000..35ff9052
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/ItemMovedMessage.h
@@ -0,0 +1,32 @@
+#ifndef ItemMovedMessage_H
+#define ItemMovedMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class ItemMovedMessage : public GameNetworkMessage
+{
+
+public:
+	explicit ItemMovedMessage(
+		const NetworkId &    playerId,
+		const int            locationNameLength,
+		const std::string &  locationName
+	);
+
+	ItemMovedMessage(Archive::ReadIterator & source);
+	~ItemMovedMessage();
+
+	const NetworkId &      GetPlayerId()           const {return m_playerId.get();}
+	const int              GetLocationNameLength() const {return m_locationNameLength.get();}
+	const std::string &    GetLocationName()       const {return m_locationName.get();}
+		
+protected:
+
+private:
+	Archive::AutoVariable<NetworkId>    m_playerId;
+	Archive::AutoVariable<int>          m_locationNameLength;
+	Archive::AutoVariable<std::string>  m_locationName;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAcceptHighBidMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAcceptHighBidMessage.cpp
new file mode 100644
index 00000000..f5a0aff1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAcceptHighBidMessage.cpp
@@ -0,0 +1,43 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnAcceptHighBidMessage.h"
+
+OnAcceptHighBidMessage::OnAcceptHighBidMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnAcceptHighBidMessage"),
+m_responseId(),
+m_trackId(),
+m_itemId(),
+m_playerId(),
+m_resultCode()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_resultCode);
+	unpack(source);
+}
+
+OnAcceptHighBidMessage::OnAcceptHighBidMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId &  itemId,
+		const NetworkId &  playerId
+) :
+GameNetworkMessage("OnAcceptHighBidMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_itemId(itemId),
+m_playerId(playerId),
+m_resultCode(resultCode)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_resultCode);
+}
+
+OnAcceptHighBidMessage::~OnAcceptHighBidMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAcceptHighBidMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAcceptHighBidMessage.h
new file mode 100644
index 00000000..4641926c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAcceptHighBidMessage.h
@@ -0,0 +1,38 @@
+#ifndef OnAcceptHighBidMessage_h
+#define OnAcceptHighBidMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class OnAcceptHighBidMessage : public GameNetworkMessage
+{
+
+public:
+	OnAcceptHighBidMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId &  itemId,
+		const NetworkId &  playerId
+	);
+	OnAcceptHighBidMessage(Archive::ReadIterator & source);
+	~OnAcceptHighBidMessage();
+
+	const NetworkId &          GetItemId()   const {return m_itemId.get();}
+	const NetworkId &          GetPlayerId() const {return m_playerId.get();}
+	int                        GetResultCode() const {return m_resultCode.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<NetworkId>        m_playerId;
+	Archive::AutoVariable<int>              m_resultCode;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddAuctionMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddAuctionMessage.cpp
new file mode 100644
index 00000000..108d807c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddAuctionMessage.cpp
@@ -0,0 +1,58 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnAddAuctionMessage.h"
+
+OnAddAuctionMessage::OnAddAuctionMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnAddAuctionMessage"),
+m_responseId(),
+m_trackId(),
+m_itemId(),
+m_ownerId(),
+m_resultCode(),
+m_vendorId(),
+m_ownerName(),
+m_location()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_resultCode);
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_ownerName);
+	AutoByteStream::addVariable(m_location);
+	unpack(source);
+}
+
+OnAddAuctionMessage::OnAddAuctionMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & itemId,
+		const NetworkId & ownerId,
+		const std::string & ownerName,
+		const NetworkId & vendorId,
+		const std::string & location
+) :
+GameNetworkMessage("OnAddAuctionMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_itemId(itemId),
+m_ownerId(ownerId),
+m_resultCode(resultCode),
+m_vendorId(vendorId),
+m_ownerName(ownerName),
+m_location(location)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_resultCode);
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_ownerName);
+	AutoByteStream::addVariable(m_location);
+}
+
+OnAddAuctionMessage::~OnAddAuctionMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddAuctionMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddAuctionMessage.h
new file mode 100644
index 00000000..b8e9b52c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddAuctionMessage.h
@@ -0,0 +1,46 @@
+#ifndef OnAddAuctionMessage_h
+#define OnAddAuctionMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class OnAddAuctionMessage : public GameNetworkMessage
+{
+public:
+	OnAddAuctionMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & itemId,
+		const NetworkId & ownerId,
+		const std::string & ownerName,
+		const NetworkId & vendorId,
+		const std::string & location);
+
+	OnAddAuctionMessage(Archive::ReadIterator & source);
+	~OnAddAuctionMessage();
+
+	const NetworkId &          GetOwnerId() const {return m_ownerId.get();}
+	const std::string &        GetOwnerName() const {return m_ownerName.get();}
+	const NetworkId &          GetItemId() const {return m_itemId.get();}
+	const NetworkId &          GetVendorId() const {return m_vendorId.get();}
+	int                        GetResultCode() const {return m_resultCode.get();}
+	const std::string &        GetLocation() const {return m_location.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<NetworkId>        m_ownerId;
+	Archive::AutoVariable<int>              m_resultCode;
+	Archive::AutoVariable<NetworkId>        m_vendorId;
+	Archive::AutoVariable<std::string>      m_ownerName;
+	Archive::AutoVariable<std::string>      m_location;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddBidMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddBidMessage.cpp
new file mode 100644
index 00000000..2d1af581
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddBidMessage.cpp
@@ -0,0 +1,93 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnAddBidMessage.h"
+
+OnAddBidMessage::OnAddBidMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnAddBidMessage"),
+m_responseId(),
+m_trackId(),
+m_itemId(),
+m_ownerId(),
+m_bidderId(),
+m_previousBidderId(),
+m_bidAmount(),
+m_previousBidAmount(),
+m_maxProxyBid(),
+m_location(),
+m_resultCode(),
+m_itemNameLength(),
+m_itemName(),
+m_salesTaxAmount(),
+m_salesTaxBankId()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_bidderId);
+	AutoByteStream::addVariable(m_previousBidderId);
+	AutoByteStream::addVariable(m_bidAmount);
+	AutoByteStream::addVariable(m_previousBidAmount);
+	AutoByteStream::addVariable(m_maxProxyBid);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_resultCode);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_salesTaxAmount);
+	AutoByteStream::addVariable(m_salesTaxBankId);
+	unpack(source);
+}
+
+OnAddBidMessage::OnAddBidMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & itemId,
+		const NetworkId & ownerId,
+		const NetworkId & bidderId,
+		const NetworkId & previousBidderId,
+		int bidAmount,
+		int previousBidAmount,
+		int maxProxyBid,
+		const std::string &location,
+		int itemNameLength,
+		const Unicode::String &itemName,
+		int salesTaxAmount,
+		const NetworkId & salesTaxBankId
+) :
+GameNetworkMessage("OnAddBidMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_itemId(itemId),
+m_ownerId(ownerId),
+m_bidderId(bidderId),
+m_previousBidderId(previousBidderId),
+m_bidAmount(bidAmount),
+m_previousBidAmount(previousBidAmount),
+m_maxProxyBid(maxProxyBid),
+m_location(location),
+m_resultCode(resultCode),
+m_itemNameLength(itemNameLength),
+m_itemName(itemName),
+m_salesTaxAmount(salesTaxAmount),
+m_salesTaxBankId(salesTaxBankId)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_bidderId);
+	AutoByteStream::addVariable(m_previousBidderId);
+	AutoByteStream::addVariable(m_bidAmount);
+	AutoByteStream::addVariable(m_previousBidAmount);
+	AutoByteStream::addVariable(m_maxProxyBid);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_resultCode);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_salesTaxAmount);
+	AutoByteStream::addVariable(m_salesTaxBankId);
+}
+
+
+OnAddBidMessage::~OnAddBidMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddBidMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddBidMessage.h
new file mode 100644
index 00000000..c61e6b4f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAddBidMessage.h
@@ -0,0 +1,70 @@
+#ifndef OnAddBidMessage_h
+#define OnAddBidMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class OnAddBidMessage : public GameNetworkMessage
+{
+
+public:
+	OnAddBidMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & itemId,
+		const NetworkId & ownerId,
+		const NetworkId & bidderId,
+		const NetworkId & previousBidderId,
+		int bidAmount,
+		int previousBidAmount,
+		int maxProxyBid,
+		const std::string &location,
+		int itemNameLength,
+		const Unicode::String &itemName,
+		int salesTaxAmount,
+		const NetworkId & salesTaxBankId
+	);
+	OnAddBidMessage(Archive::ReadIterator & source);
+	~OnAddBidMessage();
+
+	const NetworkId &          GetItemId()      const {return m_itemId.get();}
+	const NetworkId &          GetOwnerId()     const {return m_ownerId.get();}
+	const NetworkId &          GetBidderId()    const {return m_bidderId.get();}
+	const NetworkId &          GetPreviousBidderId()    const {return m_previousBidderId.get();}
+	int                        GetBid()         const {return m_bidAmount.get();}
+	int                        GetPreviousBid() const {return m_previousBidAmount.get();}
+	int                        GetMaxProxyBid() const {return m_maxProxyBid.get();}
+	const std::string &        GetLocation()    const {return m_location.get();}
+	int                        GetResultCode()  const {return m_resultCode.get();}
+	int                        GetItemNameLength()   const {return m_itemNameLength.get();}
+	const Unicode::String &    GetItemName()   const {return m_itemName.get();}
+	int                        GetSalesTaxAmount() const {return m_salesTaxAmount.get();}
+	const NetworkId &          GetSalesTaxBankId() const {return m_salesTaxBankId.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<NetworkId>        m_ownerId;
+	Archive::AutoVariable<NetworkId>        m_bidderId;
+	Archive::AutoVariable<NetworkId>        m_previousBidderId;
+	Archive::AutoVariable<int>              m_bidAmount;
+	Archive::AutoVariable<int>              m_previousBidAmount;
+	Archive::AutoVariable<int>              m_maxProxyBid;
+	Archive::AutoVariable<std::string>      m_location;
+	Archive::AutoVariable<int>              m_resultCode;
+	Archive::AutoVariable<int>              m_itemNameLength;
+	Archive::AutoVariable<Unicode::String>  m_itemName;
+	Archive::AutoVariable<int>              m_salesTaxAmount;
+	Archive::AutoVariable<NetworkId>        m_salesTaxBankId;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAuctionExpiredMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAuctionExpiredMessage.cpp
new file mode 100644
index 00000000..f3bef8cb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAuctionExpiredMessage.cpp
@@ -0,0 +1,81 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnAuctionExpiredMessage.h"
+
+OnAuctionExpiredMessage::OnAuctionExpiredMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnAuctionExpiredMessage"),
+m_responseId(),
+m_trackId(),
+m_ownerId(),
+m_sold(),
+m_buyerId(),
+m_bidAmount(),
+m_itemId(),
+m_maxProxyBid(),
+m_location(),
+m_immediate(),
+m_itemNameLength(),
+m_itemName(),
+m_sendSellerMail()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_sold);
+	AutoByteStream::addVariable(m_buyerId);
+	AutoByteStream::addVariable(m_bidAmount);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_maxProxyBid);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_immediate);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_sendSellerMail);
+	unpack(source);
+}
+
+OnAuctionExpiredMessage::OnAuctionExpiredMessage(
+		const NetworkId & ownerId,
+		bool  sold,
+		const NetworkId & buyerId,
+		int bidAmount,
+		const NetworkId & itemId,
+		int maxProxyBid,
+		const std::string & location,
+		bool immediate,
+		int itemNameLength,
+		const Unicode::String & itemName,
+		bool sendSellerMail
+) :
+GameNetworkMessage("OnAuctionExpiredMessage"),
+m_responseId(0),
+m_trackId(0),
+m_ownerId(ownerId),
+m_sold(sold),
+m_buyerId(buyerId),
+m_bidAmount(bidAmount),
+m_itemId(itemId),
+m_maxProxyBid(maxProxyBid),
+m_location(location),
+m_immediate(immediate),
+m_itemNameLength(itemNameLength),
+m_itemName(itemName),
+m_sendSellerMail(sendSellerMail)
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_sold);
+	AutoByteStream::addVariable(m_buyerId);
+	AutoByteStream::addVariable(m_bidAmount);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_maxProxyBid);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_immediate);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_sendSellerMail);
+}
+
+OnAuctionExpiredMessage::~OnAuctionExpiredMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAuctionExpiredMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAuctionExpiredMessage.h
new file mode 100644
index 00000000..dde3eaf5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnAuctionExpiredMessage.h
@@ -0,0 +1,62 @@
+#ifndef OnAuctionExpiredMessage_h
+#define OnAuctionExpiredMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class OnAuctionExpiredMessage : public GameNetworkMessage
+{
+
+public:
+	OnAuctionExpiredMessage(
+		const NetworkId & ownerId,
+		bool  sold,
+		const NetworkId & buyerId,
+		int bidAmount,
+		const NetworkId & itemId,
+		int maxProxyBid,
+		const std::string & location,
+		bool immediate,
+		int itemNameLength,
+		const Unicode::String &itemName,
+		bool sendSellerMail
+	);
+	OnAuctionExpiredMessage(Archive::ReadIterator & source);
+	~OnAuctionExpiredMessage();
+
+	const NetworkId &          GetItemId()         const {return m_itemId.get();}
+	const NetworkId &          GetOwnerId()        const {return m_ownerId.get();}
+	const NetworkId &          GetBuyerId()        const {return m_buyerId.get();}
+	int                        GetBid()            const {return m_bidAmount.get();}
+	int                        GetMaxProxyBid()    const {return m_maxProxyBid.get();}
+	const std::string &        GetLocation()       const {return m_location.get();}
+	bool                       IsSold()            const {return m_sold.get();}
+	bool                       IsImmediate()       const {return m_immediate.get();}
+	int                        GetItemNameLength() const {return m_itemNameLength.get();}
+	const Unicode::String &    GetItemName()       const {return m_itemName.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+	bool                       GetSendSellerMail() const {return m_sendSellerMail.get();}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_ownerId;
+	Archive::AutoVariable<bool>             m_sold;
+	Archive::AutoVariable<NetworkId>        m_buyerId;
+	Archive::AutoVariable<int>              m_bidAmount;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<int>              m_maxProxyBid;
+	Archive::AutoVariable<std::string>      m_location;
+	Archive::AutoVariable<bool>             m_immediate;
+	Archive::AutoVariable<int>              m_itemNameLength;
+	Archive::AutoVariable<Unicode::String>  m_itemName;
+	Archive::AutoVariable<bool>             m_sendSellerMail;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCancelAuctionMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCancelAuctionMessage.cpp
new file mode 100644
index 00000000..f119164c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCancelAuctionMessage.cpp
@@ -0,0 +1,58 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnCancelAuctionMessage.h"
+
+OnCancelAuctionMessage::OnCancelAuctionMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnCancelAuctionMessage"),
+m_responseId(),
+m_trackId(),
+m_itemId(),
+m_playerId(),
+m_highBidderId(),
+m_highBidAmount(),
+m_location(),
+m_resultCode()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_highBidderId);
+	AutoByteStream::addVariable(m_highBidAmount);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_resultCode);
+	unpack(source);
+}
+
+OnCancelAuctionMessage::OnCancelAuctionMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & itemId,
+		const NetworkId & playerId,
+		const NetworkId & highBidderId,
+		int highBidAmount,
+		const std::string & location
+) :
+GameNetworkMessage("OnCancelAuctionMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_itemId(itemId),
+m_playerId(playerId),
+m_highBidderId(highBidderId),
+m_highBidAmount(highBidAmount),
+m_location(location),
+m_resultCode(resultCode)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_highBidderId);
+	AutoByteStream::addVariable(m_highBidAmount);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_resultCode);
+}
+
+OnCancelAuctionMessage::~OnCancelAuctionMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCancelAuctionMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCancelAuctionMessage.h
new file mode 100644
index 00000000..1250e4e0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCancelAuctionMessage.h
@@ -0,0 +1,48 @@
+#ifndef OnCancelAuctionMessage_h
+#define OnCancelAuctionMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class OnCancelAuctionMessage : public GameNetworkMessage
+{
+
+public:
+	OnCancelAuctionMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & itemId,
+		const NetworkId & playerId,
+		const NetworkId & highBidderId,
+		int highBidAmount,
+		const std::string & location
+	);
+	OnCancelAuctionMessage(Archive::ReadIterator & source);
+	~OnCancelAuctionMessage();
+
+	const NetworkId &          GetItemId()       const {return m_itemId.get();}
+	const NetworkId &          GetPlayerId()     const {return m_playerId.get();}
+	const NetworkId &          GetHighBidderId() const {return m_highBidderId.get();}
+	int                        GetHighBid()      const {return m_highBidAmount.get();}
+	const std::string &        GetLocation()     const {return m_location.get();}
+	int                        GetResultCode()   const {return m_resultCode.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<NetworkId>        m_playerId;
+	Archive::AutoVariable<NetworkId>        m_highBidderId;
+	Archive::AutoVariable<int>              m_highBidAmount;
+	Archive::AutoVariable<std::string>      m_location;
+	Archive::AutoVariable<int>              m_resultCode;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCleanupInvalidItemRetrievalMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCleanupInvalidItemRetrievalMessage.cpp
new file mode 100644
index 00000000..7fe37aae
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCleanupInvalidItemRetrievalMessage.cpp
@@ -0,0 +1,48 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnCleanupInvalidItemRetrievalMessage.h"
+
+OnCleanupInvalidItemRetrievalMessage::OnCleanupInvalidItemRetrievalMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnCleanupInvalidItemRetrievalMessage"),
+m_responseId(),
+m_trackId(),
+m_itemId(),
+m_playerId(),
+m_creatorId(),
+m_reimburseAmt()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_creatorId);
+	AutoByteStream::addVariable(m_reimburseAmt);
+	unpack(source);
+}
+
+OnCleanupInvalidItemRetrievalMessage::OnCleanupInvalidItemRetrievalMessage(
+		int responseId,
+		const NetworkId & itemId,
+		const NetworkId & playerId,
+		const NetworkId & creatorId,
+		int reimburseAmt
+) :
+GameNetworkMessage("OnCleanupInvalidItemRetrievalMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_itemId(itemId),
+m_playerId(playerId),
+m_creatorId(creatorId),
+m_reimburseAmt(reimburseAmt)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_creatorId);
+	AutoByteStream::addVariable(m_reimburseAmt);
+}
+
+OnCleanupInvalidItemRetrievalMessage::~OnCleanupInvalidItemRetrievalMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCleanupInvalidItemRetrievalMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCleanupInvalidItemRetrievalMessage.h
new file mode 100644
index 00000000..c8ec7368
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCleanupInvalidItemRetrievalMessage.h
@@ -0,0 +1,41 @@
+#ifndef OnCleanupInvalidItemRetrievalMessage_h
+#define OnCleanupInvalidItemRetrievalMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class OnCleanupInvalidItemRetrievalMessage : public GameNetworkMessage
+{
+
+public:
+	OnCleanupInvalidItemRetrievalMessage(
+		int responseId,
+		const NetworkId & itemId,
+		const NetworkId & playerId,
+		const NetworkId & creatorId,
+		int reimburseAmt
+	);
+	OnCleanupInvalidItemRetrievalMessage(Archive::ReadIterator & source);
+	~OnCleanupInvalidItemRetrievalMessage();
+
+	const NetworkId &          GetItemId()      const {return m_itemId.get();}
+	const NetworkId &          GetPlayerId()    const {return m_playerId.get();}
+	const NetworkId &          GetCreatorId()    const {return m_creatorId.get();}
+	int                        GetReimburseAmt()  const {return m_reimburseAmt.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<NetworkId>        m_playerId;
+	Archive::AutoVariable<NetworkId>        m_creatorId;
+	Archive::AutoVariable<int>              m_reimburseAmt;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCreateVendorMarketMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCreateVendorMarketMessage.cpp
new file mode 100644
index 00000000..41ae4b3b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCreateVendorMarketMessage.cpp
@@ -0,0 +1,42 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnCreateVendorMarketMessage.h"
+
+OnCreateVendorMarketMessage::OnCreateVendorMarketMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnCreateVendorMarketMessage"),
+m_responseId(),
+m_trackId(),
+m_ownerId(),
+m_location(),
+m_resultCode()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_resultCode);
+	unpack(source);
+}
+
+OnCreateVendorMarketMessage::OnCreateVendorMarketMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & ownerId,
+		const std::string & location
+) :
+GameNetworkMessage("OnCreateVendorMarketMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_ownerId(ownerId),
+m_location(location),
+m_resultCode(resultCode)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_resultCode);
+}
+
+OnCreateVendorMarketMessage::~OnCreateVendorMarketMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCreateVendorMarketMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCreateVendorMarketMessage.h
new file mode 100644
index 00000000..4c01aba5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnCreateVendorMarketMessage.h
@@ -0,0 +1,34 @@
+#ifndef OnCreateVendorMarketMessage_h
+#define OnCreateVendorMarketMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class OnCreateVendorMarketMessage : public GameNetworkMessage
+{
+
+public:
+	OnCreateVendorMarketMessage(int responseId, int resultCode, const NetworkId & ownerId, const std::string & location );
+	OnCreateVendorMarketMessage(Archive::ReadIterator & source);
+	~OnCreateVendorMarketMessage();
+
+	const NetworkId &          GetOwnerId() const {return m_ownerId.get();}
+	const std::string &        GetLocation() const {return m_location.get();}
+	int                        GetResultCode() const {return m_resultCode.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_ownerId;
+	Archive::AutoVariable<std::string>      m_location;
+	Archive::AutoVariable<int>              m_resultCode;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemDetailsMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemDetailsMessage.cpp
new file mode 100644
index 00000000..666b9332
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemDetailsMessage.cpp
@@ -0,0 +1,70 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnGetItemDetailsMessage.h"
+
+OnGetItemDetailsMessage::OnGetItemDetailsMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("OnGetItemDetailsMessage"),
+		m_responseId(),
+		m_trackId(),
+		m_itemId(),
+		m_playerId(),
+		m_userDescriptionLength(),
+		m_userDescription(),
+		m_oobLength(),
+		m_oobData(),
+		m_attributes(),
+		m_resultCode()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_userDescriptionLength);
+	AutoByteStream::addVariable(m_userDescription);
+	AutoByteStream::addVariable(m_oobLength);
+	AutoByteStream::addVariable(m_oobData);
+	AutoByteStream::addVariable(m_attributes);
+	AutoByteStream::addVariable(m_resultCode);
+	unpack(source);
+}
+
+OnGetItemDetailsMessage::OnGetItemDetailsMessage(
+	int responseId,
+	int resultCode,
+	const NetworkId & itemId,
+	const NetworkId & playerId,
+	int userDescriptionLength,
+	const Unicode::String & userDescription,
+	int oobLength,
+	const Unicode::String & oobData,
+	std::vector<std::pair<std::string, Unicode::String> > const & attributes
+	) :
+		GameNetworkMessage("OnGetItemDetailsMessage"),
+		m_responseId(responseId),
+		m_trackId(0),
+		m_itemId(itemId),
+		m_playerId(playerId),
+		m_userDescriptionLength(userDescriptionLength),
+		m_userDescription(userDescription),
+		m_oobLength(oobLength),
+		m_oobData(oobData),
+		m_attributes(),
+		m_resultCode(resultCode)
+{
+	m_attributes.set(attributes);
+	
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_userDescriptionLength);
+	AutoByteStream::addVariable(m_userDescription);
+	AutoByteStream::addVariable(m_oobLength);
+	AutoByteStream::addVariable(m_oobData);
+	AutoByteStream::addVariable(m_attributes);
+	AutoByteStream::addVariable(m_resultCode);
+}
+
+OnGetItemDetailsMessage::~OnGetItemDetailsMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemDetailsMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemDetailsMessage.h
new file mode 100644
index 00000000..0a478120
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemDetailsMessage.h
@@ -0,0 +1,54 @@
+#ifndef OnGetItemDetailsMessage_h
+#define OnGetItemDetailsMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class OnGetItemDetailsMessage : public GameNetworkMessage
+{
+
+public:
+	OnGetItemDetailsMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & itemId,
+		const NetworkId & playerId,
+		int userDescriptionLength,
+		const Unicode::String & userDescription,
+		int oobLength,
+		const Unicode::String & oobData,
+		std::vector<std::pair<std::string, Unicode::String> > const & attributes
+	);
+	OnGetItemDetailsMessage(Archive::ReadIterator & source);
+	~OnGetItemDetailsMessage();
+
+	const NetworkId &          GetItemId()      const {return m_itemId.get();}
+	const NetworkId &          GetPlayerId()    const {return m_playerId.get();}
+	int                        GetUserDescriptionLength() const {return m_userDescriptionLength.get();}
+	const Unicode::String &    GetUserDescription() const {return m_userDescription.get();}
+	int                        GetOobLength()   const {return m_oobLength.get();}
+	const Unicode::String &    GetOobData()     const {return m_oobData.get();}
+	std::vector<std::pair<std::string, Unicode::String> > const & GetAttributes() const {return m_attributes.get();}
+	int                        GetResultCode()  const {return m_resultCode.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<NetworkId>        m_playerId;
+	Archive::AutoVariable<int>              m_userDescriptionLength;
+	Archive::AutoVariable<Unicode::String>  m_userDescription;
+	Archive::AutoVariable<int>              m_oobLength;
+	Archive::AutoVariable<Unicode::String>  m_oobData;
+	Archive::AutoArray<std::pair<std::string, Unicode::String> > m_attributes;
+	Archive::AutoVariable<int>              m_resultCode;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemMessage.cpp
new file mode 100644
index 00000000..1272b638
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemMessage.cpp
@@ -0,0 +1,47 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnGetItemMessage.h"
+
+OnGetItemMessage::OnGetItemMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnGetItemMessage"),
+m_responseId(),
+m_trackId(),
+m_itemId(),
+m_playerId(),
+m_resultCode(),
+m_location()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_resultCode);
+	AutoByteStream::addVariable(m_location);
+	unpack(source);
+}
+
+OnGetItemMessage::OnGetItemMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & itemId,
+		const NetworkId & playerId,
+		const std::string & location
+) :
+GameNetworkMessage("OnGetItemMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_itemId(itemId),
+m_playerId(playerId),
+m_resultCode(resultCode),
+m_location(location)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_resultCode);
+	AutoByteStream::addVariable(m_location);
+}
+
+OnGetItemMessage::~OnGetItemMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemMessage.h
new file mode 100644
index 00000000..5d9fdaa2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetItemMessage.h
@@ -0,0 +1,41 @@
+#ifndef OnGetItemMessage_h
+#define OnGetItemMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class OnGetItemMessage : public GameNetworkMessage
+{
+
+public:
+	OnGetItemMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & itemId,
+		const NetworkId & playerId,
+		const std::string & location
+	);
+	OnGetItemMessage(Archive::ReadIterator & source);
+	~OnGetItemMessage();
+
+	const NetworkId &          GetItemId()      const {return m_itemId.get();}
+	const NetworkId &          GetPlayerId()    const {return m_playerId.get();}
+	int                        GetResultCode()  const {return m_resultCode.get();}
+	const std::string &        GetLocation()  const {return m_location.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<NetworkId>        m_playerId;
+	Archive::AutoVariable<int>              m_resultCode;
+	Archive::AutoVariable<std::string>      m_location;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetPlayerVendorCountMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetPlayerVendorCountMessage.cpp
new file mode 100644
index 00000000..3a7df7ff
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetPlayerVendorCountMessage.cpp
@@ -0,0 +1,43 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnGetPlayerVendorCountMessage.h"
+
+OnGetPlayerVendorCountMessage::OnGetPlayerVendorCountMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("OnGetPlayerVendorCountMessage"),
+	m_responseId(),
+	m_trackId(),
+	m_playerId(),
+	m_vendorCount(),
+	m_vendorList()
+{
+ 	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_vendorCount);
+	AutoByteStream::addVariable(m_vendorList);
+	unpack(source);
+}
+
+OnGetPlayerVendorCountMessage::OnGetPlayerVendorCountMessage(
+	int responseId,
+	const NetworkId & playerId,
+	int vendorCount,
+	const std::vector<NetworkId> & vendorList
+) :
+	GameNetworkMessage("OnGetPlayerVendorCountMessage"),
+	m_responseId(responseId),
+	m_trackId(0),
+	m_playerId(playerId),
+	m_vendorCount(vendorCount),
+	m_vendorList(vendorList)
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_vendorCount);
+	AutoByteStream::addVariable(m_vendorList);
+}
+
+OnGetPlayerVendorCountMessage::~OnGetPlayerVendorCountMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetPlayerVendorCountMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetPlayerVendorCountMessage.h
new file mode 100644
index 00000000..783de33d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetPlayerVendorCountMessage.h
@@ -0,0 +1,37 @@
+#ifndef OnGetPlayerVendorCountMessage_h
+#define OnGetPlayerVendorCountMessage_h
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include <vector>
+
+class OnGetPlayerVendorCountMessage : public GameNetworkMessage
+{
+public:
+	OnGetPlayerVendorCountMessage(
+		int responseId,
+		const NetworkId & playerId,
+		int vendorCount,
+		const std::vector<NetworkId> & vendorList);
+
+
+	OnGetPlayerVendorCountMessage(Archive::ReadIterator & source);
+	~OnGetPlayerVendorCountMessage();
+
+	const NetworkId &              GetPlayerId() const {return m_playerId.get();}
+	int                            GetVendorCount() const {return m_vendorCount.get();}
+	const std::vector<NetworkId> & GetVendorList() const {return m_vendorList.get();}
+	int                            GetResponseId () const {return m_responseId.get();}
+	int                            GetTrackId    () const {return m_trackId.get();}
+	void                           SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>                     m_responseId;
+	Archive::AutoVariable<int>                     m_trackId;
+	Archive::AutoVariable<NetworkId>               m_playerId;
+	Archive::AutoVariable<int>                     m_vendorCount;
+	Archive::AutoVariable<std::vector<NetworkId> > m_vendorList;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorOwnerMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorOwnerMessage.cpp
new file mode 100644
index 00000000..999cc648
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorOwnerMessage.cpp
@@ -0,0 +1,47 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnGetVendorOwnerMessage.h"
+
+OnGetVendorOwnerMessage::OnGetVendorOwnerMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnGetVendorOwnerMessage"),
+m_responseId(),
+m_trackId(),
+m_ownerId(),
+m_location(),
+m_requesterId(),
+m_resultCode()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_requesterId);
+	AutoByteStream::addVariable(m_resultCode);
+	unpack(source);
+}
+
+OnGetVendorOwnerMessage::OnGetVendorOwnerMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & ownerId,
+		const NetworkId & requesterId,
+		const std::string & location
+) :
+GameNetworkMessage("OnGetVendorOwnerMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_ownerId(ownerId),
+m_location(location),
+m_requesterId(requesterId),
+m_resultCode(resultCode)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_requesterId);
+	AutoByteStream::addVariable(m_resultCode);
+}
+
+OnGetVendorOwnerMessage::~OnGetVendorOwnerMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorOwnerMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorOwnerMessage.h
new file mode 100644
index 00000000..4500deb7
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorOwnerMessage.h
@@ -0,0 +1,42 @@
+#ifndef OnGetVendorOwnerMessage_h
+#define OnGetVendorOwnerMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class OnGetVendorOwnerMessage : public GameNetworkMessage
+{
+
+public:
+	OnGetVendorOwnerMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & ownerId,
+		const NetworkId & requesterId,
+		const std::string & location
+);
+	OnGetVendorOwnerMessage(Archive::ReadIterator & source);
+	~OnGetVendorOwnerMessage();
+
+	const NetworkId &          GetOwnerId() const {return m_ownerId.get();}
+	const std::string &        GetLocation() const {return m_location.get();}
+	const NetworkId &          GetRequesterId() const {return m_requesterId.get();}
+	int                        GetResultCode() const {return m_resultCode.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_ownerId;
+	Archive::AutoVariable<std::string>      m_location;
+	Archive::AutoVariable<NetworkId>        m_requesterId;
+	Archive::AutoVariable<int>              m_resultCode;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorValueMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorValueMessage.cpp
new file mode 100644
index 00000000..a2030cf3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorValueMessage.cpp
@@ -0,0 +1,33 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnGetVendorValueMessage.h"
+
+OnGetVendorValueMessage::OnGetVendorValueMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnGetVendorValueMessage"),
+m_responseId(),
+m_trackId(),
+m_location(),
+m_value()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_value);
+	unpack(source);
+}
+
+OnGetVendorValueMessage::OnGetVendorValueMessage(int responseId, const std::string & location, int value ) :
+GameNetworkMessage("OnGetVendorValueMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_location(location),
+m_value(value)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_value);
+}
+
+OnGetVendorValueMessage::~OnGetVendorValueMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorValueMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorValueMessage.h
new file mode 100644
index 00000000..172fa289
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnGetVendorValueMessage.h
@@ -0,0 +1,31 @@
+#ifndef OnGetVendorValueMessage_h
+#define OnGetVendorValueMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+class OnGetVendorValueMessage : public GameNetworkMessage
+{
+
+public:
+	OnGetVendorValueMessage(int responseId, const std::string & location, int value );
+	OnGetVendorValueMessage(Archive::ReadIterator & source);
+	~OnGetVendorValueMessage();
+
+	int                        GetValue() const {return m_value.get();}
+	const std::string &        GetLocation() const {return m_location.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<std::string>      m_location;
+	Archive::AutoVariable<int>              m_value;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnItemExpiredMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnItemExpiredMessage.cpp
new file mode 100644
index 00000000..f211c749
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnItemExpiredMessage.cpp
@@ -0,0 +1,56 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnItemExpiredMessage.h"
+
+OnItemExpiredMessage::OnItemExpiredMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnItemExpiredMessage"),
+m_responseId(),
+m_trackId(),
+m_ownerId(),
+m_itemId(),
+m_itemNameLength(),
+m_itemName(),
+m_locationName(),
+m_locationId()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_locationName);
+	AutoByteStream::addVariable(m_locationId);
+	unpack(source);
+}
+
+OnItemExpiredMessage::OnItemExpiredMessage(
+		const NetworkId & ownerId,
+		const NetworkId & itemId,
+		int itemNameLength,
+		const Unicode::String & itemName,
+		const std::string & locationName,
+		const NetworkId & locationId
+) :
+GameNetworkMessage("OnItemExpiredMessage"),
+m_responseId(0),
+m_trackId(0),
+m_ownerId(ownerId),
+m_itemId(itemId),
+m_itemNameLength(itemNameLength),
+m_itemName(itemName),
+m_locationName(locationName),
+m_locationId(locationId)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_locationName);
+	AutoByteStream::addVariable(m_locationId);
+}
+
+OnItemExpiredMessage::~OnItemExpiredMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnItemExpiredMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnItemExpiredMessage.h
new file mode 100644
index 00000000..03410948
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnItemExpiredMessage.h
@@ -0,0 +1,47 @@
+#ifndef OnItemExpiredMessage_h
+#define OnItemExpiredMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class OnItemExpiredMessage : public GameNetworkMessage
+{
+
+public:
+	OnItemExpiredMessage(
+		const NetworkId & ownerId,
+		const NetworkId & itemId,
+		int itemNameLength,
+		const Unicode::String & itemName,
+		const std::string & locationName,
+		const NetworkId & locationId
+	);
+	OnItemExpiredMessage(Archive::ReadIterator & source);
+	~OnItemExpiredMessage();
+
+	const NetworkId &          GetItemId()      const {return m_itemId.get();}
+	const NetworkId &          GetOwnerId()     const {return m_ownerId.get();}
+	int                        GetItemNameLength()   const {return m_itemNameLength.get();}
+	const Unicode::String &    GetItemName()    const {return m_itemName.get();}
+	const std::string &        GetLocationName()    const {return m_locationName.get();}
+	const NetworkId &          GetLocationId()  const {return m_locationId.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_ownerId;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<int>              m_itemNameLength;
+	Archive::AutoVariable<Unicode::String>  m_itemName;
+	Archive::AutoVariable<std::string>      m_locationName;
+	Archive::AutoVariable<NetworkId>        m_locationId;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnPermanentAuctionPurchasedMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnPermanentAuctionPurchasedMessage.cpp
new file mode 100644
index 00000000..0fd30e4d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnPermanentAuctionPurchasedMessage.cpp
@@ -0,0 +1,68 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnPermanentAuctionPurchasedMessage.h"
+
+OnPermanentAuctionPurchasedMessage::OnPermanentAuctionPurchasedMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnPermanentAuctionPurchasedMessage"),
+m_responseId(),
+m_trackId(),
+m_ownerId(),
+m_buyerId(),
+m_price(),
+m_itemId(),
+m_location(),
+m_itemNameLength(),
+m_itemName(),
+m_attributes()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_buyerId);
+	AutoByteStream::addVariable(m_price);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_attributes);
+	unpack(source);
+}
+
+OnPermanentAuctionPurchasedMessage::OnPermanentAuctionPurchasedMessage(
+		const NetworkId & ownerId,
+		const NetworkId & buyerId,
+		int price,
+		const NetworkId & itemId,
+		const std::string & location,
+		int itemNameLength,
+		const Unicode::String & itemName,
+		std::vector<std::pair<std::string, Unicode::String> > const & attributes
+) :
+GameNetworkMessage("OnPermanentAuctionPurchasedMessage"),
+m_responseId(0),
+m_trackId(0),
+m_ownerId(ownerId),
+m_buyerId(buyerId),
+m_price(price),
+m_itemId(itemId),
+m_location(location),
+m_itemNameLength(itemNameLength),
+m_itemName(itemName),
+m_attributes()
+{
+	m_attributes.set(attributes);
+	
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_ownerId);
+	AutoByteStream::addVariable(m_buyerId);
+	AutoByteStream::addVariable(m_price);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_itemNameLength);
+	AutoByteStream::addVariable(m_itemName);
+	AutoByteStream::addVariable(m_attributes);
+}
+
+OnPermanentAuctionPurchasedMessage::~OnPermanentAuctionPurchasedMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnPermanentAuctionPurchasedMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnPermanentAuctionPurchasedMessage.h
new file mode 100644
index 00000000..17061fba
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnPermanentAuctionPurchasedMessage.h
@@ -0,0 +1,53 @@
+#ifndef OnPermanentAuctionPurchasedMessage_h
+#define OnPermanentAuctionPurchasedMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class OnPermanentAuctionPurchasedMessage : public GameNetworkMessage
+{
+
+public:
+	OnPermanentAuctionPurchasedMessage(
+		const NetworkId & ownerId,
+		const NetworkId & buyerId,
+		int price,
+		const NetworkId & itemId,
+		const std::string & location,
+		int itemNameLength,
+		const Unicode::String & itemName,
+		std::vector<std::pair<std::string, Unicode::String> > const & attributes
+	);
+	OnPermanentAuctionPurchasedMessage(Archive::ReadIterator & source);
+	~OnPermanentAuctionPurchasedMessage();
+
+	const NetworkId &          GetItemId()         const {return m_itemId.get();}
+	const NetworkId &          GetOwnerId()        const {return m_ownerId.get();}
+	const NetworkId &          GetBuyerId()        const {return m_buyerId.get();}
+	int                        GetPrice()          const {return m_price.get();}
+	const std::string &        GetLocation()       const {return m_location.get();}
+	int                        GetItemNameLength() const {return m_itemNameLength.get();}
+	const Unicode::String &    GetItemName()       const {return m_itemName.get();}
+	std::vector<std::pair<std::string, Unicode::String> > const & GetAttributes() {return m_attributes.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>              m_responseId;
+	Archive::AutoVariable<int>              m_trackId;
+	Archive::AutoVariable<NetworkId>        m_ownerId;
+	Archive::AutoVariable<NetworkId>        m_buyerId;
+	Archive::AutoVariable<int>              m_price;
+	Archive::AutoVariable<NetworkId>        m_itemId;
+	Archive::AutoVariable<std::string>      m_location;
+	Archive::AutoVariable<int>              m_itemNameLength;
+	Archive::AutoVariable<Unicode::String>  m_itemName;
+	Archive::AutoArray<std::pair<std::string, Unicode::String> > m_attributes;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryAuctionHeadersMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryAuctionHeadersMessage.cpp
new file mode 100644
index 00000000..bd300fd8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryAuctionHeadersMessage.cpp
@@ -0,0 +1,71 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnQueryAuctionHeadersMessage.h"
+
+// ----------------------------------------------------------------------
+
+OnQueryAuctionHeadersMessage::OnQueryAuctionHeadersMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnQueryAuctionHeadersMessage"),
+m_responseId(),
+m_trackId(),
+m_playerId(),
+m_queryType(),
+m_numAuctions(),
+m_auctionData(),
+m_resultCode(),
+m_queryOffset(),
+m_hasMorePages()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_queryType);
+	AutoByteStream::addVariable(m_numAuctions);
+	AutoByteStream::addVariable(m_auctionData);
+	AutoByteStream::addVariable(m_resultCode);
+	AutoByteStream::addVariable(m_queryOffset);
+	AutoByteStream::addVariable(m_hasMorePages);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+OnQueryAuctionHeadersMessage::OnQueryAuctionHeadersMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & playerId,
+		int queryType,
+		const std::vector<AuctionDataHeader> & auctions,
+		unsigned int queryOffset,
+		bool hasMorePages
+) :
+GameNetworkMessage("OnQueryAuctionHeadersMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_playerId(playerId),
+m_queryType(queryType),
+m_numAuctions(0),
+m_auctionData(),
+m_resultCode(resultCode),
+m_queryOffset(queryOffset),
+m_hasMorePages(hasMorePages)
+{
+  m_auctionData.set(auctions);
+  m_numAuctions.set(auctions.size());
+  AutoByteStream::addVariable(m_responseId);
+  AutoByteStream::addVariable(m_trackId);
+  AutoByteStream::addVariable(m_playerId);
+  AutoByteStream::addVariable(m_queryType);
+  AutoByteStream::addVariable(m_numAuctions);
+  AutoByteStream::addVariable(m_auctionData);
+  AutoByteStream::addVariable(m_resultCode);
+  AutoByteStream::addVariable(m_queryOffset);
+  AutoByteStream::addVariable(m_hasMorePages);
+}
+
+// ----------------------------------------------------------------------
+
+OnQueryAuctionHeadersMessage::~OnQueryAuctionHeadersMessage()
+{
+
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryAuctionHeadersMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryAuctionHeadersMessage.h
new file mode 100644
index 00000000..6ffea694
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryAuctionHeadersMessage.h
@@ -0,0 +1,114 @@
+#ifndef OnQueryAuctionHeadersMessage_h
+#define OnQueryAuctionHeadersMessage_h
+
+#include "AuctionData.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+#include <string>
+#include <vector>
+
+// ----------------------------------------------------------------------
+
+class OnQueryAuctionHeadersMessage : public GameNetworkMessage
+{
+
+public:
+	OnQueryAuctionHeadersMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & playerId,
+		int queryType,
+		const std::vector<AuctionDataHeader> & auctions,
+		unsigned int queryOffset,
+		bool hasMorePages
+	);
+	OnQueryAuctionHeadersMessage(Archive::ReadIterator & source);
+	~OnQueryAuctionHeadersMessage();
+
+	typedef std::vector<AuctionDataHeader> ADV;
+
+	const NetworkId &        GetPlayerId()    const {return m_playerId.get();}
+	int                      GetQueryType()   const {return m_queryType.get();}
+	int                      GetNumAuctions() const {return m_numAuctions.get();}
+	const std::vector<AuctionDataHeader> &        GetAuctionData() const {return m_auctionData.get();}
+	int                      GetResultCode()  const {return m_resultCode.get();}
+	unsigned int             GetQueryOffset()  const {return m_queryOffset.get();}
+	bool                     HasMorePages()  const {return m_hasMorePages.get();}
+	int                      GetResponseId () const {return m_responseId.get();}
+	int                      GetTrackId    () const {return m_trackId.get();}
+	void                     SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>                    m_responseId;
+	Archive::AutoVariable<int>                    m_trackId;
+	Archive::AutoVariable<NetworkId>              m_playerId;
+	Archive::AutoVariable<int>                    m_queryType;
+	Archive::AutoVariable<int>                    m_numAuctions;
+	Archive::AutoVariable<ADV>                    m_auctionData;
+	Archive::AutoVariable<int>                    m_resultCode;
+	Archive::AutoVariable<unsigned int>           m_queryOffset;
+	Archive::AutoVariable<bool>                   m_hasMorePages;
+
+};
+
+// ----------------------------------------------------------------------
+
+namespace Archive
+{
+
+	inline void get(ReadIterator &source, AuctionDataHeader &target)
+	{
+		get(source, target.type);
+		get(source, target.auctionId);
+		get(source, target.itemId);
+		get(source, target.itemNameLength);
+		get(source, target.itemName);
+		get(source, target.minBid);
+		get(source, target.highBid);
+		get(source, target.timer);
+		get(source, target.buyNowPrice);
+		get(source, target.location);
+		get(source, target.ownerId);
+		get(source, target.highBidderId);
+		get(source, target.maxProxyBid);
+		get(source, target.myBid);
+		get(source, target.itemType);
+		get(source, target.resourceContainerClassCrc);
+		get(source, target.flags);
+		get(source, target.entranceCharge);
+	}
+
+// ----------------------------------------------------------------------
+
+	inline void put(ByteStream &target, AuctionDataHeader const &source)
+	{
+		put(target, source.type);
+		put(target, source.auctionId);
+		put(target, source.itemId);
+		put(target, source.itemNameLength);
+		put(target, source.itemName);
+		put(target, source.minBid);
+		put(target, source.highBid);
+		put(target, source.timer);
+		put(target, source.buyNowPrice);
+		put(target, source.location);
+		put(target, source.ownerId);
+		put(target, source.highBidderId);
+		put(target, source.maxProxyBid);
+		put(target, source.myBid);
+		put(target, source.itemType);
+		put(target, source.resourceContainerClassCrc);
+		put(target, source.flags);
+		put(target, source.entranceCharge);
+	}
+
+}
+
+// ----------------------------------------------------------------------
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryVendorItemCountReplyMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryVendorItemCountReplyMessage.cpp
new file mode 100644
index 00000000..bc385c7c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryVendorItemCountReplyMessage.cpp
@@ -0,0 +1,38 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnQueryVendorItemCountReplyMessage.h"
+
+OnQueryVendorItemCountReplyMessage::OnQueryVendorItemCountReplyMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("OnQueryVendorItemCountReplyMessage"),
+	m_responseId(),
+	m_vendorId(),
+	m_vendorItemCount(),
+	m_searchEnabled()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_vendorItemCount);
+	AutoByteStream::addVariable(m_searchEnabled);
+	unpack(source);
+}
+
+OnQueryVendorItemCountReplyMessage::OnQueryVendorItemCountReplyMessage(
+	const int responseId,
+	const NetworkId &vendorId,
+	const int vendorItemCount,
+	const bool searchEnabled
+):
+	GameNetworkMessage("OnQueryVendorItemCountReplyMessage"),
+	m_responseId(responseId),
+	m_vendorId(vendorId),
+	m_vendorItemCount(vendorItemCount),
+	m_searchEnabled(searchEnabled)
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_vendorItemCount);
+	AutoByteStream::addVariable(m_searchEnabled);
+}
+
+OnQueryVendorItemCountReplyMessage::~OnQueryVendorItemCountReplyMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryVendorItemCountReplyMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryVendorItemCountReplyMessage.h
new file mode 100644
index 00000000..a53215f7
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnQueryVendorItemCountReplyMessage.h
@@ -0,0 +1,35 @@
+#ifndef OnQueryVendorItemCountReplyMessage_H
+#define OnQueryVendorItemCountReplyMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class OnQueryVendorItemCountReplyMessage : public GameNetworkMessage
+{
+
+public:
+	explicit OnQueryVendorItemCountReplyMessage(
+		const int responseId,
+		const NetworkId &vendorId,
+		const int vendorItemCount,
+		const bool searchEnabled
+	);
+
+	OnQueryVendorItemCountReplyMessage(Archive::ReadIterator & source);
+	~OnQueryVendorItemCountReplyMessage();
+
+	const int	       getResponseId()       const {return m_responseId.get();}
+	const NetworkId &      getVendorId()         const {return m_vendorId.get();}
+	const int	       getVendorItemCount()  const {return m_vendorItemCount.get();}
+	const bool	       getSearchEnabled()    const {return m_searchEnabled.get();}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>          m_responseId;
+	Archive::AutoVariable<NetworkId>    m_vendorId;
+	Archive::AutoVariable<int>          m_vendorItemCount;
+	Archive::AutoVariable<bool>         m_searchEnabled;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnUpdateVendorSearchOptionMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnUpdateVendorSearchOptionMessage.cpp
new file mode 100644
index 00000000..d186f865
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnUpdateVendorSearchOptionMessage.cpp
@@ -0,0 +1,28 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnUpdateVendorSearchOptionMessage.h"
+
+OnUpdateVendorSearchOptionMessage::OnUpdateVendorSearchOptionMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("OnUpdateVendorSearchOptionMessage"),
+	m_playerId(),
+	m_enabled()
+{
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_enabled);
+	unpack(source);
+}
+
+OnUpdateVendorSearchOptionMessage::OnUpdateVendorSearchOptionMessage(
+	const NetworkId & playerId,
+	const bool enabled
+):
+	GameNetworkMessage("OnUpdateVendorSearchOptionMessage"),
+	m_playerId(playerId),
+	m_enabled(enabled)
+{
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_enabled);
+}
+
+OnUpdateVendorSearchOptionMessage::~OnUpdateVendorSearchOptionMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnUpdateVendorSearchOptionMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnUpdateVendorSearchOptionMessage.h
new file mode 100644
index 00000000..d4ae9e48
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnUpdateVendorSearchOptionMessage.h
@@ -0,0 +1,30 @@
+#ifndef OnUpdateVendorSearchOptionMessage_H
+#define OnUpdateVendorSearchOptionMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class OnUpdateVendorSearchOptionMessage : public GameNetworkMessage
+{
+
+public:
+	explicit OnUpdateVendorSearchOptionMessage(
+		const NetworkId & playerId,
+		const bool enabled
+	);
+
+	OnUpdateVendorSearchOptionMessage(Archive::ReadIterator & source);
+	~OnUpdateVendorSearchOptionMessage();
+
+	bool		       GetEnabled()	     const {return m_enabled.get();}
+	const NetworkId &      GetPlayerId()         const {return m_playerId.get();}
+
+protected:
+
+private:
+	Archive::AutoVariable<NetworkId>    m_playerId;
+	Archive::AutoVariable<bool>         m_enabled;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnVendorRefuseItemMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnVendorRefuseItemMessage.cpp
new file mode 100644
index 00000000..1375ae15
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnVendorRefuseItemMessage.cpp
@@ -0,0 +1,48 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "OnVendorRefuseItemMessage.h"
+
+OnVendorRefuseItemMessage::OnVendorRefuseItemMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("OnVendorRefuseItemMessage"),
+m_responseId(),
+m_trackId(),
+m_itemId(),
+m_vendorId(),
+m_itemOwnerId(),
+m_resultCode()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_itemOwnerId);
+	AutoByteStream::addVariable(m_resultCode);
+	unpack(source);
+}
+
+OnVendorRefuseItemMessage::OnVendorRefuseItemMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & itemId,
+		const NetworkId & vendorId,
+		const NetworkId & itemOwnerId
+) :
+GameNetworkMessage("OnVendorRefuseItemMessage"),
+m_responseId(responseId),
+m_trackId(0),
+m_itemId(itemId),
+m_vendorId(vendorId),
+m_itemOwnerId(itemOwnerId),
+m_resultCode(resultCode)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_itemOwnerId);
+	AutoByteStream::addVariable(m_resultCode);
+}
+
+OnVendorRefuseItemMessage::~OnVendorRefuseItemMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnVendorRefuseItemMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnVendorRefuseItemMessage.h
new file mode 100644
index 00000000..ce37d653
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/OnVendorRefuseItemMessage.h
@@ -0,0 +1,42 @@
+#ifndef OnVendorRefuseItemMessage_h
+#define OnVendorRefuseItemMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class OnVendorRefuseItemMessage : public GameNetworkMessage
+{
+
+public:
+	OnVendorRefuseItemMessage(
+		int responseId,
+		int resultCode,
+		const NetworkId & itemId,
+		const NetworkId & vendorId,
+		const NetworkId & itemOwnerId
+	);
+	OnVendorRefuseItemMessage(Archive::ReadIterator & source);
+	~OnVendorRefuseItemMessage();
+
+	const NetworkId &          GetItemId()      const {return m_itemId.get();}
+	const NetworkId &          GetVendorId()    const {return m_vendorId.get();}
+	const NetworkId &          GetItemOwnerId()    const {return m_itemOwnerId.get();}
+	int                        GetResultCode()  const {return m_resultCode.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>                    m_responseId;
+	Archive::AutoVariable<int>                    m_trackId;
+	Archive::AutoVariable<NetworkId>              m_itemId;
+	Archive::AutoVariable<NetworkId>              m_vendorId;
+	Archive::AutoVariable<NetworkId>              m_itemOwnerId;
+	Archive::AutoVariable<int>                    m_resultCode;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryAuctionHeadersMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryAuctionHeadersMessage.cpp
new file mode 100644
index 00000000..0de86f0e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryAuctionHeadersMessage.cpp
@@ -0,0 +1,124 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "QueryAuctionHeadersMessage.h"
+
+QueryAuctionHeadersMessage::QueryAuctionHeadersMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("QueryAuctionHeadersMessage"),
+m_responseId(),
+m_trackId(),
+m_playerId(),
+m_vendorId(),
+m_queryType(),
+m_itemType(),
+m_itemTypeExactMatch(),
+m_itemTemplateId(),
+m_textFilterAll(),
+m_textFilterAny(),
+m_priceFilterMin(),
+m_priceFilterMax(),
+m_priceFilterIncludesFee(),
+m_advancedSearch(),
+m_advancedSearchMatchAllAny(static_cast<int8>(AuctionQueryHeadersMessage::ASMAA_match_all)),
+m_searchStringPlanet(),
+m_searchStringRegion(),
+m_searchAuctionLocationId(),
+m_searchMyVendorsOnly(),
+m_overrideVendorSearchFlag(),
+m_queryOffset()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_queryType);
+	AutoByteStream::addVariable(m_itemType);
+	AutoByteStream::addVariable(m_itemTypeExactMatch);
+	AutoByteStream::addVariable(m_itemTemplateId);
+	AutoByteStream::addVariable(m_textFilterAll);
+	AutoByteStream::addVariable(m_textFilterAny);
+	AutoByteStream::addVariable(m_priceFilterMin);
+	AutoByteStream::addVariable(m_priceFilterMax);
+	AutoByteStream::addVariable(m_priceFilterIncludesFee);
+	AutoByteStream::addVariable(m_advancedSearch);
+	AutoByteStream::addVariable(m_advancedSearchMatchAllAny);
+	AutoByteStream::addVariable(m_searchStringPlanet);
+	AutoByteStream::addVariable(m_searchStringRegion);
+	AutoByteStream::addVariable(m_searchAuctionLocationId);
+	AutoByteStream::addVariable(m_searchMyVendorsOnly);
+	AutoByteStream::addVariable(m_overrideVendorSearchFlag);
+	AutoByteStream::addVariable(m_queryOffset);
+	unpack(source);
+}
+
+QueryAuctionHeadersMessage::QueryAuctionHeadersMessage(
+		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,
+		unsigned int queryOffset
+) :
+GameNetworkMessage("QueryAuctionHeadersMessage"),
+m_responseId(requestId),
+m_trackId(0),
+m_playerId(playerId),
+m_vendorId(vendorId),
+m_queryType(queryType),
+m_itemType(itemType),
+m_itemTypeExactMatch(itemTypeExactMatch),
+m_itemTemplateId(itemTemplateId),
+m_textFilterAll(textFilterAll),
+m_textFilterAny(textFilterAny),
+m_priceFilterMin(priceFilterMin),
+m_priceFilterMax(priceFilterMax),
+m_priceFilterIncludesFee(priceFilterIncludesFee),
+m_advancedSearch(),
+m_advancedSearchMatchAllAny(static_cast<int8>(advancedSearchMatchAllAny)),
+m_searchStringPlanet(searchStringPlanet),
+m_searchStringRegion(searchStringRegion),
+m_searchAuctionLocationId(searchAuctionLocationId),
+m_searchMyVendorsOnly(searchMyVendorsOnly),
+m_overrideVendorSearchFlag(overrideVendorSearchFlag),
+m_queryOffset(queryOffset)
+{
+	m_advancedSearch.set(advancedSearch);
+
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_playerId);
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_queryType);
+	AutoByteStream::addVariable(m_itemType);
+	AutoByteStream::addVariable(m_itemTypeExactMatch);
+	AutoByteStream::addVariable(m_itemTemplateId);
+	AutoByteStream::addVariable(m_textFilterAll);
+	AutoByteStream::addVariable(m_textFilterAny);
+	AutoByteStream::addVariable(m_priceFilterMin);
+	AutoByteStream::addVariable(m_priceFilterMax);
+	AutoByteStream::addVariable(m_priceFilterIncludesFee);
+	AutoByteStream::addVariable(m_advancedSearch);
+	AutoByteStream::addVariable(m_advancedSearchMatchAllAny);
+	AutoByteStream::addVariable(m_searchStringPlanet);
+	AutoByteStream::addVariable(m_searchStringRegion);
+	AutoByteStream::addVariable(m_searchAuctionLocationId);
+	AutoByteStream::addVariable(m_searchMyVendorsOnly);
+	AutoByteStream::addVariable(m_overrideVendorSearchFlag);
+	AutoByteStream::addVariable(m_queryOffset);
+}
+
+QueryAuctionHeadersMessage::~QueryAuctionHeadersMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryAuctionHeadersMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryAuctionHeadersMessage.h
new file mode 100644
index 00000000..add12441
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryAuctionHeadersMessage.h
@@ -0,0 +1,90 @@
+#ifndef QueryAuctionHeadersMessage_h
+#define QueryAuctionHeadersMessage_h
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/AuctionQueryHeadersMessage.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+class QueryAuctionHeadersMessage : public GameNetworkMessage
+{
+
+public:
+	QueryAuctionHeadersMessage(
+		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,
+		unsigned int queryOffset
+	);
+	QueryAuctionHeadersMessage(Archive::ReadIterator & source);
+	~QueryAuctionHeadersMessage();
+
+	const NetworkId &          GetPlayerId() const {return m_playerId.get();}
+	const NetworkId &          GetVendorId() const {return m_vendorId.get();}
+	int                        GetQueryType() const {return m_queryType.get();}
+	int                        GetItemType() const {return m_itemType.get();}
+	bool                       GetItemTypeExactMatch() const {return m_itemTypeExactMatch.get();}
+	int                        GetItemTemplateId() const {return m_itemTemplateId.get();}
+
+	const Unicode::String &    GetTextFilterAll() const {return m_textFilterAll.get();}
+	const Unicode::String &    GetTextFilterAny() const {return m_textFilterAny.get();}
+
+	int                        GetPriceFilterMin() const {return m_priceFilterMin.get();}
+	int                        GetPriceFilterMax() const {return m_priceFilterMax.get();}
+	bool                       GetPriceFilterIncludesFee() const {return m_priceFilterIncludesFee.get();}
+	const std::list<AuctionQueryHeadersMessage::SearchCondition> & getAdvancedSearch() const {return m_advancedSearch.get();}
+	AuctionQueryHeadersMessage::AdvancedSearchMatchAllAny getAdvancedSearchMatchAllAny() const {return static_cast<AuctionQueryHeadersMessage::AdvancedSearchMatchAllAny>(m_advancedSearchMatchAllAny.get());}
+
+	const std::string &        GetSearchStringPlanet() const {return m_searchStringPlanet.get();}
+	const std::string &        GetSearchStringRegion() const {return m_searchStringRegion.get();}
+	const NetworkId &          GetSearchAuctionLocationId() const {return m_searchAuctionLocationId.get();}
+
+	bool                       GetSearchMyVendorsOnly() const {return m_searchMyVendorsOnly.get();}
+	bool                       GetOverrideVendorSearchFlag() const {return m_overrideVendorSearchFlag.get();}
+	unsigned int               GetQueryOffset() const {return m_queryOffset.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>                    m_responseId;
+	Archive::AutoVariable<int>                    m_trackId;
+	Archive::AutoVariable<NetworkId>              m_playerId;
+	Archive::AutoVariable<NetworkId>              m_vendorId;
+	Archive::AutoVariable<int>                    m_queryType;
+	Archive::AutoVariable<int>                    m_itemType;
+	Archive::AutoVariable<bool>                   m_itemTypeExactMatch;
+	Archive::AutoVariable<int>                    m_itemTemplateId;
+	Archive::AutoVariable<Unicode::String>        m_textFilterAll;
+	Archive::AutoVariable<Unicode::String>        m_textFilterAny;
+	Archive::AutoVariable<int>                    m_priceFilterMin;
+	Archive::AutoVariable<int>                    m_priceFilterMax;
+	Archive::AutoVariable<bool>                   m_priceFilterIncludesFee;
+	Archive::AutoList<AuctionQueryHeadersMessage::SearchCondition> m_advancedSearch;
+	Archive::AutoVariable<int8>                   m_advancedSearchMatchAllAny;
+	Archive::AutoVariable<std::string>            m_searchStringPlanet;
+	Archive::AutoVariable<std::string>            m_searchStringRegion;
+	Archive::AutoVariable<NetworkId>              m_searchAuctionLocationId;
+	Archive::AutoVariable<bool>                   m_searchMyVendorsOnly;
+	Archive::AutoVariable<bool>                   m_overrideVendorSearchFlag;
+	Archive::AutoVariable<unsigned int>           m_queryOffset;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryVendorItemCountMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryVendorItemCountMessage.cpp
new file mode 100644
index 00000000..0b374d0b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryVendorItemCountMessage.cpp
@@ -0,0 +1,33 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "QueryVendorItemCountMessage.h"
+
+QueryVendorItemCountMessage::QueryVendorItemCountMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("QueryVendorItemCountMessage"),
+	m_responseId(),
+	m_trackId(),
+	m_vendorId()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_vendorId);
+	unpack(source);
+}
+
+QueryVendorItemCountMessage::QueryVendorItemCountMessage(
+	const int responseId,
+	const int trackId,
+	const NetworkId &vendorId
+):
+	GameNetworkMessage("QueryVendorItemCountMessage"),
+	m_responseId(responseId),
+	m_trackId(trackId),
+	m_vendorId(vendorId)
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_vendorId);
+}
+
+QueryVendorItemCountMessage::~QueryVendorItemCountMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryVendorItemCountMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryVendorItemCountMessage.h
new file mode 100644
index 00000000..654419a0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/QueryVendorItemCountMessage.h
@@ -0,0 +1,34 @@
+#ifndef QueryVendorItemCountMessage_H
+#define QueryVendorItemCountMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class QueryVendorItemCountMessage : public GameNetworkMessage
+{
+
+public:
+	explicit QueryVendorItemCountMessage(
+		const int responseId,
+		const int trackId,
+		const NetworkId &vendorId
+	);
+
+	QueryVendorItemCountMessage(Archive::ReadIterator & source);
+	~QueryVendorItemCountMessage();
+
+	const NetworkId &      GetVendorId()         const {return m_vendorId.get();}
+	int                    GetResponseId()       const {return m_responseId.get();}
+	int                    GetTrackId()          const {return m_trackId.get();}
+	void                   SetTrackId (int trackId)    {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>          m_responseId;
+	Archive::AutoVariable<int>          m_trackId;
+	Archive::AutoVariable<NetworkId>    m_vendorId;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetEntranceChargeMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetEntranceChargeMessage.cpp
new file mode 100644
index 00000000..80397c7d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetEntranceChargeMessage.cpp
@@ -0,0 +1,38 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "SetEntranceChargeMessage.h"
+
+SetEntranceChargeMessage::SetEntranceChargeMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("SetEntranceChargeMessage"),
+	m_responseId(),
+	m_trackId(),
+	m_vendorId(),
+	m_entranceCharge()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_entranceCharge);
+	unpack(source);
+}
+
+SetEntranceChargeMessage::SetEntranceChargeMessage(
+	const int responseId,
+	const int trackId,
+	const NetworkId &vendorId,
+	const int entranceCharge
+):
+	GameNetworkMessage("SetEntranceChargeMessage"),
+	m_responseId(responseId),
+	m_trackId(trackId),
+	m_vendorId(vendorId),
+	m_entranceCharge(entranceCharge)
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_entranceCharge);
+}
+
+SetEntranceChargeMessage::~SetEntranceChargeMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetEntranceChargeMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetEntranceChargeMessage.h
new file mode 100644
index 00000000..30e98c83
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetEntranceChargeMessage.h
@@ -0,0 +1,37 @@
+#ifndef SetEntranceChargeMessage_H
+#define SetEntranceChargeMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class SetEntranceChargeMessage : public GameNetworkMessage
+{
+
+public:
+	explicit SetEntranceChargeMessage(
+		const int responseId,
+		const int trackId,
+		const NetworkId &vendorId,
+		const int entranceCharge
+	);
+
+	SetEntranceChargeMessage(Archive::ReadIterator & source);
+	~SetEntranceChargeMessage();
+
+	const NetworkId &      GetVendorId()         const {return m_vendorId.get();}
+	int		       GetEntranceCharge()   const {return m_entranceCharge.get();}
+	int                    GetResponseId()       const {return m_responseId.get();}
+	int                    GetTrackId()          const {return m_trackId.get();}
+	void                   SetTrackId (int trackId)    {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>          m_responseId;
+	Archive::AutoVariable<int>          m_trackId;
+	Archive::AutoVariable<NetworkId>    m_vendorId;
+	Archive::AutoVariable<int>          m_entranceCharge;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetGameTimeMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetGameTimeMessage.cpp
new file mode 100644
index 00000000..7d4c4c6d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetGameTimeMessage.cpp
@@ -0,0 +1,32 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "SetGameTimeMessage.h"
+
+SetGameTimeMessage::SetGameTimeMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("SetGameTimeMessage"),
+m_responseId(),
+m_trackId(),
+m_gameTime()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_gameTime);
+	unpack(source);
+}
+
+SetGameTimeMessage::SetGameTimeMessage(
+	int requestId,
+	int gameTime
+) : 
+GameNetworkMessage("SetGameTimeMessage"),
+m_responseId(requestId),
+m_trackId(0),
+m_gameTime(gameTime)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_gameTime);
+}
+
+SetGameTimeMessage::~SetGameTimeMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetGameTimeMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetGameTimeMessage.h
new file mode 100644
index 00000000..ea33de19
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetGameTimeMessage.h
@@ -0,0 +1,29 @@
+#ifndef SetGameTimeMessage_h
+#define SetGameTimeMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+class SetGameTimeMessage : public GameNetworkMessage
+{
+
+public:
+	SetGameTimeMessage(int requestId, int gameTime);
+	SetGameTimeMessage(Archive::ReadIterator & source);
+	~SetGameTimeMessage();
+
+	int                        GetGameTime() const {return m_gameTime.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>                    m_responseId;
+	Archive::AutoVariable<int>                    m_trackId;
+	Archive::AutoVariable<int>                    m_gameTime;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetSalesTaxMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetSalesTaxMessage.cpp
new file mode 100644
index 00000000..71df634a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetSalesTaxMessage.cpp
@@ -0,0 +1,42 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "SetSalesTaxMessage.h"
+
+SetSalesTaxMessage::SetSalesTaxMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("SetSalesTaxMessage"),
+m_responseId(),
+m_trackId(),
+m_salesTax(),
+m_bankId(),
+m_location()
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_salesTax);	
+	AutoByteStream::addVariable(m_bankId);
+	AutoByteStream::addVariable(m_location);
+	unpack(source);
+}
+
+SetSalesTaxMessage::SetSalesTaxMessage(
+		int requestId,
+		int salesTax,
+		const NetworkId & bankId,
+		const std::string & location
+) :
+GameNetworkMessage("SetSalesTaxMessage"),
+m_responseId(requestId),
+m_trackId(0),
+m_salesTax(salesTax),
+m_bankId(bankId),
+m_location(location)
+{
+  AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_salesTax);	
+	AutoByteStream::addVariable(m_bankId);
+	AutoByteStream::addVariable(m_location);
+}
+
+SetSalesTaxMessage::~SetSalesTaxMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetSalesTaxMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetSalesTaxMessage.h
new file mode 100644
index 00000000..272b955d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/SetSalesTaxMessage.h
@@ -0,0 +1,39 @@
+#ifndef SetSalesTaxMessage_h
+#define SetSalesTaxMessage_h
+
+//#include "AuctionBase.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class SetSalesTaxMessage : public GameNetworkMessage
+{
+
+public:
+	SetSalesTaxMessage(
+		int requestId,
+		int salesTax,
+		const NetworkId & bankId,
+		const std::string & location
+	);
+	SetSalesTaxMessage(Archive::ReadIterator & source);
+	~SetSalesTaxMessage();
+
+	int                        GetSalesTax()   const {return m_salesTax.get();}
+	const NetworkId &          GetBankId() const {return m_bankId.get();}
+	const std::string &        GetLocation() const {return m_location.get();}
+	int                        GetResponseId () const {return m_responseId.get();}
+	int                        GetTrackId    () const {return m_trackId.get();}
+	void                       SetTrackId    (int trackId) {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>                    m_responseId;
+	Archive::AutoVariable<int>                    m_trackId;
+	Archive::AutoVariable<int>                    m_salesTax;
+	Archive::AutoVariable<NetworkId>              m_bankId;
+	Archive::AutoVariable<std::string>            m_location;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorSearchOptionMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorSearchOptionMessage.cpp
new file mode 100644
index 00000000..47b86d33
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorSearchOptionMessage.cpp
@@ -0,0 +1,43 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "UpdateVendorSearchOptionMessage.h"
+
+UpdateVendorSearchOptionMessage::UpdateVendorSearchOptionMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("UpdateVendorSearchOptionMessage"),
+	m_responseId(),
+	m_trackId(),
+	m_vendorId(),
+	m_enabled(),
+	m_playerId()
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_enabled);
+	AutoByteStream::addVariable(m_playerId);
+	unpack(source);
+}
+
+UpdateVendorSearchOptionMessage::UpdateVendorSearchOptionMessage(
+	const int responseId,
+	const int trackId,
+	const NetworkId &vendorId,
+	const bool enabled,
+	const NetworkId & playerId
+):
+	GameNetworkMessage("UpdateVendorSearchOptionMessage"),
+	m_responseId(responseId),
+	m_trackId(trackId),
+	m_vendorId(vendorId),
+	m_enabled(enabled),
+	m_playerId(playerId)
+{
+	AutoByteStream::addVariable(m_responseId);
+	AutoByteStream::addVariable(m_trackId);
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_enabled);
+	AutoByteStream::addVariable(m_playerId);
+}
+
+UpdateVendorSearchOptionMessage::~UpdateVendorSearchOptionMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorSearchOptionMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorSearchOptionMessage.h
new file mode 100644
index 00000000..0f3102bc
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorSearchOptionMessage.h
@@ -0,0 +1,40 @@
+#ifndef UpdateVendorSearchOptionMessage_H
+#define UpdateVendorSearchOptionMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class UpdateVendorSearchOptionMessage : public GameNetworkMessage
+{
+
+public:
+	explicit UpdateVendorSearchOptionMessage(
+		const int responseId,
+		const int trackId,
+		const NetworkId &vendorId,
+		const bool enabled,
+		const NetworkId & playerId
+	);
+
+	UpdateVendorSearchOptionMessage(Archive::ReadIterator & source);
+	~UpdateVendorSearchOptionMessage();
+
+	const NetworkId &      GetVendorId()         const {return m_vendorId.get();}
+	bool		       GetEnabled()	     const {return m_enabled.get();}
+	int                    GetResponseId()       const {return m_responseId.get();}
+	const NetworkId &      GetPlayerId()         const {return m_playerId.get();}
+	int                    GetTrackId()          const {return m_trackId.get();}
+	void                   SetTrackId (int trackId)    {m_trackId.set(trackId);}
+
+protected:
+
+private:
+	Archive::AutoVariable<int>          m_responseId;
+	Archive::AutoVariable<int>          m_trackId;
+	Archive::AutoVariable<NetworkId>    m_vendorId;
+	Archive::AutoVariable<bool>         m_enabled;
+	Archive::AutoVariable<NetworkId>    m_playerId;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorStatusMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorStatusMessage.cpp
new file mode 100644
index 00000000..b1c8cda9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorStatusMessage.cpp
@@ -0,0 +1,33 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "UpdateVendorStatusMessage.h"
+
+UpdateVendorStatusMessage::UpdateVendorStatusMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("UpdateVendorStatusMessage"),
+m_vendorId(),
+m_location(),
+m_status()
+{
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_status);
+	unpack(source);
+}
+
+UpdateVendorStatusMessage::UpdateVendorStatusMessage(
+	const NetworkId &   vendorId,
+	const std::string & location,
+	int                 status
+) :
+GameNetworkMessage("UpdateVendorStatusMessage"),
+m_vendorId(vendorId),
+m_location(location),
+m_status(status)
+{
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_location);
+	AutoByteStream::addVariable(m_status);
+}
+
+UpdateVendorStatusMessage::~UpdateVendorStatusMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorStatusMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorStatusMessage.h
new file mode 100644
index 00000000..c4830ff5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/UpdateVendorStatusMessage.h
@@ -0,0 +1,28 @@
+#ifndef UpdateVendorStatusMessage_h
+#define UpdateVendorStatusMessage_h
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class UpdateVendorStatusMessage : public GameNetworkMessage
+{
+public:
+	UpdateVendorStatusMessage(
+		const NetworkId &   vendorId,
+		const std::string & location,
+		int                 status);
+
+	UpdateVendorStatusMessage(Archive::ReadIterator & source);
+	~UpdateVendorStatusMessage();
+
+	const NetworkId & GetVendorId() const {return m_vendorId.get();}
+	const std::string & GetLocation() const {return m_location.get();}
+	int GetStatus() const {return m_status.get();}
+
+private:
+	Archive::AutoVariable<NetworkId>        m_vendorId;
+	Archive::AutoVariable<std::string>      m_location;
+	Archive::AutoVariable<int>              m_status;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/VendorStatusChangeMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/VendorStatusChangeMessage.cpp
new file mode 100644
index 00000000..864867ba
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/VendorStatusChangeMessage.cpp
@@ -0,0 +1,28 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "VendorStatusChangeMessage.h"
+
+VendorStatusChangeMessage::VendorStatusChangeMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("VendorStatusChangeMessage"),
+	m_vendorId(),
+	m_status()
+{
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_status);
+	unpack(source);
+}
+
+VendorStatusChangeMessage::VendorStatusChangeMessage(
+	const NetworkId &vendorId,
+	const int status
+):
+	GameNetworkMessage("VendorStatusChangeMessage"),
+	m_vendorId(vendorId),
+	m_status(status)
+{
+	AutoByteStream::addVariable(m_vendorId);
+	AutoByteStream::addVariable(m_status);
+}
+
+VendorStatusChangeMessage::~VendorStatusChangeMessage()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/VendorStatusChangeMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/VendorStatusChangeMessage.h
new file mode 100644
index 00000000..ac71f9ff
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameCommoditiesServer/VendorStatusChangeMessage.h
@@ -0,0 +1,30 @@
+#ifndef VendorStatusChangeMessage_H
+#define VendorStatusChangeMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "serverNetworkMessages/AuctionBase.h"
+
+class VendorStatusChangeMessage : public GameNetworkMessage
+{
+
+public:
+	explicit VendorStatusChangeMessage(
+		const NetworkId &vendorId,
+		const int status
+	);
+
+	VendorStatusChangeMessage(Archive::ReadIterator & source);
+	~VendorStatusChangeMessage();
+
+	const NetworkId &      getVendorId()         const {return m_vendorId.get();}
+	const int              getStatus()           const {return m_status.get();}
+
+protected:
+
+private:
+	Archive::AutoVariable<NetworkId>    m_vendorId;
+	Archive::AutoVariable<int>          m_status;
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.cpp
new file mode 100644
index 00000000..319df8b5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.cpp
@@ -0,0 +1,269 @@
+// GameConnectionServerMessages.cpp
+// copyright 2001 Verant Interactive
+
+
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GameConnectionServerMessages.h"
+
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedNetwork/ConfigSharedNetwork.h"
+#include "sharedNetwork/NetworkHandler.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+//-----------------------------------------------------------------------
+
+static ConstCharCrcString s_gameClientMessageName("GameClientMessage");
+
+//-----------------------------------------------------------------------
+
+NewGameServer::NewGameServer(const std::string & sceneName, uint32 serverId) : 
+		GameNetworkMessage("NewGameServer"),
+		m_sceneName(sceneName),
+		m_serverId(serverId)
+{
+	addVariable(m_sceneName);
+	addVariable(m_serverId);
+}
+//-----------------------------------------------------------------------
+
+NewGameServer::NewGameServer (Archive::ReadIterator & source) : 
+		GameNetworkMessage("NewGameServer"),
+		m_sceneName(),
+		m_serverId(0)
+{
+	addVariable(m_sceneName);
+	addVariable(m_serverId);
+	unpack(source);
+}
+//-----------------------------------------------------------------------
+
+NewGameServer::~NewGameServer()
+{
+}
+
+// ======================================================================
+
+TransferControlMessage::TransferControlMessage(NetworkId oid, uint32 newGameServerId, bool skipLoadScreen, const std::vector<NetworkId> &observedObjects) :
+		GameNetworkMessage("TransferControlMessage"),
+		m_oid(oid),
+		m_gameServerId(newGameServerId),
+		m_skipLoadScreen(skipLoadScreen),
+		m_observedObjects()
+{
+	m_observedObjects.set(observedObjects);
+	
+	addVariable(m_oid);
+	addVariable(m_gameServerId);
+	addVariable(m_skipLoadScreen);
+	addVariable(m_observedObjects);
+}
+
+//-----------------------------------------------------------------------
+
+TransferControlMessage::TransferControlMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("TransferControlMessage"),
+m_oid(NetworkId::cms_invalid),
+m_gameServerId(0),
+m_skipLoadScreen(true)
+{
+	addVariable(m_oid);
+	addVariable(m_gameServerId);
+	addVariable(m_skipLoadScreen);
+	addVariable(m_observedObjects);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TransferControlMessage::~TransferControlMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+ControlAssumed::ControlAssumed(NetworkId oid, const std::string & newSceneName, const bool skipLoadScreen,
+							   const Vector startPos, const float startYaw, const std::string & templateName,
+							   const int64 t) : 
+		GameNetworkMessage("ControlAssumed"),
+		m_oid(oid),
+		m_sceneName(newSceneName),
+		m_skipLoadScreen(skipLoadScreen),
+		m_startPosition(startPos),
+		m_startYaw(startYaw),
+		m_templateName(templateName),
+		m_timeSeconds(t)
+{
+	addVariable(m_oid);
+	addVariable(m_sceneName);
+	addVariable(m_skipLoadScreen);
+	addVariable(m_startPosition);
+	addVariable(m_startYaw);
+	addVariable(m_templateName);
+	addVariable(m_timeSeconds);
+}
+//-----------------------------------------------------------------------
+
+ControlAssumed::ControlAssumed (Archive::ReadIterator & source) : 
+		GameNetworkMessage("ControlAssumed"),
+		m_oid(NetworkId::cms_invalid),
+		m_sceneName(),
+		m_skipLoadScreen(false),
+		m_startPosition(),
+		m_startYaw(0.0f),
+		m_templateName(),
+		m_timeSeconds(0)
+{
+	addVariable(m_oid);
+	addVariable(m_sceneName);
+	addVariable(m_skipLoadScreen);
+	addVariable(m_startPosition);
+	addVariable(m_startYaw);
+	addVariable(m_templateName);
+	addVariable(m_timeSeconds);
+	unpack(source);
+}
+//-----------------------------------------------------------------------
+
+ControlAssumed::~ControlAssumed()
+{
+}
+//-----------------------------------------------------------------------
+
+DropClient::DropClient(NetworkId oid) : 
+		GameNetworkMessage("DropClient"),
+		m_oid(oid),
+		m_immediate(false)
+{
+	addVariable(m_oid);
+	addVariable(m_immediate);
+}
+//-----------------------------------------------------------------------
+
+DropClient::DropClient (Archive::ReadIterator & source) : 
+		GameNetworkMessage("DropClient"),
+		m_oid(NetworkId::cms_invalid),
+		m_immediate(false)
+{
+	addVariable(m_oid);
+	addVariable(m_immediate);
+	unpack(source);
+}
+//-----------------------------------------------------------------------
+
+DropClient::~DropClient()
+{
+}
+
+//-----------------------------------------------------------------------
+
+KickPlayer::KickPlayer(const NetworkId& oid, const std::string& reason) : 
+	GameNetworkMessage("KickPlayer"),
+	m_oid(oid),
+	m_reason(reason)
+{
+	addVariable(m_oid);
+	addVariable(m_reason);
+}
+
+//-----------------------------------------------------------------------
+
+KickPlayer::KickPlayer(Archive::ReadIterator &source) : 
+	GameNetworkMessage("KickPlayer"),
+	m_oid(NetworkId::cms_invalid),
+	m_reason("")
+{
+	addVariable(m_oid);
+	addVariable(m_reason);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+KickPlayer::~KickPlayer()
+{
+}
+
+//-----------------------------------------------------------------------
+
+GameClientMessage::GameClientMessage (const std::vector<NetworkId> & d, bool newReliable, const GameNetworkMessage& msg) :
+	GameNetworkMessage(s_gameClientMessageName),
+	distributionList(),
+	reliable(newReliable),
+	byteStream()
+{
+	distributionList.set(d);
+	addVariable(distributionList);
+	addVariable(reliable);
+	addVariable(byteStream);
+	Archive::ByteStream bs;
+	msg.pack(bs);
+	byteStream.set(bs);
+
+	if (ConfigSharedNetwork::getReportMessages())
+		NetworkHandler::reportMessage("send.GameClientMessage." + msg.getCmdName(), bs.getSize());
+}
+
+//-----------------------------------------------------------------------
+
+GameClientMessage::GameClientMessage(const std::vector<NetworkId> & d, bool newReliable, Archive::ReadIterator & msg) :
+	GameNetworkMessage(s_gameClientMessageName),
+	distributionList(),
+	reliable(newReliable),
+	byteStream(Archive::ByteStream(msg.getBuffer(), msg.getSize()))
+{
+	distributionList.set(d);
+	addVariable(distributionList);
+	addVariable(reliable);
+	addVariable(byteStream);
+
+	static bool const reportMessages = ConfigSharedNetwork::getReportMessages();
+	if (reportMessages)
+	{
+		Archive::ReadIterator ri = byteStream.get().begin();
+		unsigned long cmdCrc;
+		Archive::get(ri, cmdCrc);
+		NetworkHandler::reportMessage("send.GameClientMessage." + GameNetworkMessage::getCmdName(cmdCrc), byteStream.get().getSize());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+GameClientMessage::GameClientMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage(s_gameClientMessageName),
+	distributionList(),
+	reliable(false),
+	byteStream()
+{
+	addVariable(distributionList);
+	addVariable(reliable);
+	addVariable(byteStream);
+	unpack(source);
+
+	static bool const reportMessages = ConfigSharedNetwork::getReportMessages();
+	if (reportMessages)
+	{
+		Archive::ReadIterator ri = byteStream.get().begin();
+		unsigned long cmdCrc;
+		Archive::get(ri, cmdCrc);
+		NetworkHandler::reportMessage("send.GameClientMessage." + GameNetworkMessage::getCmdName(cmdCrc), byteStream.get().getSize());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+GameClientMessage::~GameClientMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void GameClientMessage::pack(Archive::ByteStream & target) const
+{
+	AutoByteStream::pack(target);
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.h b/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.h
new file mode 100644
index 00000000..1955e32d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.h
@@ -0,0 +1,327 @@
+// GameConnectionServerMessages.h
+// copyright 2001 Verant Interactive
+
+
+#ifndef	_GameConnectionServerMessages_H
+#define	_GameConnectionServerMessages_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Vector.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedFoundation/NetworkId.h"
+
+//-----------------------------------------------------------------------
+/**
+* A game server is connecting to the user server and is sending intial info about itself.
+*/
+
+class NewGameServer : public GameNetworkMessage
+{
+  public:
+    NewGameServer (const std::string & sceneName, uint32 serverId);
+    NewGameServer (Archive::ReadIterator & source);
+    virtual ~NewGameServer ();
+
+    uint32                          getServerId() const;
+    std::string                     getSceneName() const;
+        
+  private:
+
+    Archive::AutoVariable<std::string> m_sceneName;
+    Archive::AutoVariable<uint32>       m_serverId;
+    
+    NewGameServer();
+    NewGameServer(const NewGameServer&);
+    NewGameServer& operator= (const NewGameServer&);
+
+};
+//-----------------------------------------------------------------------
+
+inline uint32 NewGameServer::getServerId() const
+{
+    return m_serverId.get();
+}
+//-----------------------------------------------------------------------
+
+inline std::string NewGameServer::getSceneName() const
+{
+    return m_sceneName.get();
+}
+
+// ======================================================================
+
+/**
+ * The TransferControl message is send from GameServer to Connection server when
+ * a controlled object has its authority transfered to another server.
+ */
+class TransferControlMessage : public GameNetworkMessage
+{
+public:
+	TransferControlMessage(NetworkId oid, uint32 newGameServerId, bool skipLoadScreen, const std::vector<NetworkId> &observedObjects);
+	TransferControlMessage(Archive::ReadIterator & source);
+	~TransferControlMessage();
+
+	NetworkId getNetworkId() const;
+	uint32 getGameServerId() const;
+	bool getSkipLoadScreen() const;
+	const std::vector<NetworkId> & getObservedObjects() const;
+
+private:
+	Archive::AutoVariable<NetworkId> m_oid;
+	Archive::AutoVariable<uint32> m_gameServerId;
+	Archive::AutoVariable<bool> m_skipLoadScreen;
+ 	Archive::AutoArray<NetworkId> m_observedObjects;
+    
+	TransferControlMessage();
+	TransferControlMessage(const TransferControlMessage&);
+	TransferControlMessage & operator= (const TransferControlMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+inline NetworkId TransferControlMessage::getNetworkId() const
+{
+	return m_oid.get();
+}
+//-----------------------------------------------------------------------
+
+inline uint32 TransferControlMessage::getGameServerId() const
+{
+	return m_gameServerId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool TransferControlMessage::getSkipLoadScreen() const
+{
+	return m_skipLoadScreen.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::vector<NetworkId> &TransferControlMessage::getObservedObjects() const
+{
+	return m_observedObjects.get();
+}
+
+//-----------------------------------------------------------------------
+/**
+ * The Control Assumed message is sent from Game Server to Connection server in response
+ * to a NewClient message to let the connection server that it has assumed authoritative
+ * control of that object.
+ */
+
+class ControlAssumed : public GameNetworkMessage
+{
+  public:
+    explicit ControlAssumed(NetworkId oid, const std::string & newSceneName, const bool skipLoadScreen,
+                            const Vector startPos, const float startYaw, const std::string & templateName,
+                            const int64 timeSeconds);
+    ControlAssumed(Archive::ReadIterator & source);
+    virtual ~ControlAssumed();
+
+    NetworkId                        getNetworkId      () const;
+    const std::string &              getSceneName      () const;
+	const bool                       getSkipLoadScreen () const;
+    const Vector &                   getStartPosition  () const;
+    const float                      getStartYaw       () const;
+    const std::string &              getTemplateName   () const;
+	const int64                      getTimeSeconds    () const;
+    
+  private:
+    Archive::AutoVariable<NetworkId>    m_oid;
+    Archive::AutoVariable<std::string>  m_sceneName;
+	Archive::AutoVariable<bool>         m_skipLoadScreen;
+    Archive::AutoVariable<Vector>       m_startPosition;
+	Archive::AutoVariable<float>        m_startYaw;
+    Archive::AutoVariable<std::string>  m_templateName;
+	Archive::AutoVariable<int64>        m_timeSeconds;
+    
+
+    ControlAssumed();
+    ControlAssumed(const ControlAssumed &);
+    ControlAssumed & operator= (const ControlAssumed &);
+};
+
+//-----------------------------------------------------------------------
+
+inline NetworkId ControlAssumed::getNetworkId() const
+{
+    return m_oid.get();
+}
+//-----------------------------------------------------------------------
+
+inline const std::string & ControlAssumed::getSceneName() const
+{
+    return m_sceneName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ControlAssumed::getSkipLoadScreen() const
+{
+	return m_skipLoadScreen.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Vector & ControlAssumed::getStartPosition() const
+{
+    return m_startPosition.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const float ControlAssumed::getStartYaw() const
+{
+    return m_startYaw.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ControlAssumed::getTemplateName() const
+{
+    return m_templateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const int64 ControlAssumed::getTimeSeconds() const
+{
+	return m_timeSeconds.get();
+}
+
+//-----------------------------------------------------------------------
+/**
+ * The Drop Client message is sent from Connection Server to the Game Server
+ * when a particular client needs to be dropped from the game server
+ * 
+ */
+class DropClient : public GameNetworkMessage
+{
+  public:
+    explicit DropClient (NetworkId oid);
+    DropClient (Archive::ReadIterator & source);
+    virtual ~DropClient ();
+
+    void 				   setImmediate(bool newValue);
+    
+    NetworkId                              getNetworkId() const;
+    bool				   getImmediate() const;
+
+  private:
+    Archive::AutoVariable<NetworkId>       m_oid;
+    Archive::AutoVariable<bool>		   m_immediate;
+
+    DropClient();
+    DropClient(const DropClient &);
+    DropClient& operator = (const DropClient &);
+};
+
+//-----------------------------------------------------------------------
+
+inline void DropClient::setImmediate(bool newValue)
+{
+    m_immediate.set(newValue);
+}
+
+inline bool DropClient::getImmediate() const
+{
+    return m_immediate.get();
+}
+
+inline NetworkId DropClient::getNetworkId() const
+{
+    return m_oid.get();
+}
+
+//-----------------------------------------------------------------------
+/**
+ * The KickPlayer message is sent from Game Server to Connection Server
+ * in order to forcibly disconnect a client.
+ * 
+ */
+class KickPlayer : public GameNetworkMessage
+{
+  public:
+    KickPlayer (const NetworkId& oid, const std::string & reason);
+    KickPlayer (Archive::ReadIterator & source);
+    virtual ~KickPlayer ();
+
+    const NetworkId &                     getNetworkId() const;
+	const std::string &                   getReason() const;
+	
+  private:
+    Archive::AutoVariable<NetworkId>       m_oid;
+	Archive::AutoVariable<std::string>     m_reason;
+
+    KickPlayer();
+    KickPlayer(const KickPlayer &);
+    KickPlayer& operator = (const KickPlayer &);
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId& KickPlayer::getNetworkId() const
+{
+    return m_oid.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string& KickPlayer::getReason() const
+{
+	return m_reason.get();
+}
+
+//-----------------------------------------------------------------------
+
+class GameClientMessage : public GameNetworkMessage
+{
+public:
+	
+	GameClientMessage (const std::vector<NetworkId> & distributionList, bool reliable, const GameNetworkMessage& msg);
+	GameClientMessage (const std::vector<NetworkId> & distributionList, bool reliable, Archive::ReadIterator & msg);
+    GameClientMessage (Archive::ReadIterator & source);
+    ~GameClientMessage();
+	
+	const std::vector<NetworkId> &   getDistributionList  () const;
+    bool                       getReliable          () const;
+    const Archive::ByteStream& getByteStream        () const;
+	// @todo : this is a hack. Implement bytestreams with iterators!!!!!!
+	void                       pack(Archive::ByteStream & target) const; // special handling for multiple reads    
+	
+private:
+	
+    Archive::AutoArray<NetworkId>              distributionList;
+    Archive::AutoVariable<bool>                reliable;
+    Archive::AutoVariable<Archive::ByteStream> byteStream;
+    
+    GameClientMessage();
+    GameClientMessage(const GameClientMessage&);
+    const GameClientMessage& operator= (GameClientMessage&);
+};
+
+//-----------------------------------------------------------------------
+inline const std::vector<NetworkId> & GameClientMessage::getDistributionList() const
+{
+    return distributionList.get();
+}
+
+//-----------------------------------------------------------------------
+inline bool GameClientMessage::getReliable() const
+{
+    return reliable.get();
+}
+//-----------------------------------------------------------------------
+
+inline const Archive::ByteStream & GameClientMessage::getByteStream() const
+{
+    return byteStream.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _GameConnectionServerMessages_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/NewClient.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/NewClient.cpp
new file mode 100644
index 00000000..64017d49
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/NewClient.cpp
@@ -0,0 +1,246 @@
+// ======================================================================
+//
+// NewClient.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/NewClient.h"
+
+// ======================================================================
+
+NewClient::NewClient(NetworkId const & oid, const std::string & account, const std::string & ip, bool isSecure, bool isSkipLoadScreen, unsigned int stationId, const std::vector <NetworkId> *observedObjects, uint32 gameFeatures, uint32 subscriptionFeatures, 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, bool canSkipTutorial, bool sendToStarport ) :
+	GameNetworkMessage("NewClient"),
+	m_account(account),
+	m_ipAddr(ip),
+	m_oid(oid),
+	m_secure(isSecure),
+	m_skipLoadScreen(isSkipLoadScreen),
+	m_stationId(stationId),
+	m_observedObjects(),
+	m_gameFeatures(gameFeatures),
+	m_subscriptionFeatures(subscriptionFeatures),
+	m_entitlementTotalTime(entitlementTotalTime),
+	m_entitlementEntitledTime(entitlementEntitledTime),
+	m_entitlementTotalTimeSinceLastLogin(entitlementTotalTimeSinceLastLogin),
+	m_entitlementEntitledTimeSinceLastLogin(entitlementEntitledTimeSinceLastLogin),
+	m_buddyPoints(buddyPoints),
+	m_consumedRewardEvents(),
+	m_claimedRewardItems(),
+	m_usingAdminLogin(usingAdminLogin),
+	m_canSkipTutorial(canSkipTutorial),
+	m_sendToStarport(sendToStarport)
+{
+	if (observedObjects)
+		m_observedObjects.set(*observedObjects);
+
+	m_consumedRewardEvents.set(consumedRewardEvents);
+	m_claimedRewardItems.set(claimedRewardItems);
+			
+	addVariable(m_account);
+	addVariable(m_ipAddr);
+	addVariable(m_oid);
+	addVariable(m_secure);
+	addVariable(m_skipLoadScreen);
+	addVariable(m_stationId);
+	addVariable(m_observedObjects);
+	addVariable(m_gameFeatures);
+	addVariable(m_subscriptionFeatures);
+	addVariable(m_entitlementTotalTime);
+	addVariable(m_entitlementEntitledTime);
+	addVariable(m_entitlementTotalTimeSinceLastLogin);
+	addVariable(m_entitlementEntitledTimeSinceLastLogin);
+	addVariable(m_buddyPoints);
+	addVariable(m_consumedRewardEvents);
+	addVariable(m_claimedRewardItems);
+	addVariable(m_usingAdminLogin);	
+	addVariable(m_canSkipTutorial);	
+	addVariable(m_sendToStarport);
+}
+
+//-----------------------------------------------------------------------
+
+NewClient::NewClient (Archive::ReadIterator & source) : 
+	GameNetworkMessage("NewClient"),
+	m_account(),
+	m_ipAddr(),
+	m_oid(NetworkId::cms_invalid),
+	m_secure(false),
+	m_skipLoadScreen(false),
+	m_stationId(0),
+	m_observedObjects(),
+	m_gameFeatures(0),
+	m_subscriptionFeatures(0),
+	m_entitlementTotalTime(0),
+	m_entitlementEntitledTime(0),
+	m_entitlementTotalTimeSinceLastLogin(0),
+	m_entitlementEntitledTimeSinceLastLogin(0),
+	m_buddyPoints(0),
+	m_consumedRewardEvents(),
+	m_claimedRewardItems(),
+	m_usingAdminLogin(false),
+	m_canSkipTutorial(false),
+	m_sendToStarport(false)
+{
+	addVariable(m_account);
+	addVariable(m_ipAddr);
+	addVariable(m_oid);
+	addVariable(m_secure);
+	addVariable(m_skipLoadScreen);
+	addVariable(m_stationId);
+	addVariable(m_observedObjects);
+	addVariable(m_gameFeatures);
+	addVariable(m_subscriptionFeatures);
+	addVariable(m_entitlementTotalTime);
+	addVariable(m_entitlementEntitledTime);
+	addVariable(m_entitlementTotalTimeSinceLastLogin);
+	addVariable(m_entitlementEntitledTimeSinceLastLogin);
+	addVariable(m_buddyPoints);
+	addVariable(m_consumedRewardEvents);
+	addVariable(m_claimedRewardItems);
+	addVariable(m_usingAdminLogin);	
+	addVariable(m_canSkipTutorial);	
+	addVariable(m_sendToStarport);	
+
+	unpack(source);  //lint !e1506 Call to virtual from constructor
+}
+
+//-----------------------------------------------------------------------
+
+NewClient::~NewClient()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & NewClient::getAccountName() const
+{
+	return m_account.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & NewClient::getIpAddress() const
+{
+	return m_ipAddr.get();
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId &NewClient::getNetworkId() const
+{
+	return m_oid.get();
+}
+//-----------------------------------------------------------------------
+
+bool NewClient::getIsSecure() const
+{
+	return m_secure.get();
+}
+
+//-----------------------------------------------------------------------
+
+const unsigned int NewClient::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+bool NewClient::getIsSkipLoadScreen() const
+{
+	return m_skipLoadScreen.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::vector<NetworkId> &NewClient::getObservedObjects() const
+{
+	return m_observedObjects.get();
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int NewClient::getGameFeatures() const
+{
+	return m_gameFeatures.get();
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int NewClient::getSubscriptionFeatures() const
+{
+	return m_subscriptionFeatures.get();
+}
+
+// ----------------------------------------------------------------------
+
+unsigned int NewClient::getEntitlementTotalTime() const
+{
+	return m_entitlementTotalTime.get();
+}
+
+// ----------------------------------------------------------------------
+
+unsigned int NewClient::getEntitlementEntitledTime() const
+{
+	return m_entitlementEntitledTime.get();
+}
+
+// ----------------------------------------------------------------------
+
+unsigned int NewClient::getEntitlementTotalTimeSinceLastLogin() const
+{
+	return m_entitlementTotalTimeSinceLastLogin.get();
+}
+
+// ----------------------------------------------------------------------
+
+unsigned int NewClient::getEntitlementEntitledTimeSinceLastLogin() const
+{
+	return m_entitlementEntitledTimeSinceLastLogin.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<std::pair<NetworkId, std::string> > const & NewClient::getConsumedRewardEvents() const
+{
+	return m_consumedRewardEvents.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<std::pair<NetworkId, std::string> > const & NewClient::getClaimedRewardItems() const
+{
+	return m_claimedRewardItems.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool NewClient::getUsingAdminLogin() const
+{
+	return m_usingAdminLogin.get();
+}
+
+// ----------------------------------------------------------------------
+
+int NewClient::getBuddyPoints() const
+{
+	return m_buddyPoints.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool NewClient::getCanSkipTutorial() const
+{
+        return m_canSkipTutorial.get();
+}
+
+bool NewClient::getSendToStarport() const
+{
+        return m_sendToStarport.get();
+}
+
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/NewClient.h b/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/NewClient.h
new file mode 100644
index 00000000..ba0613ec
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/NewClient.h
@@ -0,0 +1,77 @@
+// ======================================================================
+//
+// NewClient.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_NewClient_H
+#define INCLUDED_NewClient_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * The New Client message is sent from Connection Server to the Game Server
+ * when that connection server tells the game server that an object is being remotely controlled
+ * by one of its clients.
+ */
+class NewClient : public GameNetworkMessage
+{
+public:
+	NewClient (NetworkId const & oid, const std::string & account, const std::string & ip, bool isSecure, bool isSkipLoadScreen, unsigned int stationId, const std::vector <NetworkId> *observedObjects, uint32 gameFeatures, uint32 subscriptionFeatures, 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, bool canSkipTutorial, bool sendToStarport=false );
+	NewClient (Archive::ReadIterator & source);
+	virtual ~NewClient ();
+
+	const std::string &  getAccountName() const;
+	const std::string &  getIpAddress() const;
+	const NetworkId &    getNetworkId() const;
+	bool                 getIsSecure() const;
+	bool                 getIsSkipLoadScreen() const;
+	const unsigned int   getStationId() const;
+	const std::vector<NetworkId> & getObservedObjects() const;
+	unsigned int         getGameFeatures() const;
+	unsigned int         getSubscriptionFeatures() const;
+	unsigned int         getEntitlementTotalTime  () const;
+	unsigned int         getEntitlementEntitledTime () const;
+	unsigned int         getEntitlementTotalTimeSinceLastLogin () const;
+	unsigned int         getEntitlementEntitledTimeSinceLastLogin () const;
+	int                  getBuddyPoints () const;
+	std::vector<std::pair<NetworkId, std::string> > const & getConsumedRewardEvents() const;
+	std::vector<std::pair<NetworkId, std::string> > const & getClaimedRewardItems() const;
+	bool                 getUsingAdminLogin() const;
+	bool                 getCanSkipTutorial() const;
+	bool	 	     getSendToStarport() const;
+
+private:
+	Archive::AutoVariable<std::string>     m_account;
+	Archive::AutoVariable<std::string>     m_ipAddr;
+	Archive::AutoVariable<NetworkId>       m_oid;
+	Archive::AutoVariable<bool>            m_secure;
+	Archive::AutoVariable<bool>            m_skipLoadScreen;
+	Archive::AutoVariable<unsigned int>    m_stationId;
+	Archive::AutoArray<NetworkId>          m_observedObjects;
+	Archive::AutoVariable<unsigned int>    m_gameFeatures;
+	Archive::AutoVariable<unsigned int>    m_subscriptionFeatures;
+	Archive::AutoVariable<unsigned int>    m_entitlementTotalTime;
+	Archive::AutoVariable<unsigned int>    m_entitlementEntitledTime;
+	Archive::AutoVariable<unsigned int>    m_entitlementTotalTimeSinceLastLogin;
+	Archive::AutoVariable<unsigned int>    m_entitlementEntitledTimeSinceLastLogin;
+	Archive::AutoVariable<int>             m_buddyPoints;
+	Archive::AutoArray<std::pair<NetworkId, std::string> >  m_consumedRewardEvents;
+	Archive::AutoArray<std::pair<NetworkId, std::string> >  m_claimedRewardItems;
+	Archive::AutoVariable<bool>            m_usingAdminLogin;
+	Archive::AutoVariable<bool>            m_canSkipTutorial;
+	Archive::AutoVariable<bool>            m_sendToStarport;
+	
+	NewClient();
+	NewClient(const NewClient &);
+	NewClient& operator = (const NewClient &);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.cpp
new file mode 100644
index 00000000..bf68895b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.cpp
@@ -0,0 +1,71 @@
+// ======================================================================
+//
+// ResourceTypeMessage.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/AddResourceTypeMessage.h"
+
+// ======================================================================
+
+AddResourceTypeMessage::AddResourceTypeMessage(stdvector<AddResourceTypeMessageNamespace::ResourceTypeData>::fwd const &data) :
+	GameNetworkMessage("AddResourceTypeMessage"),
+	m_data()
+{
+	m_data.set(data);
+	addVariable(m_data);
+}
+
+//-----------------------------------------------------------------------
+
+AddResourceTypeMessage::AddResourceTypeMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("AddResourceTypeMessage"),
+	m_data()
+{
+	addVariable(m_data);
+	unpack(source); //lint !e1506 // virtual in constructor
+}
+
+//-----------------------------------------------------------------------
+
+AddResourceTypeMessage::~AddResourceTypeMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<AddResourceTypeMessageNamespace::ResourceTypeData> const & AddResourceTypeMessage::getData() const
+{
+	return m_data.get();
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, AddResourceTypeMessageNamespace::ResourceTypeData & target)
+	{
+		get(source, target.m_networkId);
+		get(source, target.m_name);
+		get(source, target.m_depletedTimestamp);
+		get(source, target.m_parentClass);
+		get(source, target.m_attributes);
+		get(source, target.m_fractalSeeds);
+	}
+
+	// ----------------------------------------------------------------------
+	
+	void put(ByteStream & target, const AddResourceTypeMessageNamespace::ResourceTypeData & source)
+	{
+		put(target, source.m_networkId);
+		put(target, source.m_name);
+		put(target, source.m_depletedTimestamp);
+		put(target, source.m_parentClass);
+		put(target, source.m_attributes);
+		put(target, source.m_fractalSeeds);
+	}
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.h
new file mode 100644
index 00000000..4758c08c
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.h
@@ -0,0 +1,64 @@
+// ======================================================================
+//
+// AddResourceTypeMessage.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AddResourceTypeMessage_H
+#define INCLUDED_AddResourceTypeMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+namespace AddResourceTypeMessageNamespace
+{
+	class ResourceTypeData
+	{
+	  public:
+		NetworkId m_networkId;
+		std::string m_name;
+		uint32 m_depletedTimestamp;
+		std::string m_parentClass;
+		std::vector<std::pair<std::string, int> > m_attributes;
+		std::vector<std::pair<NetworkId, int> > m_fractalSeeds;
+	};
+}
+
+// ======================================================================
+
+/**
+ * Sent from:  Game Server or DB Process
+ * Sent to:  Game Server or DB Process
+ * Action:  Add the specified resource types
+ */
+class AddResourceTypeMessage : public GameNetworkMessage
+{
+  public:
+	AddResourceTypeMessage  (stdvector<AddResourceTypeMessageNamespace::ResourceTypeData>::fwd const &data);
+	AddResourceTypeMessage  (Archive::ReadIterator & source);
+	~AddResourceTypeMessage ();
+
+	stdvector<AddResourceTypeMessageNamespace::ResourceTypeData>::fwd const & getData() const;
+	
+  private:
+	Archive::AutoArray<AddResourceTypeMessageNamespace::ResourceTypeData> m_data;
+	
+  private:        
+	AddResourceTypeMessage(const AddResourceTypeMessage&);
+	AddResourceTypeMessage& operator= (const AddResourceTypeMessage&);
+};
+
+namespace Archive
+{
+	void get(ReadIterator & source, AddResourceTypeMessageNamespace::ResourceTypeData & target);
+	void put(ByteStream & target, const AddResourceTypeMessageNamespace::ResourceTypeData & source);
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.cpp
new file mode 100644
index 00000000..375cc179
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.cpp
@@ -0,0 +1,66 @@
+// ======================================================================
+//
+// AiCreatureStateMessage.cpp
+// copyright 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/AiCreatureStateMessage.h"
+
+#include "serverNetworkMessages/GameServerMessageInterface.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(AiCreatureStateMessage, CM_aiCreatureState);
+
+// ======================================================================
+//
+// AiCreatureStateMessage
+//
+// ======================================================================
+
+// ----------------------------------------------------------------------
+AiCreatureStateMessage::AiCreatureStateMessage()
+ : m_networkId()
+ , m_movement()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void AiCreatureStateMessage::pack(MessageQueue::Data const * const data, Archive::ByteStream & target)
+{
+	AiCreatureStateMessage const * const msg = safe_cast<const AiCreatureStateMessage *>(data);
+
+	if (msg != NULL)
+	{
+		if (GameServerMessageInterface::getInstance() != NULL)
+		{
+			GameServerMessageInterface::getInstance()->pack(target, *msg);
+		}
+	}
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueue::Data * AiCreatureStateMessage::unpack(Archive::ReadIterator & source)
+{
+	AiCreatureStateMessage * msg = new AiCreatureStateMessage();
+
+	if (msg != NULL)
+	{
+		if (GameServerMessageInterface::getInstance() != NULL)
+		{
+			GameServerMessageInterface::getInstance()->unpack(source, *msg);
+		}
+	}
+
+	return msg;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.h
new file mode 100644
index 00000000..9addbd87
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiCreatureStateMessage.h
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// AiCreatureStateMessage.h
+// copyright 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiCreatureStateMessage_H
+#define INCLUDED_AiCreatureStateMessage_H
+
+#include "serverGame/AiMovementBase.h"
+#include "serverNetworkMessages/AiMovementMessage.h"
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedUtility/Location.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class AiCreatureStateMessage;
+
+namespace Archive
+{
+	// Implemented in AiMovementArchive
+
+	void get(ReadIterator & source, AiCreatureStateMessage & target);
+	void put(ByteStream & target, const AiCreatureStateMessage & source);
+}
+
+// ----------------------------------------------------------------------
+class AiCreatureStateMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+	friend void Archive::get(ReadIterator & source, AiCreatureStateMessage & target);
+
+public:
+
+	AiCreatureStateMessage();
+
+	NetworkId m_networkId;
+	AiMovementMessage m_movement;
+};
+
+// ======================================================================
+
+#endif	// INCLUDED_AiCreatureStateMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.cpp
new file mode 100644
index 00000000..13635ad4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.cpp
@@ -0,0 +1,96 @@
+// ======================================================================
+//
+// AiMovementMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/AiMovementMessage.h"
+
+#include "serverNetworkMessages/GameServerMessageInterface.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(AiMovementMessage, CM_aiSetMovement);
+
+
+//=======================================================================
+
+AiMovementMessage::AiMovementMessage() : 
+	m_objectId(),
+	m_movement()
+{
+}
+
+//-----------------------------------------------------------------------
+
+AiMovementMessage::AiMovementMessage(const NetworkId & objectId, AiMovementBasePtr behavior) : 
+	m_objectId(objectId),
+	m_movement(behavior)
+{
+}
+
+//-----------------------------------------------------------------------
+
+AiMovementMessage::AiMovementMessage(const NetworkId & objectId) : 
+	m_objectId(objectId),
+	m_movement()
+{
+}
+
+//-----------------------------------------------------------------------
+
+AiMovementMessage::~AiMovementMessage()
+{
+	m_movement = AiMovementBaseNullPtr;
+}
+
+//-----------------------------------------------------------------------
+
+void AiMovementMessage::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const AiMovementMessage * const msg = safe_cast<const AiMovementMessage *> (data);
+	if (msg)
+	{
+		if (GameServerMessageInterface::getInstance() != NULL)
+			GameServerMessageInterface::getInstance()->pack(target, *msg);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* AiMovementMessage::unpack(Archive::ReadIterator & source)
+{
+	AiMovementMessage * msg = new AiMovementMessage();
+	if (msg)
+	{
+		if (GameServerMessageInterface::getInstance() != NULL)
+			GameServerMessageInterface::getInstance()->unpack(source, *msg);
+	}
+	return msg;
+}
+
+//-----------------------------------------------------------------------
+AiMovementType AiMovementMessage::getMovementType() const
+{
+	AiMovementType result = AMT_idle;
+
+	if (m_movement != AiMovementBaseNullPtr)
+	{
+		result = m_movement->getType();
+	}
+
+	return result;
+}
+
+//=======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.h
new file mode 100644
index 00000000..7cec0cf4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AiMovementMessage.h
@@ -0,0 +1,72 @@
+// ======================================================================
+//
+// AiMovementMessage.h
+// copyright(c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AiMovementMessage_H
+#define INCLUDED_AiMovementMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "serverGame/AiMovementBase.h"
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class AiMovementMessage;
+
+namespace Archive
+{
+	// implemented in serverGame
+	void get(ReadIterator & source, AiMovementMessage & target);
+	void put(ByteStream & target, const AiMovementMessage & source);
+}
+
+// ======================================================================
+
+/**
+ * Used to tell proxies an authoritative object's current behavior.
+ * We don't use auto-syncronization since the data is stored on the 
+ * controller.
+ */
+class AiMovementMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+	friend void Archive::get(ReadIterator & source, AiMovementMessage & target);
+
+public:
+	         AiMovementMessage();
+	         AiMovementMessage(const NetworkId & objectId, AiMovementBasePtr behavior);
+	         AiMovementMessage(const NetworkId & objectId);
+	virtual ~AiMovementMessage();
+
+	const NetworkId & getObjectId() const;
+	AiMovementType getMovementType() const;
+	AiMovementBasePtr getMovement() const;
+
+private:
+
+	NetworkId         m_objectId;
+	AiMovementBasePtr m_movement;
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & AiMovementMessage::getObjectId() const
+{
+	return m_objectId;
+}
+
+//-----------------------------------------------------------------------
+
+inline AiMovementBasePtr AiMovementMessage::getMovement() const
+{
+	return m_movement;
+}
+
+// ======================================================================
+
+#endif	// INCLUDED_AiMovementMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AuthTransferClientMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AuthTransferClientMessage.cpp
new file mode 100644
index 00000000..95653b42
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AuthTransferClientMessage.cpp
@@ -0,0 +1,169 @@
+// ======================================================================
+//
+// AuthTransferClientMessage.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/AuthTransferClientMessage.h"
+
+// ======================================================================
+
+AuthTransferClientMessage::AuthTransferClientMessage(NetworkId const & networkId,
+                                                     std::string const & connectionServerIp,
+                                                     uint16 const connectionServerPort,
+                                                     bool const skipLoadScreen,
+                                                     std::string const & account,
+                                                     std::string const & ipAddr,
+                                                     bool const secure,
+                                                     unsigned int const stationId,
+                                                     std::vector<NetworkId> const * observedObjects,
+                                                     uint32 const gameFeatures,
+                                                     uint32 const subscriptionFeatures,
+                                                     std::map<uint32, int> const & accountFeatureIds,
+                                                     unsigned int entitlementTotalTime,
+                                                     unsigned int entitlementEntitledTime,
+                                                     unsigned int entitlementTotalTimeSinceLastLogin,
+                                                     unsigned int entitlementEntitledTimeSinceLastLogin,
+													 int buddyPoints,
+                                                     uint32 sourceServerPid,
+                                                     std::vector<std::pair<NetworkId, std::string> > const & consumedRewardEvents,
+                                                     std::vector<std::pair<NetworkId, std::string> > const & claimedRewardItems,
+													 bool usingAdminLogin,
+													 int combatSpamFilter,
+													 int combatSpamRangeSquaredFilter,
+													 int furnitureRotationDegree,
+													 bool hasUnoccupiedJediSlot,
+													 bool isJediSlotCharacter) :
+	GameNetworkMessage("AuthTransferClientMessage"),
+	m_networkId(networkId),
+	m_connectionServerIp(connectionServerIp),
+	m_connectionServerPort(connectionServerPort),
+	m_skipLoadScreen(skipLoadScreen),
+	m_account(account),
+	m_ipAddr(ipAddr),
+	m_secure(secure),
+	m_stationId(stationId),
+	m_observedObjects(),
+	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_sourceServerPid(sourceServerPid),
+	m_consumedRewardEvents(),
+	m_claimedRewardItems(),
+	m_usingAdminLogin(usingAdminLogin),
+	m_combatSpamFilter(combatSpamFilter),
+	m_combatSpamRangeSquaredFilter(combatSpamRangeSquaredFilter),
+	m_furnitureRotationDegree(furnitureRotationDegree),
+	m_hasUnoccupiedJediSlot(hasUnoccupiedJediSlot),
+	m_isJediSlotCharacter(isJediSlotCharacter)
+{
+	if (observedObjects)
+		m_observedObjects.set(*observedObjects);
+	m_consumedRewardEvents.set(consumedRewardEvents);
+	m_claimedRewardItems.set(claimedRewardItems);
+	
+	addVariable(m_networkId);
+	addVariable(m_connectionServerIp);
+	addVariable(m_connectionServerPort);
+	addVariable(m_skipLoadScreen);
+	addVariable(m_account);
+	addVariable(m_ipAddr);
+	addVariable(m_secure);
+	addVariable(m_stationId);
+	addVariable(m_observedObjects);
+	addVariable(m_gameFeatures);
+	addVariable(m_subscriptionFeatures);
+	addVariable(m_accountFeatureIds);
+	addVariable(m_entitlementTotalTime);
+	addVariable(m_entitlementEntitledTime);
+	addVariable(m_entitlementTotalTimeSinceLastLogin);
+	addVariable(m_entitlementEntitledTimeSinceLastLogin);
+	addVariable(m_buddyPoints);
+	addVariable(m_sourceServerPid);
+	addVariable(m_consumedRewardEvents);
+	addVariable(m_claimedRewardItems);
+	addVariable(m_usingAdminLogin);
+	addVariable(m_combatSpamFilter);
+	addVariable(m_combatSpamRangeSquaredFilter);
+	addVariable(m_furnitureRotationDegree);
+	addVariable(m_hasUnoccupiedJediSlot);
+	addVariable(m_isJediSlotCharacter);
+}
+
+// ----------------------------------------------------------------------
+
+AuthTransferClientMessage::AuthTransferClientMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("AuthTransferClientMessage"),
+	m_networkId(),
+	m_connectionServerIp(),
+	m_connectionServerPort(),
+	m_skipLoadScreen(),
+	m_account(),
+	m_ipAddr(),
+	m_secure(),
+	m_stationId(),
+	m_observedObjects(),
+	m_gameFeatures(),
+	m_subscriptionFeatures(),
+	m_accountFeatureIds(),
+	m_entitlementTotalTime(),
+	m_entitlementEntitledTime(),
+	m_entitlementTotalTimeSinceLastLogin(),
+	m_entitlementEntitledTimeSinceLastLogin(),
+	m_buddyPoints(),
+	m_sourceServerPid(),
+	m_consumedRewardEvents(),
+	m_claimedRewardItems(),
+	m_usingAdminLogin(),
+	m_combatSpamFilter(),
+	m_combatSpamRangeSquaredFilter(),
+	m_furnitureRotationDegree(),
+	m_hasUnoccupiedJediSlot(),
+	m_isJediSlotCharacter()
+{
+	addVariable(m_networkId);
+	addVariable(m_connectionServerIp);
+	addVariable(m_connectionServerPort);
+	addVariable(m_skipLoadScreen);
+	addVariable(m_account);
+	addVariable(m_ipAddr);
+	addVariable(m_secure);
+	addVariable(m_stationId);
+	addVariable(m_observedObjects);
+	addVariable(m_gameFeatures);
+	addVariable(m_subscriptionFeatures);
+	addVariable(m_accountFeatureIds);
+	addVariable(m_entitlementTotalTime);
+	addVariable(m_entitlementEntitledTime);
+	addVariable(m_entitlementTotalTimeSinceLastLogin);
+	addVariable(m_entitlementEntitledTimeSinceLastLogin);
+	addVariable(m_buddyPoints);
+	addVariable(m_sourceServerPid);
+	addVariable(m_consumedRewardEvents);
+	addVariable(m_claimedRewardItems);
+	addVariable(m_usingAdminLogin);
+	addVariable(m_combatSpamFilter);
+	addVariable(m_combatSpamRangeSquaredFilter);
+	addVariable(m_furnitureRotationDegree);
+	addVariable(m_hasUnoccupiedJediSlot);
+	addVariable(m_isJediSlotCharacter);
+
+	unpack(source);  //lint !e1506 Call to virtual from constructor
+}
+
+// ----------------------------------------------------------------------
+
+AuthTransferClientMessage::~AuthTransferClientMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AuthTransferClientMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AuthTransferClientMessage.h
new file mode 100644
index 00000000..e39eaf0f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AuthTransferClientMessage.h
@@ -0,0 +1,297 @@
+// ======================================================================
+//
+// AuthTransferClientMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_AuthTransferClientMessage_H
+#define	_INCLUDED_AuthTransferClientMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include <map>
+
+// ======================================================================
+
+class AuthTransferClientMessage: public GameNetworkMessage
+{
+public:
+	AuthTransferClientMessage(NetworkId const & networkId,
+	                          std::string const & connectionServerIp,
+	                          uint16 connectionServerPort,
+	                          bool skipLoadScreen,
+	                          std::string const & account,
+	                          std::string const & ipAddr,
+	                          bool secure,
+	                          unsigned int stationId,
+	                          std::vector<NetworkId> const * observedObjects,
+	                          uint32 gameFeatures,
+	                          uint32 subscriptionFeatures,
+	                          std::map<uint32, int> const & accountFeatureIds,
+	                          unsigned int entitlementTotalTime,
+	                          unsigned int entitlementEntitledTime,
+	                          unsigned int entitlementTotalTimeSinceLastLogin,
+	                          unsigned int entitlementEntitledTimeSinceLastLogin,
+							  int buddyPoints,
+	                          uint32 sourceServerPid,
+	                          std::vector<std::pair<NetworkId, std::string> > const & consumedRewardEvents,
+	                          std::vector<std::pair<NetworkId, std::string> > const & claimedRewardItems,
+							  bool usingAdminLogin,
+							  int combatSpamFilter,
+							  int combatSpamRangeSquaredFilter,
+							  int furnitureRotationDegree,
+							  bool hasUnoccupiedJediSlot,
+							  bool isJediSlotCharacter);
+
+	AuthTransferClientMessage(Archive::ReadIterator &source);
+	~AuthTransferClientMessage();
+
+public:
+	NetworkId const &                      getNetworkId() const;
+	std::string const &                    getConnectionServerIp() const;
+	uint16                                 getConnectionServerPort() const;
+	bool                                   getSkipLoadScreen() const;
+	std::string const &                    getAccount() const;
+	std::string const &                    getIpAddress() const;
+	bool                                   getSecure() const;
+	unsigned int                           getStationId() const;
+	std::vector<NetworkId> const &         getObservedObjects() const;
+	uint32                                 getGameFeatures() const;
+	uint32                                 getSubscriptionFeatures() const;
+	std::map<uint32, int> const &          getAccountFeatureIds() const;
+	unsigned int                           getEntitlementTotalTime  () const;
+	unsigned int                           getEntitlementEntitledTime () const;
+	unsigned int                           getEntitlementTotalTimeSinceLastLogin () const;
+	unsigned int                           getEntitlementEntitledTimeSinceLastLogin () const;
+	int                                    getBuddyPoints() const;
+	uint32                                 getSourceServerPid() const;
+	std::vector<std::pair<NetworkId, std::string> > const & getConsumedRewardEvents() const;
+	std::vector<std::pair<NetworkId, std::string> > const & getClaimedRewardItems() const;
+	bool                                   getUsingAdminLogin() const;
+	int                                    getCombatSpamFilter() const;
+	int                                    getCombatSpamRangeSquaredFilter() const;
+	int                                    getFurnitureRotationDegree() const;
+	bool                                   getHasUnoccupiedJediSlot() const;
+	bool                                   getIsJediSlotCharacter() const;
+
+private:
+	Archive::AutoVariable<NetworkId>       m_networkId;
+	Archive::AutoVariable<std::string>     m_connectionServerIp;
+	Archive::AutoVariable<uint16>          m_connectionServerPort;
+	Archive::AutoVariable<bool>            m_skipLoadScreen;
+	Archive::AutoVariable<std::string>     m_account;
+	Archive::AutoVariable<std::string>     m_ipAddr;
+	Archive::AutoVariable<bool>            m_secure;
+	Archive::AutoVariable<unsigned int>    m_stationId;
+	Archive::AutoArray<NetworkId>          m_observedObjects;
+	Archive::AutoVariable<uint32>          m_gameFeatures;
+	Archive::AutoVariable<uint32>          m_subscriptionFeatures;
+	Archive::AutoVariable<std::map<uint32, int> > m_accountFeatureIds;
+	Archive::AutoVariable<unsigned int>    m_entitlementTotalTime;
+	Archive::AutoVariable<unsigned int>    m_entitlementEntitledTime;
+	Archive::AutoVariable<unsigned int>    m_entitlementTotalTimeSinceLastLogin;
+	Archive::AutoVariable<unsigned int>    m_entitlementEntitledTimeSinceLastLogin;
+	Archive::AutoVariable<int>             m_buddyPoints;
+	Archive::AutoVariable<uint32>          m_sourceServerPid;
+	Archive::AutoArray<std::pair<NetworkId, std::string> > m_consumedRewardEvents;
+	Archive::AutoArray<std::pair<NetworkId, std::string> > m_claimedRewardItems;
+	Archive::AutoVariable<bool>            m_usingAdminLogin;
+	Archive::AutoVariable<int>             m_combatSpamFilter;
+	Archive::AutoVariable<int>             m_combatSpamRangeSquaredFilter;
+	Archive::AutoVariable<int>             m_furnitureRotationDegree;
+	Archive::AutoVariable<bool>            m_hasUnoccupiedJediSlot;
+	Archive::AutoVariable<bool>            m_isJediSlotCharacter;
+
+private:
+	AuthTransferClientMessage(AuthTransferClientMessage const &);
+	AuthTransferClientMessage &operator=(AuthTransferClientMessage const &);
+};
+
+// ======================================================================
+
+inline NetworkId const & AuthTransferClientMessage::getNetworkId() const
+{
+	return m_networkId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & AuthTransferClientMessage::getConnectionServerIp() const
+{
+	return m_connectionServerIp.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline uint16 AuthTransferClientMessage::getConnectionServerPort() const
+{
+	return m_connectionServerPort.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool AuthTransferClientMessage::getSkipLoadScreen() const
+{
+	return m_skipLoadScreen.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & AuthTransferClientMessage::getAccount() const
+{
+	return m_account.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & AuthTransferClientMessage::getIpAddress() const
+{
+	return m_ipAddr.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool AuthTransferClientMessage::getSecure() const
+{
+	return m_secure.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned int AuthTransferClientMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::vector<NetworkId> const & AuthTransferClientMessage::getObservedObjects() const
+{
+	return m_observedObjects.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline uint32 AuthTransferClientMessage::getGameFeatures() const
+{
+	return m_gameFeatures.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline uint32 AuthTransferClientMessage::getSubscriptionFeatures() const
+{
+	return m_subscriptionFeatures.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::map<uint32, int> const & AuthTransferClientMessage::getAccountFeatureIds() const
+{
+	return m_accountFeatureIds.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int AuthTransferClientMessage::getEntitlementTotalTime() const
+{
+	return m_entitlementTotalTime.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int AuthTransferClientMessage::getEntitlementEntitledTime() const
+{
+	return m_entitlementEntitledTime.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int AuthTransferClientMessage::getEntitlementTotalTimeSinceLastLogin() const
+{
+	return m_entitlementTotalTimeSinceLastLogin.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int AuthTransferClientMessage::getEntitlementEntitledTimeSinceLastLogin() const
+{
+	return m_entitlementEntitledTimeSinceLastLogin.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuthTransferClientMessage::getBuddyPoints() const
+{
+	return m_buddyPoints.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 AuthTransferClientMessage::getSourceServerPid() const
+{
+	return m_sourceServerPid.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::vector<std::pair<NetworkId, std::string> > const & AuthTransferClientMessage::getConsumedRewardEvents() const
+{
+	return m_consumedRewardEvents.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::vector<std::pair<NetworkId, std::string> > const & AuthTransferClientMessage::getClaimedRewardItems() const
+{
+	return m_claimedRewardItems.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool AuthTransferClientMessage::getUsingAdminLogin() const
+{
+	return m_usingAdminLogin.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuthTransferClientMessage::getCombatSpamFilter() const
+{
+	return m_combatSpamFilter.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuthTransferClientMessage::getCombatSpamRangeSquaredFilter() const
+{
+	return m_combatSpamRangeSquaredFilter.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuthTransferClientMessage::getFurnitureRotationDegree() const
+{
+	return m_furnitureRotationDegree.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool AuthTransferClientMessage::getHasUnoccupiedJediSlot() const
+{
+	return m_hasUnoccupiedJediSlot.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool AuthTransferClientMessage::getIsJediSlotCharacter() const
+{
+	return m_isJediSlotCharacter.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_AuthTransferClientMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BiographyMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BiographyMessage.cpp
new file mode 100644
index 00000000..9be749ca
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BiographyMessage.cpp
@@ -0,0 +1,42 @@
+//========================================================================
+//
+// BiographyMessage.cpp - tells Gameserver object baseline data has ended.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/BiographyMessage.h"
+
+//-----------------------------------------------------------------------
+
+BiographyMessage::BiographyMessage(const NetworkId &owner, const Unicode::String &bio) :
+	GameNetworkMessage("BiographyMessage"),
+	m_owner(owner),
+	m_bio(bio)
+{
+	addVariable(m_owner);
+	addVariable(m_bio);
+}
+
+//-----------------------------------------------------------------------
+
+BiographyMessage::BiographyMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("BiographyMessage"),
+		m_owner(),
+		m_bio()
+{
+	addVariable(m_owner);
+	addVariable(m_bio);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+BiographyMessage::~BiographyMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BiographyMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BiographyMessage.h
new file mode 100644
index 00000000..610982fc
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BiographyMessage.h
@@ -0,0 +1,64 @@
+//========================================================================
+//
+// BiographyMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_BiographyMessage_H
+#define	_INCLUDED_BiographyMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:  DBProcess
+ * Action:  Sets the biography for a player
+ *
+ * Sent from:  DBProcess
+ * Sent to:  Game Server
+ * Action:  Gives the game server the biography for a player
+ */
+class BiographyMessage : public GameNetworkMessage
+{
+  public:
+	BiographyMessage  (const NetworkId &owner, const Unicode::String &bio);
+	BiographyMessage  (Archive::ReadIterator & source);
+	~BiographyMessage ();
+
+  public:
+	const NetworkId &getOwner() const;
+	const Unicode::String &getBio() const;
+	
+  private:
+	Archive::AutoVariable<NetworkId> m_owner;
+	Archive::AutoVariable<Unicode::String> m_bio;
+
+  private:
+	BiographyMessage(const BiographyMessage&);
+	BiographyMessage& operator= (const BiographyMessage&);
+};
+
+// ======================================================================
+
+inline const NetworkId &BiographyMessage::getOwner() const
+{
+	return m_owner.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String &BiographyMessage::getBio() const
+{
+	return m_bio.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_BiographyMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetListMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetListMessage.cpp
new file mode 100644
index 00000000..d058c571
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetListMessage.cpp
@@ -0,0 +1,34 @@
+// ======================================================================
+//
+// BountyHunterTargetListMessage.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "BountyHunterTargetListMessage.h"
+
+// ======================================================================
+
+BountyHunterTargetListMessage::BountyHunterTargetListMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("BountyHunterTargetListMessage"),
+	m_targetList()
+{
+	AutoByteStream::addVariable(m_targetList);
+	unpack(source);
+}
+
+BountyHunterTargetListMessage::BountyHunterTargetListMessage(
+	const std::vector< std::pair< NetworkId, NetworkId > > & targetList
+) :
+	GameNetworkMessage("BountyHunterTargetListMessage"),
+	m_targetList(targetList)
+{
+	AutoByteStream::addVariable(m_targetList);
+}
+
+BountyHunterTargetListMessage::~BountyHunterTargetListMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetListMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetListMessage.h
new file mode 100644
index 00000000..2661685d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetListMessage.h
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// BountyHunterTargetListMessage.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef BountyHunterTargetListMessage_h
+#define BountyHunterTargetListMessage_h
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include <vector>
+
+// ======================================================================
+
+class BountyHunterTargetListMessage : public GameNetworkMessage
+{
+public:
+	BountyHunterTargetListMessage(const std::vector< std::pair< NetworkId, NetworkId > > & targetList);
+
+	BountyHunterTargetListMessage(Archive::ReadIterator & source);
+	~BountyHunterTargetListMessage();
+
+	const std::vector< std::pair< NetworkId, NetworkId > > & getTargetList() const;
+
+protected:
+
+private:
+	Archive::AutoVariable<std::vector< std::pair< NetworkId, NetworkId > > > m_targetList;
+};
+
+inline const std::vector< std::pair< NetworkId, NetworkId > > & BountyHunterTargetListMessage::getTargetList() const 
+{
+	return m_targetList.get();
+}
+
+
+// ======================================================================
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetMessage.cpp
new file mode 100644
index 00000000..78f096d2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetMessage.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// BountyHunterTargetMessage.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "BountyHunterTargetMessage.h"
+
+// ======================================================================
+
+BountyHunterTargetMessage::BountyHunterTargetMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("BountyHunterTargetMessage"),
+	m_objectId(),
+	m_targetId()
+{
+	AutoByteStream::addVariable(m_objectId);
+	AutoByteStream::addVariable(m_targetId);
+	unpack(source);
+}
+
+BountyHunterTargetMessage::BountyHunterTargetMessage(
+	const NetworkId & objectId,
+	const NetworkId & targetId
+) :
+	GameNetworkMessage("BountyHunterTargetMessage"),
+	m_objectId(objectId),
+	m_targetId(targetId)
+{
+	AutoByteStream::addVariable(m_objectId);
+	AutoByteStream::addVariable(m_targetId);
+}
+
+BountyHunterTargetMessage::~BountyHunterTargetMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetMessage.h
new file mode 100644
index 00000000..bcbdb23d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/BountyHunterTargetMessage.h
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// BountyHunterTargetMessage.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef BountyHunterTargetMessage_h
+#define BountyHunterTargetMessage_h
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+// ======================================================================
+
+class BountyHunterTargetMessage : public GameNetworkMessage
+{
+public:
+	BountyHunterTargetMessage(
+		const NetworkId & objectId,
+		const NetworkId & targetId);
+
+
+	BountyHunterTargetMessage(Archive::ReadIterator & source);
+	~BountyHunterTargetMessage();
+
+	const NetworkId &          GetObjectId() const {return m_objectId.get();}
+	const NetworkId &          GetTargetId() const {return m_targetId.get();}
+
+protected:
+
+private:
+	Archive::AutoVariable<NetworkId>        m_objectId;
+	Archive::AutoVariable<NetworkId>        m_targetId;
+};
+
+// ======================================================================
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp
new file mode 100644
index 00000000..587764ac
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp
@@ -0,0 +1,63 @@
+// ======================================================================
+//
+// CharacterNamesMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CharacterNamesMessage.h"
+
+// ======================================================================
+
+CharacterNamesMessage::CharacterNamesMessage(const std::vector<NetworkId> &ids, const std::vector<int> &stationIds, const std::vector<std::string> &characterNames, const std::vector<std::string> &characterFullNames, const std::vector<int> &createTimes, const std::vector<int> &loginTimes) :
+		GameNetworkMessage("CharacterNamesMessage"),
+		m_ids(),
+		m_stationIds(),
+		m_names(),
+		m_fullNames(),
+		m_createTimes(),
+		m_loginTimes()
+{
+	m_ids.set(ids);
+	m_stationIds.set(stationIds);
+	m_names.set(characterNames);
+	m_fullNames.set(characterFullNames);
+	m_createTimes.set(createTimes);
+	m_loginTimes.set(loginTimes);
+	
+	addVariable(m_ids);
+	addVariable(m_stationIds);
+	addVariable(m_names);
+	addVariable(m_fullNames);
+	addVariable(m_createTimes);
+	addVariable(m_loginTimes);
+}
+
+// ----------------------------------------------------------------------
+
+CharacterNamesMessage::CharacterNamesMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("CharacterNamesMessage"),
+		m_ids(),
+		m_stationIds(),
+		m_names(),
+		m_fullNames(),
+		m_createTimes(),
+		m_loginTimes()
+{
+	addVariable(m_ids);
+	addVariable(m_stationIds);
+	addVariable(m_names);
+	addVariable(m_fullNames);
+	addVariable(m_createTimes);
+	addVariable(m_loginTimes);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+CharacterNamesMessage::~CharacterNamesMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h
new file mode 100644
index 00000000..a096766f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h
@@ -0,0 +1,95 @@
+// ======================================================================
+//
+// CharacterNamesMessage.h
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_CharacterNamesMessage_H
+#define INCLUDED_CharacterNamesMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Sent From:  GameServer or DatabaseServer
+ *      To:    GameServer
+ * Action:     Tell the GameServer the object ids of a batch of players.
+ *             These will be used to check for name uniqueness, etc.
+ */
+class CharacterNamesMessage : public GameNetworkMessage
+{
+  public:
+	CharacterNamesMessage(const stdvector<NetworkId>::fwd &ids, const stdvector<int>::fwd &stationIds, const stdvector<std::string>::fwd &characterNames, const stdvector<std::string>::fwd &characterFullNames, const stdvector<int>::fwd &createTimes, const stdvector<int>::fwd &loginTimes);
+	CharacterNamesMessage(Archive::ReadIterator & source);
+	~CharacterNamesMessage();
+
+	const std::vector<NetworkId>   &getIds() const;
+	const std::vector<int>         &getStationIds() const;
+	const std::vector<std::string> &getNames() const;
+	const std::vector<std::string> &getFullNames() const;
+	const std::vector<int>         &getCreateTimes() const;
+	const std::vector<int>         &getLoginTimes() const;
+		
+   private:
+	Archive::AutoArray<NetworkId>   m_ids;
+	Archive::AutoArray<int>         m_stationIds;
+	Archive::AutoArray<std::string> m_names;
+	Archive::AutoArray<std::string> m_fullNames;
+	Archive::AutoArray<int>         m_createTimes;
+	Archive::AutoArray<int>         m_loginTimes;
+	
+  private:
+	//disabled functions:
+	CharacterNamesMessage            ();
+	CharacterNamesMessage            (const CharacterNamesMessage&);
+	CharacterNamesMessage& operator= (const CharacterNamesMessage&);
+
+};
+
+// ======================================================================
+
+inline const std::vector<NetworkId> & CharacterNamesMessage::getIds() const
+{
+	return m_ids.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::vector<int> & CharacterNamesMessage::getStationIds() const
+{
+	return m_stationIds.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::vector<std::string> & CharacterNamesMessage::getNames() const
+{
+	return m_names.get();
+}
+		
+// ----------------------------------------------------------------------
+
+inline const std::vector<std::string> & CharacterNamesMessage::getFullNames() const
+{
+	return m_fullNames.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::vector<int> & CharacterNamesMessage::getCreateTimes() const
+{
+	return m_createTimes.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::vector<int> & CharacterNamesMessage::getLoginTimes() const
+{
+	return m_loginTimes.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionCircleMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionCircleMessage.cpp
new file mode 100644
index 00000000..e827ccb1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionCircleMessage.cpp
@@ -0,0 +1,88 @@
+// ======================================================================
+//
+// CreateDynamicRegionCircleMessage.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CreateDynamicRegionCircleMessage.h"
+
+// ======================================================================
+
+CreateDynamicRegionCircleMessage::CreateDynamicRegionCircleMessage(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) :
+	GameNetworkMessage("CreateDynamicRegionCircleMessage"),
+	m_centerX(centerX),
+	m_centerZ(centerZ),
+	m_radius(radius),
+	m_name(name),
+	m_planet(planet),
+	m_pvp(pvp),
+	m_buildable(buildable),
+	m_municipal(municipal),
+	m_geography(geography),
+	m_minDifficulty(minDifficulty),
+	m_maxDifficulty(maxDifficulty),
+	m_spawnable(spawnable),
+	m_mission(mission),
+	m_visible(visible),
+	m_notify(notify)
+{
+	addVariable(m_centerX);
+	addVariable(m_centerZ);
+	addVariable(m_radius);
+	addVariable(m_name);
+	addVariable(m_planet);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_municipal);
+	addVariable(m_geography);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_visible);
+	addVariable(m_notify);
+}
+
+// ----------------------------------------------------------------------
+
+CreateDynamicRegionCircleMessage::CreateDynamicRegionCircleMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("CreateDynamicRegionCircleMessage"),
+	m_centerX(),
+	m_centerZ(),
+	m_radius(),
+	m_name(),
+	m_planet(),
+	m_pvp(),
+	m_buildable(),
+	m_municipal(),
+	m_geography(),
+	m_minDifficulty(),
+	m_maxDifficulty(),
+	m_spawnable(),
+	m_mission(),
+	m_visible(),
+	m_notify()
+{
+	addVariable(m_centerX);
+	addVariable(m_centerZ);
+	addVariable(m_radius);
+	addVariable(m_name);
+	addVariable(m_planet);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_municipal);
+	addVariable(m_geography);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_visible);
+	addVariable(m_notify);
+	unpack(source);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionCircleMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionCircleMessage.h
new file mode 100644
index 00000000..36aaadfb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionCircleMessage.h
@@ -0,0 +1,169 @@
+// ======================================================================
+//
+// CreateDynamicRegionCircleMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_CreateDynamicRegionCircleMessage_H
+#define	_INCLUDED_CreateDynamicRegionCircleMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class CreateDynamicRegionCircleMessage: public GameNetworkMessage
+{
+public:
+	CreateDynamicRegionCircleMessage(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);
+	CreateDynamicRegionCircleMessage(Archive::ReadIterator &source);
+
+	float getCenterX() const;
+	float getCenterZ() const;
+	float getRadius() const;
+	Unicode::String const &getName() const;
+	std::string const &getPlanet() const;
+	int getPvp() const;
+	int getBuildable() const;
+	int getMunicipal() const;
+	int getGeography() const;
+	int getMinDifficulty() const;
+	int getMaxDifficulty() const;
+	int getSpawnable() const;
+	int getMission() const;
+	bool getVisible() const;
+	bool getNotify() const;
+
+private:
+	CreateDynamicRegionCircleMessage(CreateDynamicRegionCircleMessage const &);
+	CreateDynamicRegionCircleMessage &operator=(CreateDynamicRegionCircleMessage const &);
+
+	Archive::AutoVariable<float> m_centerX;
+	Archive::AutoVariable<float> m_centerZ;
+	Archive::AutoVariable<float> m_radius;
+	Archive::AutoVariable<Unicode::String> m_name;
+	Archive::AutoVariable<std::string> m_planet;
+	Archive::AutoVariable<int> m_pvp;
+	Archive::AutoVariable<int> m_buildable;
+	Archive::AutoVariable<int> m_municipal;
+	Archive::AutoVariable<int> m_geography;
+	Archive::AutoVariable<int> m_minDifficulty;
+	Archive::AutoVariable<int> m_maxDifficulty;
+	Archive::AutoVariable<int> m_spawnable;
+	Archive::AutoVariable<int> m_mission;
+	Archive::AutoVariable<bool> m_visible;
+	Archive::AutoVariable<bool> m_notify;
+};
+
+// ----------------------------------------------------------------------
+
+inline float CreateDynamicRegionCircleMessage::getCenterX() const
+{
+	return m_centerX.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float CreateDynamicRegionCircleMessage::getCenterZ() const
+{
+	return m_centerZ.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float CreateDynamicRegionCircleMessage::getRadius() const
+{
+	return m_radius.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline Unicode::String const &CreateDynamicRegionCircleMessage::getName() const
+{
+	return m_name.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &CreateDynamicRegionCircleMessage::getPlanet() const
+{
+	return m_planet.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionCircleMessage::getPvp() const
+{
+	return m_pvp.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionCircleMessage::getBuildable() const
+{
+	return m_buildable.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionCircleMessage::getMunicipal() const
+{
+	return m_municipal.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionCircleMessage::getGeography() const
+{
+	return m_geography.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionCircleMessage::getMinDifficulty() const
+{
+	return m_minDifficulty.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionCircleMessage::getMaxDifficulty() const
+{
+	return m_maxDifficulty.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionCircleMessage::getSpawnable() const
+{
+	return m_spawnable.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionCircleMessage::getMission() const
+{
+	return m_mission.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CreateDynamicRegionCircleMessage::getVisible() const
+{
+	return m_visible.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CreateDynamicRegionCircleMessage::getNotify() const
+{
+	return m_notify.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_CreateDynamicRegionCircleMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionRectangleMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionRectangleMessage.cpp
new file mode 100644
index 00000000..a6294716
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionRectangleMessage.cpp
@@ -0,0 +1,92 @@
+// ======================================================================
+//
+// CreateDynamicRegionRectangleMessage.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CreateDynamicRegionRectangleMessage.h"
+
+// ======================================================================
+
+CreateDynamicRegionRectangleMessage::CreateDynamicRegionRectangleMessage(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) :
+	GameNetworkMessage("CreateDynamicRegionRectangleMessage"),
+	m_minX(minX),
+	m_minZ(minZ),
+	m_maxX(maxX),
+	m_maxZ(maxZ),
+	m_name(name),
+	m_planet(planet),
+	m_pvp(pvp),
+	m_buildable(buildable),
+	m_municipal(municipal),
+	m_geography(geography),
+	m_minDifficulty(minDifficulty),
+	m_maxDifficulty(maxDifficulty),
+	m_spawnable(spawnable),
+	m_mission(mission),
+	m_visible(visible),
+	m_notify(notify)
+{
+	addVariable(m_minX);
+	addVariable(m_minZ);
+	addVariable(m_maxX);
+	addVariable(m_maxZ);
+	addVariable(m_name);
+	addVariable(m_planet);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_municipal);
+	addVariable(m_geography);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_visible);
+	addVariable(m_notify);
+}
+
+// ----------------------------------------------------------------------
+
+CreateDynamicRegionRectangleMessage::CreateDynamicRegionRectangleMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("CreateDynamicRegionRectangleMessage"),
+	m_minX(),
+	m_minZ(),
+	m_maxX(),
+	m_maxZ(),
+	m_name(),
+	m_planet(),
+	m_pvp(),
+	m_buildable(),
+	m_municipal(),
+	m_geography(),
+	m_minDifficulty(),
+	m_maxDifficulty(),
+	m_spawnable(),
+	m_mission(),
+	m_visible(),
+	m_notify()
+{
+	addVariable(m_minX);
+	addVariable(m_minZ);
+	addVariable(m_maxX);
+	addVariable(m_maxZ);
+	addVariable(m_name);
+	addVariable(m_planet);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_municipal);
+	addVariable(m_geography);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_visible);
+	addVariable(m_notify);
+	unpack(source);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionRectangleMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionRectangleMessage.h
new file mode 100644
index 00000000..25cb5ccc
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicRegionRectangleMessage.h
@@ -0,0 +1,178 @@
+// ======================================================================
+//
+// CreateDynamicRegionRectangleMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_CreateDynamicRegionRectangleMessage_H
+#define	_INCLUDED_CreateDynamicRegionRectangleMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class CreateDynamicRegionRectangleMessage: public GameNetworkMessage
+{
+public:
+	CreateDynamicRegionRectangleMessage(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);
+	CreateDynamicRegionRectangleMessage(Archive::ReadIterator &source);
+
+	float getMinX() const;
+	float getMinZ() const;
+	float getMaxX() const;
+	float getMaxZ() const;
+	Unicode::String const &getName() const;
+	std::string const &getPlanet() const;
+	int getPvp() const;
+	int getBuildable() const;
+	int getMunicipal() const;
+	int getGeography() const;
+	int getMinDifficulty() const;
+	int getMaxDifficulty() const;
+	int getSpawnable() const;
+	int getMission() const;
+	bool getVisible() const;
+	bool getNotify() const;
+
+private:
+	CreateDynamicRegionRectangleMessage(CreateDynamicRegionRectangleMessage const &);
+	CreateDynamicRegionRectangleMessage &operator=(CreateDynamicRegionRectangleMessage const &);
+
+	Archive::AutoVariable<float> m_minX;
+	Archive::AutoVariable<float> m_minZ;
+	Archive::AutoVariable<float> m_maxX;
+	Archive::AutoVariable<float> m_maxZ;
+	Archive::AutoVariable<Unicode::String> m_name;
+	Archive::AutoVariable<std::string> m_planet;
+	Archive::AutoVariable<int> m_pvp;
+	Archive::AutoVariable<int> m_buildable;
+	Archive::AutoVariable<int> m_municipal;
+	Archive::AutoVariable<int> m_geography;
+	Archive::AutoVariable<int> m_minDifficulty;
+	Archive::AutoVariable<int> m_maxDifficulty;
+	Archive::AutoVariable<int> m_spawnable;
+	Archive::AutoVariable<int> m_mission;
+	Archive::AutoVariable<bool> m_visible;
+	Archive::AutoVariable<bool> m_notify;
+};
+
+// ----------------------------------------------------------------------
+
+inline float CreateDynamicRegionRectangleMessage::getMinX() const
+{
+	return m_minX.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float CreateDynamicRegionRectangleMessage::getMinZ() const
+{
+	return m_minZ.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float CreateDynamicRegionRectangleMessage::getMaxX() const
+{
+	return m_maxX.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float CreateDynamicRegionRectangleMessage::getMaxZ() const
+{
+	return m_maxZ.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline Unicode::String const &CreateDynamicRegionRectangleMessage::getName() const
+{
+	return m_name.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &CreateDynamicRegionRectangleMessage::getPlanet() const
+{
+	return m_planet.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionRectangleMessage::getPvp() const
+{
+	return m_pvp.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionRectangleMessage::getBuildable() const
+{
+	return m_buildable.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionRectangleMessage::getMunicipal() const
+{
+	return m_municipal.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionRectangleMessage::getGeography() const
+{
+	return m_geography.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionRectangleMessage::getMinDifficulty() const
+{
+	return m_minDifficulty.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionRectangleMessage::getMaxDifficulty() const
+{
+	return m_maxDifficulty.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionRectangleMessage::getSpawnable() const
+{
+	return m_spawnable.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicRegionRectangleMessage::getMission() const
+{
+	return m_mission.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CreateDynamicRegionRectangleMessage::getVisible() const
+{
+	return m_visible.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CreateDynamicRegionRectangleMessage::getNotify() const
+{
+	return m_notify.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_CreateDynamicRegionRectangleMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicSpawnRegionCircleMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicSpawnRegionCircleMessage.cpp
new file mode 100644
index 00000000..e839f671
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicSpawnRegionCircleMessage.cpp
@@ -0,0 +1,100 @@
+// ======================================================================
+//
+// CreateDynamicSpawnRegionCircleMessage.cpp
+//
+// Copyright 2009 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CreateDynamicSpawnRegionCircleMessage.h"
+
+// ======================================================================
+
+CreateDynamicSpawnRegionCircleMessage::CreateDynamicSpawnRegionCircleMessage(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 spawntable, int duration) :
+GameNetworkMessage("CreateDynamicSpawnRegionCircleMessage"),
+m_centerX(centerX),
+m_centerY(centerY),
+m_centerZ(centerZ),
+m_radius(radius),
+m_name(name),
+m_planet(planet),
+m_pvp(pvp),
+m_buildable(buildable),
+m_municipal(municipal),
+m_geography(geography),
+m_minDifficulty(minDifficulty),
+m_maxDifficulty(maxDifficulty),
+m_spawnable(spawnable),
+m_mission(mission),
+m_visible(visible),
+m_notify(notify),
+m_spawnTable(spawntable),
+m_duration(duration)
+{
+	addVariable(m_centerX);
+	addVariable(m_centerY);
+	addVariable(m_centerZ);
+	addVariable(m_radius);
+	addVariable(m_name);
+	addVariable(m_planet);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_municipal);
+	addVariable(m_geography);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_visible);
+	addVariable(m_notify);
+	addVariable(m_spawnTable);
+	addVariable(m_duration);
+}
+
+// ----------------------------------------------------------------------
+
+CreateDynamicSpawnRegionCircleMessage::CreateDynamicSpawnRegionCircleMessage(Archive::ReadIterator &source) :
+GameNetworkMessage("CreateDynamicSpawnRegionCircleMessage"),
+m_centerX(),
+m_centerY(),
+m_centerZ(),
+m_radius(),
+m_name(),
+m_planet(),
+m_pvp(),
+m_buildable(),
+m_municipal(),
+m_geography(),
+m_minDifficulty(),
+m_maxDifficulty(),
+m_spawnable(),
+m_mission(),
+m_visible(),
+m_notify(),
+m_spawnTable(),
+m_duration()
+{
+	addVariable(m_centerX);
+	addVariable(m_centerY);
+	addVariable(m_centerZ);
+	addVariable(m_radius);
+	addVariable(m_name);
+	addVariable(m_planet);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_municipal);
+	addVariable(m_geography);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_visible);
+	addVariable(m_notify);
+	addVariable(m_spawnTable);
+	addVariable(m_duration);
+	unpack(source);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicSpawnRegionCircleMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicSpawnRegionCircleMessage.h
new file mode 100644
index 00000000..1948103d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateDynamicSpawnRegionCircleMessage.h
@@ -0,0 +1,195 @@
+// ======================================================================
+//
+// CreateDynamicSpawnRegionCircleMessage.h
+//
+// Copyright 2009 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_CreateDynamicSpawnRegionCircleMessage_H
+#define	_INCLUDED_CreateDynamicSpawnRegionCircleMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class CreateDynamicSpawnRegionCircleMessage: public GameNetworkMessage
+{
+public:
+	CreateDynamicSpawnRegionCircleMessage(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 spawntable, int duration);
+	CreateDynamicSpawnRegionCircleMessage(Archive::ReadIterator &source);
+
+	float getCenterX() const;
+	float getCenterY() const;
+	float getCenterZ() const;
+	float getRadius() const;
+	Unicode::String const &getName() const;
+	std::string const &getPlanet() const;
+	int getPvp() const;
+	int getBuildable() const;
+	int getMunicipal() const;
+	int getGeography() const;
+	int getMinDifficulty() const;
+	int getMaxDifficulty() const;
+	int getSpawnable() const;
+	int getMission() const;
+	bool getVisible() const;
+	bool getNotify() const;
+	std::string const &getSpawntable() const;
+	int getDuration() const;
+
+private:
+	CreateDynamicSpawnRegionCircleMessage(CreateDynamicSpawnRegionCircleMessage const &);
+	CreateDynamicSpawnRegionCircleMessage &operator=(CreateDynamicSpawnRegionCircleMessage const &);
+
+	Archive::AutoVariable<float> m_centerX;
+	Archive::AutoVariable<float> m_centerY;
+	Archive::AutoVariable<float> m_centerZ;
+	Archive::AutoVariable<float> m_radius;
+	Archive::AutoVariable<Unicode::String> m_name;
+	Archive::AutoVariable<std::string> m_planet;
+	Archive::AutoVariable<int> m_pvp;
+	Archive::AutoVariable<int> m_buildable;
+	Archive::AutoVariable<int> m_municipal;
+	Archive::AutoVariable<int> m_geography;
+	Archive::AutoVariable<int> m_minDifficulty;
+	Archive::AutoVariable<int> m_maxDifficulty;
+	Archive::AutoVariable<int> m_spawnable;
+	Archive::AutoVariable<int> m_mission;
+	Archive::AutoVariable<bool> m_visible;
+	Archive::AutoVariable<bool> m_notify;
+	Archive::AutoVariable<std::string> m_spawnTable;
+	Archive::AutoVariable<int>  m_duration;
+};
+
+// ----------------------------------------------------------------------
+
+inline float CreateDynamicSpawnRegionCircleMessage::getCenterX() const
+{
+	return m_centerX.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float CreateDynamicSpawnRegionCircleMessage::getCenterY() const
+{
+	return m_centerY.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float CreateDynamicSpawnRegionCircleMessage::getCenterZ() const
+{
+	return m_centerZ.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float CreateDynamicSpawnRegionCircleMessage::getRadius() const
+{
+	return m_radius.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline Unicode::String const &CreateDynamicSpawnRegionCircleMessage::getName() const
+{
+	return m_name.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &CreateDynamicSpawnRegionCircleMessage::getPlanet() const
+{
+	return m_planet.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicSpawnRegionCircleMessage::getPvp() const
+{
+	return m_pvp.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicSpawnRegionCircleMessage::getBuildable() const
+{
+	return m_buildable.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicSpawnRegionCircleMessage::getMunicipal() const
+{
+	return m_municipal.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicSpawnRegionCircleMessage::getGeography() const
+{
+	return m_geography.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicSpawnRegionCircleMessage::getMinDifficulty() const
+{
+	return m_minDifficulty.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicSpawnRegionCircleMessage::getMaxDifficulty() const
+{
+	return m_maxDifficulty.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicSpawnRegionCircleMessage::getSpawnable() const
+{
+	return m_spawnable.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicSpawnRegionCircleMessage::getMission() const
+{
+	return m_mission.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CreateDynamicSpawnRegionCircleMessage::getVisible() const
+{
+	return m_visible.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CreateDynamicSpawnRegionCircleMessage::getNotify() const
+{
+	return m_notify.get();
+}
+// ----------------------------------------------------------------------
+
+inline std::string const &CreateDynamicSpawnRegionCircleMessage::getSpawntable() const
+{
+	return m_spawnTable.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateDynamicSpawnRegionCircleMessage::getDuration() const
+{
+	return m_duration.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_CreateDynamicSpawnRegionCircleMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.cpp
new file mode 100644
index 00000000..8fd0d13f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.cpp
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// CreateGroupMessage.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CreateGroupMessage.h"
+
+// ======================================================================
+
+CreateGroupMessage::CreateGroupMessage(GroupMemberParam const & leader, stdvector<GroupMemberParam>::fwd const & members) :
+	GameNetworkMessage("CreateGroupMessage"),
+	m_leader(leader),
+	m_members(members)
+{
+	addVariable(m_leader);
+	addVariable(m_members);
+}
+
+// ----------------------------------------------------------------------
+
+CreateGroupMessage::CreateGroupMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("CreateGroupMessage"),
+	m_leader(),
+	m_members()
+{
+	addVariable(m_leader);
+	addVariable(m_members);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+CreateGroupMessage::~CreateGroupMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.h
new file mode 100644
index 00000000..127691ce
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.h
@@ -0,0 +1,55 @@
+// ======================================================================
+//
+// CreateGroupMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_CreateGroupMessage_H
+#define	_INCLUDED_CreateGroupMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "serverNetworkMessages/GroupMemberParam.h"
+#include "serverNetworkMessages/GroupMemberParamArchive.h"
+
+// ======================================================================
+
+class CreateGroupMessage: public GameNetworkMessage
+{
+public:
+	CreateGroupMessage(GroupMemberParam const &leader, stdvector<GroupMemberParam>::fwd const & members);
+	CreateGroupMessage(Archive::ReadIterator &source);
+	~CreateGroupMessage();
+
+	GroupMemberParam const & getLeader() const;
+	stdvector<GroupMemberParam>::fwd const & getMembers() const;
+
+private:
+	CreateGroupMessage(CreateGroupMessage const &);
+	CreateGroupMessage &operator=(CreateGroupMessage const &);
+
+	Archive::AutoVariable<GroupMemberParam> m_leader;
+	Archive::AutoVariable<stdvector<GroupMemberParam>::fwd > m_members;
+};
+
+// ----------------------------------------------------------------------
+
+inline GroupMemberParam const &CreateGroupMessage::getLeader() const
+{
+	return m_leader.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline stdvector<GroupMemberParam>::fwd const &CreateGroupMessage::getMembers() const
+{
+	return m_members.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_CreateGroupMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateObjectMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateObjectMessage.cpp
new file mode 100644
index 00000000..9ffb0169
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateObjectMessage.cpp
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// CreateObjectMessage.cpp - tells Gameserver to create a new object.
+//
+// Copyright 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CreateObjectMessage.h"
+
+// ======================================================================
+
+CreateObjectByCrcMessage::CreateObjectByCrcMessage(NetworkId const &id, uint32 crc, Tag objectType, bool createAuthoritative, NetworkId const &container) :
+	GameNetworkMessage("CreateObjectByCrcMessage"),
+	m_id(id),
+	m_crc(crc),
+	m_objType(objectType),
+	m_createAuthoritative(createAuthoritative),
+	m_container(container)
+{
+	addVariable(m_id);
+	addVariable(m_crc);
+	addVariable(m_objType);
+	addVariable(m_createAuthoritative);
+	addVariable(m_container);
+}
+
+// ----------------------------------------------------------------------
+
+CreateObjectByCrcMessage::CreateObjectByCrcMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("CreateObjectByCrcMessage"),
+	m_id(),
+	m_crc(),
+	m_objType(),
+	m_createAuthoritative(),
+	m_container()
+{
+	addVariable(m_id);
+	addVariable(m_crc);
+	addVariable(m_objType);
+	addVariable(m_createAuthoritative);
+	addVariable(m_container);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+CreateObjectByCrcMessage::~CreateObjectByCrcMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateObjectMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateObjectMessage.h
new file mode 100644
index 00000000..aa042a67
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateObjectMessage.h
@@ -0,0 +1,83 @@
+// ======================================================================
+//
+// CreateObjectMessage.h - tells Gameserver to create a new object.
+//
+// Copyright 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_CreateObjectMessage_H
+#define	_INCLUDED_CreateObjectMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/Tag.h"
+
+// ======================================================================
+
+class CreateObjectByCrcMessage: public GameNetworkMessage
+{
+public:
+	CreateObjectByCrcMessage(NetworkId const &id, uint32 crc, Tag objectType, bool createAuthoritative, NetworkId const &container);
+	CreateObjectByCrcMessage(Archive::ReadIterator &source);
+	~CreateObjectByCrcMessage();
+
+public:
+	NetworkId const &   getId() const;
+	uint32              getCrc() const;
+	Tag                 getObjectType() const;
+	bool                getCreateAuthoritative() const;
+	NetworkId const &   getContainer() const;
+	
+private:
+	Archive::AutoVariable<NetworkId>    m_id;
+	Archive::AutoVariable<uint32>       m_crc;
+	Archive::AutoVariable<Tag>          m_objType;          // object type
+	Archive::AutoVariable<bool>         m_createAuthoritative;
+	Archive::AutoVariable<NetworkId>    m_container;
+	
+	CreateObjectByCrcMessage();
+	CreateObjectByCrcMessage(CreateObjectByCrcMessage const &);
+	CreateObjectByCrcMessage &operator=(CreateObjectByCrcMessage const &);
+};
+
+// ======================================================================
+
+inline NetworkId const &CreateObjectByCrcMessage::getId() const
+{
+	return m_id.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 CreateObjectByCrcMessage::getCrc() const
+{
+	return m_crc.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline Tag CreateObjectByCrcMessage::getObjectType() const
+{
+	return m_objType.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CreateObjectByCrcMessage::getCreateAuthoritative() const
+{
+	return m_createAuthoritative.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &CreateObjectByCrcMessage::getContainer() const
+{
+	return m_container.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_CreateObjectMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.cpp
new file mode 100644
index 00000000..439f7edf
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.cpp
@@ -0,0 +1,54 @@
+//========================================================================
+//
+// CreateSyncUiMessage.cpp - tells Gameserver to create a new object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CreateSyncUiMessage.h"
+
+#include "serverNetworkMessages/GameGameServerMessages.h"
+
+//========================================================================
+
+/**
+ * Class constructor.
+ *
+ * @param id           id of the object
+ */
+CreateSyncUiMessage::CreateSyncUiMessage(const NetworkId& id, const std::vector<NetworkId> & clients) :
+	GameNetworkMessage("CreateSyncUiMessage"),
+	m_id(id),
+	m_clients()
+{
+	addVariable(m_id);
+	addVariable(m_clients);
+
+	for (std::vector<NetworkId>::const_iterator i = clients.begin(); i != clients.end(); ++i)
+		m_clients.push_back(*i);
+}	// CreateSyncUiMessage::CreateSyncUiMessage
+
+//-----------------------------------------------------------------------
+
+CreateSyncUiMessage::CreateSyncUiMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("CreateSyncUiMessage"),
+	m_id(),
+	m_clients()
+{
+	addVariable(m_id);
+	addVariable(m_clients);
+	unpack(source);
+}	// CreateSyncUiMessage::CreateSyncUiMessage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+CreateSyncUiMessage::~CreateSyncUiMessage()
+{
+}	// CreateSyncUiMessage::~CreateSyncUiMessage
+
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.h
new file mode 100644
index 00000000..7a1d475e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.h
@@ -0,0 +1,57 @@
+//========================================================================
+//
+// CreateSyncUiMessage.h - tells Gameserver to create a new object.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_CreateSyncUiMessage_H
+#define	_INCLUDED_CreateSyncUiMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaVector.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/Tag.h"
+
+
+//-----------------------------------------------------------------------
+
+class CreateSyncUiMessage : public GameNetworkMessage
+{
+public:
+	CreateSyncUiMessage  (const NetworkId& id, const stdvector<NetworkId>::fwd & clients);
+	CreateSyncUiMessage  (Archive::ReadIterator & source);
+	~CreateSyncUiMessage ();
+
+public:
+	const NetworkId&                  getId(void) const;
+	const stdvector<NetworkId>::fwd & getClients() const;
+	
+private:
+	Archive::AutoVariable<NetworkId>         m_id;               // id of the object
+	Archive::AutoDeltaVector<NetworkId>      m_clients;          // id of the object
+	
+	CreateSyncUiMessage();
+	CreateSyncUiMessage(const CreateSyncUiMessage&);
+	CreateSyncUiMessage& operator= (const CreateSyncUiMessage&);
+};
+
+// ======================================================================
+
+inline const NetworkId& CreateSyncUiMessage::getId(void) const
+{
+	return m_id.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const stdvector<NetworkId>::fwd & CreateSyncUiMessage::getClients() const
+{
+	return m_clients.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_CreateSyncUiMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EnableNewJediTrackingMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EnableNewJediTrackingMessage.cpp
new file mode 100644
index 00000000..1fc2d17f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EnableNewJediTrackingMessage.cpp
@@ -0,0 +1,38 @@
+// ======================================================================
+//
+// EnableNewJediTrackingMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/EnableNewJediTrackingMessage.h"
+
+// ======================================================================
+
+EnableNewJediTrackingMessage::EnableNewJediTrackingMessage(bool enableTracking) :
+	GameNetworkMessage("EnableNewJediTrackingMessage"),
+	m_enableTracking(enableTracking)
+{
+	addVariable(m_enableTracking);
+}
+
+// ----------------------------------------------------------------------
+
+EnableNewJediTrackingMessage::EnableNewJediTrackingMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("EnableNewJediTrackingMessage"),
+	m_enableTracking()
+{
+	addVariable(m_enableTracking);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+EnableNewJediTrackingMessage::~EnableNewJediTrackingMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EnableNewJediTrackingMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EnableNewJediTrackingMessage.h
new file mode 100644
index 00000000..70ddc974
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EnableNewJediTrackingMessage.h
@@ -0,0 +1,53 @@
+//========================================================================
+//
+// EnableNewJediTrackingMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_EnableNewJediTrackingMessage_H
+#define	_INCLUDED_EnableNewJediTrackingMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:  DBProcess
+ * Action:  enables/disables tracking of players to see if they can become Jedi
+ */
+class EnableNewJediTrackingMessage: public GameNetworkMessage
+{
+public:
+	EnableNewJediTrackingMessage(bool enableTracking);
+	EnableNewJediTrackingMessage(Archive::ReadIterator & source);
+	~EnableNewJediTrackingMessage();
+
+public:
+	bool getEnableTracking() const;
+	
+private:
+	Archive::AutoVariable<bool>  m_enableTracking;
+
+private:
+	EnableNewJediTrackingMessage(const EnableNewJediTrackingMessage&);
+	EnableNewJediTrackingMessage& operator= (const EnableNewJediTrackingMessage&);
+};
+
+// ======================================================================
+
+inline bool EnableNewJediTrackingMessage::getEnableTracking() const
+{
+	return m_enableTracking.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_EnableNewJediTrackingMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EndBaselinesMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EndBaselinesMessage.cpp
new file mode 100644
index 00000000..9904c3b4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EndBaselinesMessage.cpp
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// EndBaselinesMessage.cpp - tells Gameserver object baseline data has ended.
+//
+// Copyright 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/EndBaselinesMessage.h"
+
+#include "serverNetworkMessages/GameGameServerMessages.h"
+
+// ======================================================================
+
+EndBaselinesMessage::EndBaselinesMessage(NetworkId const &id) :
+	GameNetworkMessage("EndBaselinesMessage"),
+	m_id(id)
+{
+	addVariable(m_id);
+}
+
+// ----------------------------------------------------------------------
+
+EndBaselinesMessage::EndBaselinesMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("EndBaselinesMessage"),
+	m_id()
+{
+	addVariable(m_id);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+EndBaselinesMessage::~EndBaselinesMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EndBaselinesMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EndBaselinesMessage.h
new file mode 100644
index 00000000..b94a1954
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/EndBaselinesMessage.h
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// EndBaselinesMessage.h - tells Gameserver object baseline data has ended.
+//
+// Copyright 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_EndBaselinesMessage_H
+#define	_INCLUDED_EndBaselinesMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class EndBaselinesMessage: public GameNetworkMessage
+{
+public:
+	explicit EndBaselinesMessage(NetworkId const & id);
+	EndBaselinesMessage(Archive::ReadIterator &source);
+	~EndBaselinesMessage();
+
+	NetworkId const &getId() const;
+
+private:
+	Archive::AutoVariable<NetworkId> m_id;		// id of object we are updating
+
+	EndBaselinesMessage();
+	EndBaselinesMessage(EndBaselinesMessage const &);
+	EndBaselinesMessage &operator=(EndBaselinesMessage const &);
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &EndBaselinesMessage::getId() const
+{
+	return m_id.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_EndBaselinesMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ExchangeListCreditsMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ExchangeListCreditsMessage.cpp
new file mode 100644
index 00000000..b44e4578
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ExchangeListCreditsMessage.cpp
@@ -0,0 +1,46 @@
+// ======================================================================
+//
+// ExhcnageListCredits.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ExchangeListCreditsMessage.h"
+
+// ======================================================================
+
+ExchangeListCreditsMessage::ExchangeListCreditsMessage(NetworkId const &actorId, uint32 credits, uint32 processId) :
+	GameNetworkMessage("ExchangeListCreditsMessage"),
+	m_actorId(actorId),
+	m_credits(credits),
+	m_processId(processId)
+{
+	addVariable(m_actorId);
+	addVariable(m_credits);
+	addVariable(m_processId);
+}
+
+// ----------------------------------------------------------------------
+
+ExchangeListCreditsMessage::ExchangeListCreditsMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("ExchangeListCreditsMessage"),
+	m_actorId(),
+	m_credits(),
+	m_processId()
+{
+	addVariable(m_actorId);
+	addVariable(m_credits);
+	addVariable(m_processId);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ExchangeListCreditsMessage::~ExchangeListCreditsMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ExchangeListCreditsMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ExchangeListCreditsMessage.h
new file mode 100644
index 00000000..c9552445
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ExchangeListCreditsMessage.h
@@ -0,0 +1,69 @@
+//========================================================================
+//
+// ExchangeListCreditsMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_ExchangeListCreditsMessage_H
+#define	_INCLUDED_ExchangeListCreditsMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:  Central Server 
+ * Action:  List credits on station exchange 
+ */
+class ExchangeListCreditsMessage : public GameNetworkMessage
+{
+public:
+	ExchangeListCreditsMessage  (NetworkId const &actorId, uint32 credits, uint32 processId);
+	ExchangeListCreditsMessage  (Archive::ReadIterator & source);
+	~ExchangeListCreditsMessage ();
+
+public:
+	NetworkId const &  getActorId() const;
+	uint32             getProcessId() const;
+	uint32             getCredits() const;
+	
+private:
+	Archive::AutoVariable<NetworkId>  m_actorId;
+	Archive::AutoVariable<uint32>     m_credits;
+	Archive::AutoVariable<uint32>     m_processId;
+
+private:
+	ExchangeListCreditsMessage(const ExchangeListCreditsMessage&);
+	ExchangeListCreditsMessage& operator= (const ExchangeListCreditsMessage&);
+};
+
+// ======================================================================
+
+inline NetworkId const &ExchangeListCreditsMessage::getActorId() const
+{
+	return m_actorId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 ExchangeListCreditsMessage::getCredits() const
+{
+	return m_credits.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 ExchangeListCreditsMessage::getProcessId() const
+{
+	return m_processId.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ExchangeListCreditsMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameGameServerMessages.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameGameServerMessages.cpp
new file mode 100644
index 00000000..3998f484
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameGameServerMessages.cpp
@@ -0,0 +1,57 @@
+//========================================================================
+//
+// GameGameServerMessages.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GameGameServerMessages.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param processId		id of process that connected
+ */
+GameGameServerConnect::GameGameServerConnect(const uint32 processId, bool isDbProcess, int spawnCookie, int preloadNumber) :
+	GameNetworkMessage("GameGameServerConnect"),
+	m_isDbProcess(isDbProcess),
+	m_processId(processId),
+	m_spawnCookie(spawnCookie),
+	m_preloadNumber(preloadNumber)
+{
+	addVariable(m_isDbProcess);
+	addVariable(m_processId);
+	addVariable(m_spawnCookie);
+	addVariable(m_preloadNumber);
+}
+
+//-----------------------------------------------------------------------
+
+GameGameServerConnect::GameGameServerConnect(Archive::ReadIterator & source) :
+GameNetworkMessage("GameGameServerConnect"),
+m_isDbProcess(0),
+m_processId(),
+m_spawnCookie(0),
+m_preloadNumber(0)
+{
+	addVariable(m_isDbProcess);
+	addVariable(m_processId);
+	addVariable(m_spawnCookie);
+	addVariable(m_preloadNumber);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+GameGameServerConnect::~GameGameServerConnect()
+{
+}	
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameGameServerMessages.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameGameServerMessages.h
new file mode 100644
index 00000000..96a846c3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameGameServerMessages.h
@@ -0,0 +1,62 @@
+// GameGameServerMessages.h
+// copyright 2001 Verant Interactive
+
+#ifndef	_INCLUDED_GameGameServerMessages_H
+#define	_INCLUDED_GameGameServerMessages_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class GameGameServerConnect : public GameNetworkMessage
+{
+public:
+	GameGameServerConnect  (uint32 processId, bool isDbProcess, int spawnCookie, int preloadNumber);
+	GameGameServerConnect  (Archive::ReadIterator & source);
+	~GameGameServerConnect ();
+
+	bool                 getIsDbProcess () const;
+	const uint32		 getProcessId   () const;
+	int                  getSpawnCookie () const;
+	int                  getPreloadNumber() const;
+
+private:
+	Archive::AutoVariable<bool>   m_isDbProcess;
+	Archive::AutoVariable<uint32> m_processId;
+	Archive::AutoVariable<int>    m_spawnCookie;
+	Archive::AutoVariable<int>    m_preloadNumber;
+	GameGameServerConnect();
+	GameGameServerConnect(const GameGameServerConnect&);
+	GameGameServerConnect& operator= (const GameGameServerConnect&);
+};
+
+//-----------------------------------------------------------------------
+
+inline bool GameGameServerConnect::getIsDbProcess() const
+{
+	return m_isDbProcess.get();
+}
+
+//-----------------------------------------------------------------------
+inline const uint32 GameGameServerConnect::getProcessId() const
+{
+	return m_processId.get(); //lint !e1037 // const op () const is hardly ambiguous
+}	// GameGameServerConnect::getProcessId
+
+//-----------------------------------------------------------------------
+
+inline int GameGameServerConnect::getSpawnCookie() const
+{
+	return m_spawnCookie.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int GameGameServerConnect::getPreloadNumber() const
+{
+	return m_preloadNumber.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_GameGameServerMessages_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerConnectAck.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerConnectAck.cpp
new file mode 100644
index 00000000..3440f1dc
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerConnectAck.cpp
@@ -0,0 +1,33 @@
+//========================================================================
+//
+// GameServerConnectAck.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GameServerConnectAck.h"
+
+//-----------------------------------------------------------------------
+
+GameServerConnectAck::GameServerConnectAck() :
+		GameNetworkMessage("GameServerConnectAck")
+{
+}
+
+//-----------------------------------------------------------------------
+
+GameServerConnectAck::GameServerConnectAck(Archive::ReadIterator & source) :
+			GameNetworkMessage("GameServerConnectAck")
+{
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+GameServerConnectAck::~GameServerConnectAck()
+{
+}	
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerConnectAck.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerConnectAck.h
new file mode 100644
index 00000000..5e1bb615
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerConnectAck.h
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// GameServerConnectAck.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_GameServerConnectAck_H
+#define INCLUDED_GameServerConnectAck_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from: Gameserver
+ * Sent to:   Gameserver
+ * Action:  Sent in response to GameGameServerConnect.  Acknowledges
+ * that we have recorded the processId of the game server.
+ */
+class GameServerConnectAck : public GameNetworkMessage
+{
+public:
+	GameServerConnectAck  ();
+	GameServerConnectAck  (Archive::ReadIterator & source);
+	~GameServerConnectAck ();
+
+private:
+	GameServerConnectAck(const GameServerConnectAck&);
+	GameServerConnectAck& operator= (const GameServerConnectAck&);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerMessageInterface.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerMessageInterface.cpp
new file mode 100644
index 00000000..5872a21e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerMessageInterface.cpp
@@ -0,0 +1,75 @@
+// ======================================================================
+//
+// GameServerMessageInterface.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GameServerMessageInterface.h"
+
+
+//-----------------------------------------------------------------------
+
+GameServerMessageInterface * GameServerMessageInterface::ms_instance = NULL;
+
+
+//=======================================================================
+
+GameServerMessageInterface::GameServerMessageInterface()
+{
+}
+
+//-----------------------------------------------------------------------
+
+GameServerMessageInterface::~GameServerMessageInterface()
+{
+	if (ms_instance == this)
+		ms_instance = NULL;
+}
+
+//-----------------------------------------------------------------------
+
+void GameServerMessageInterface::setInstance(GameServerMessageInterface * instance)
+{
+	if (ms_instance == NULL)
+		ms_instance = instance;
+	else if (ms_instance != instance)
+	{
+		WARNING(true, ("GameServerMessageInterface::setInstance called when an "
+			"instance has already been created"));
+		delete instance;
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void GameServerMessageInterface::removeInstance()
+{
+	delete ms_instance;
+}
+
+
+//-----------------------------------------------------------------------
+
+// Stub functions. The actual implementation should be in a derived class
+	
+void GameServerMessageInterface::pack(Archive::ByteStream &, AiCreatureStateMessage const &)
+{
+}
+
+void GameServerMessageInterface::unpack(Archive::ReadIterator &, AiCreatureStateMessage &)
+{
+}
+
+void GameServerMessageInterface::pack(Archive::ByteStream &, AiMovementMessage const &)
+{
+}
+
+void GameServerMessageInterface::unpack(Archive::ReadIterator &, AiMovementMessage &)
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerMessageInterface.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerMessageInterface.h
new file mode 100644
index 00000000..edb3ee36
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GameServerMessageInterface.h
@@ -0,0 +1,60 @@
+// ======================================================================
+//
+// GameServerMessageInterface.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#ifndef INCLUDED_GameServerMessageInterface_H
+#define INCLUDED_GameServerMessageInterface_H
+
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+};
+
+class AiMovementMessage;
+class AiCreatureStateMessage;
+
+//-----------------------------------------------------------------------
+
+// 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 GameServerMessageInterface
+{
+public:
+
+	static GameServerMessageInterface * getInstance();
+
+	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:
+	
+	         GameServerMessageInterface();
+	virtual ~GameServerMessageInterface();
+
+	static void setInstance(GameServerMessageInterface * instance);
+	static void removeInstance();
+
+protected:
+
+	static GameServerMessageInterface * ms_instance;
+};
+
+
+inline GameServerMessageInterface * GameServerMessageInterface::getInstance()
+{
+	return ms_instance;
+}
+
+
+
+#endif	// INCLUDED_GameServerMessageInterface_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.cpp
new file mode 100644
index 00000000..ff451d49
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.cpp
@@ -0,0 +1,110 @@
+// ======================================================================
+//
+// GetMoneyFromOfflineObjectMessage.cpp
+// copyright (c) 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GetMoneyFromOfflineObjectMessage.h"
+
+// ======================================================================
+
+GetMoneyFromOfflineObjectMessage::GetMoneyFromOfflineObjectMessage(NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, stdvector<int8>::fwd const & packedDictionary, bool success) :
+		GameNetworkMessage("GetMoneyFromOfflineObjectMessage"),
+		m_sourceObject(sourceObject),
+		m_amount(amount),
+		m_replyTo(replyTo),
+		m_successCallback(successCallback),
+		m_failCallback(failCallback),
+		m_packedDictionary(packedDictionary),
+		m_success(success)
+{
+	addVariable(m_sourceObject);
+	addVariable(m_amount);
+	addVariable(m_replyTo);
+	addVariable(m_successCallback);
+	addVariable(m_failCallback);
+	addVariable(m_packedDictionary);
+	addVariable(m_success);
+}
+
+// ----------------------------------------------------------------------
+
+GetMoneyFromOfflineObjectMessage::GetMoneyFromOfflineObjectMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("GetMoneyFromOfflineObjectMessage"),
+		m_sourceObject(),
+		m_amount(),
+		m_replyTo(),
+		m_successCallback(),
+		m_failCallback(),
+		m_packedDictionary(),
+		m_success()
+{
+	addVariable(m_sourceObject);
+	addVariable(m_amount);
+	addVariable(m_replyTo);
+	addVariable(m_successCallback);
+	addVariable(m_failCallback);
+	addVariable(m_packedDictionary);
+	addVariable(m_success);
+
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+GetMoneyFromOfflineObjectMessage::~GetMoneyFromOfflineObjectMessage ()
+{
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & GetMoneyFromOfflineObjectMessage::getSourceObject() const
+{
+	return m_sourceObject.get();
+}
+
+// ----------------------------------------------------------------------
+
+int GetMoneyFromOfflineObjectMessage::getAmount() const
+{
+	return m_amount.get();
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & GetMoneyFromOfflineObjectMessage::getReplyTo() const
+{
+	return m_replyTo.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & GetMoneyFromOfflineObjectMessage::getSuccessCallback() const
+{
+	return m_successCallback.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & GetMoneyFromOfflineObjectMessage::getFailCallback() const
+{
+	return m_failCallback.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<int8> const & GetMoneyFromOfflineObjectMessage::getPackedDictionary() const
+{
+	return m_packedDictionary.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool GetMoneyFromOfflineObjectMessage::getSuccess() const
+{
+	return m_success.get();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.h
new file mode 100644
index 00000000..f1e8e732
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.h
@@ -0,0 +1,60 @@
+// ======================================================================
+//
+// GetMoneyFromOfflineObjectMessage.h
+// Copyright (c) 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_GetMoneyFromOfflineObjectMessage_H
+#define INCLUDED_GetMoneyFromOfflineObjectMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Sent from:  Game Server
+ * Sent to:  DB Process
+ * Action:  Take money from the specified object.
+ * Note:  m_success is not meaningful when the message is used this way.
+ *
+ * Sent from:  DB Process
+ * Sent to:  Game Server
+ * Action:  Tell the game server whether the offline money grab worked.
+ */
+class GetMoneyFromOfflineObjectMessage : public GameNetworkMessage
+{
+  public:
+	GetMoneyFromOfflineObjectMessage  (NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, stdvector<int8>::fwd const & packedDictionary, bool success);
+	GetMoneyFromOfflineObjectMessage  (Archive::ReadIterator & source);
+	~GetMoneyFromOfflineObjectMessage ();
+
+  public:
+	NetworkId const & getSourceObject() const;
+	int getAmount() const;
+	NetworkId const & getReplyTo() const;
+	std::string const & getSuccessCallback() const;
+	std::string const & getFailCallback() const;
+	stdvector<int8>::fwd const & getPackedDictionary() const;
+	bool getSuccess() const;
+	
+  private:
+	Archive::AutoVariable<NetworkId> m_sourceObject;
+	Archive::AutoVariable<int> m_amount;
+	Archive::AutoVariable<NetworkId> m_replyTo;
+	Archive::AutoVariable<std::string> m_successCallback;
+	Archive::AutoVariable<std::string> m_failCallback;
+	Archive::AutoVariable<std::vector<int8> > m_packedDictionary;
+	Archive::AutoVariable<bool> m_success;
+	
+  private:        
+	GetMoneyFromOfflineObjectMessage(const GetMoneyFromOfflineObjectMessage&);
+	GetMoneyFromOfflineObjectMessage& operator= (const GetMoneyFromOfflineObjectMessage&);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParam.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParam.cpp
new file mode 100644
index 00000000..0c44ed2b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParam.cpp
@@ -0,0 +1,52 @@
+//======================================================================
+//
+// GroupMemberParam.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GroupMemberParam.h"
+
+// ======================================================================
+
+GroupMemberParam::GroupMemberParam()
+: m_memberId()
+, m_memberName()
+, m_memberDifficulty()
+, m_memberProfession(LfgCharacterData::Prof_Unknown)
+, m_memberIsPC(true)
+, m_memberShipId()
+, m_memberShipIsPOB(false)
+, m_memberOwnsPOB(false)
+{
+}
+
+GroupMemberParam::GroupMemberParam(NetworkId const & memberId, std::string const & memberName, int memberDifficulty, LfgCharacterData::Profession memberProfession, bool memberIsPC)
+: m_memberId(memberId)
+, m_memberName(memberName)
+, m_memberDifficulty(memberDifficulty)
+, m_memberProfession(memberProfession)
+, m_memberIsPC(memberIsPC)
+, m_memberShipId()
+, m_memberShipIsPOB(false)
+, m_memberOwnsPOB(false)
+{
+}
+
+// ----------------------------------------------------------------------
+
+GroupMemberParam::GroupMemberParam(NetworkId const & memberId, std::string const & memberName, int memberDifficulty, LfgCharacterData::Profession memberProfession, bool memberIsPC, NetworkId const & memberShipId, bool const memberShipIsPOB, bool const memberOwnsPOB)
+: m_memberId(memberId)
+, m_memberName(memberName)
+, m_memberDifficulty(memberDifficulty)
+, m_memberProfession(memberProfession)
+, m_memberIsPC(memberIsPC)
+, m_memberShipId(memberShipId)
+, m_memberShipIsPOB(memberShipIsPOB)
+, m_memberOwnsPOB(memberOwnsPOB)
+{
+}
+
+
+//======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParam.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParam.h
new file mode 100644
index 00000000..e87368e3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParam.h
@@ -0,0 +1,38 @@
+//======================================================================
+//
+// GroupMemberParam.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_GroupMemberParam_H
+#define INCLUDED_GroupMemberParam_H
+
+//======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedGame/LfgCharacterData.h"
+
+class GroupMemberParam
+{
+public:
+	GroupMemberParam();
+	GroupMemberParam(NetworkId const & memberId, std::string const & memberName, int memberDifficulty, LfgCharacterData::Profession memberProfession, bool memberIsPC);
+	GroupMemberParam(NetworkId const & memberId, std::string const & memberName, int memberDifficulty, LfgCharacterData::Profession memberProfession, bool memberIsPC, NetworkId const & memberShipId, bool const memberShipIsPOB, bool const memberOwnsPOB);
+
+	NetworkId m_memberId;
+	std::string m_memberName;
+	int m_memberDifficulty;
+	LfgCharacterData::Profession m_memberProfession;
+	bool m_memberIsPC;
+	NetworkId m_memberShipId;
+	bool m_memberShipIsPOB;
+	bool m_memberOwnsPOB;
+
+};
+
+//======================================================================
+
+#endif
+
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParamArchive.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParamArchive.cpp
new file mode 100644
index 00000000..9d57ba31
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParamArchive.cpp
@@ -0,0 +1,54 @@
+//======================================================================
+//
+// GroupMemberParamArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GroupMemberParamArchive.h"
+
+#include "Archive/Archive.h"
+#include "localizationArchive/StringIdArchive.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "serverNetworkMessages/GroupMemberParam.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//======================================================================
+
+namespace Archive
+{
+	//----------------------------------------------------------------------
+
+	void get(Archive::ReadIterator & source, GroupMemberParam & target)
+	{
+		get(source, target.m_memberId);
+		get(source, target.m_memberName);
+		get(source, target.m_memberDifficulty);
+
+		uint8 uChar = 0;
+		get(source, uChar);
+		target.m_memberProfession = static_cast<LfgCharacterData::Profession>(uChar);
+
+		get(source, target.m_memberIsPC);
+		get(source, target.m_memberShipId);
+		get(source, target.m_memberShipIsPOB);
+		get(source, target.m_memberOwnsPOB);
+	}
+
+	//----------------------------------------------------------------------
+
+	void put(ByteStream & target, const GroupMemberParam & source)
+	{
+		put(target, source.m_memberId);
+		put(target, source.m_memberName);
+		put(target, source.m_memberDifficulty);
+		put(target, static_cast<uint8>(source.m_memberProfession));
+		put(target, source.m_memberIsPC);
+		put(target, source.m_memberShipId);
+		put(target, source.m_memberShipIsPOB);
+		put(target, source.m_memberOwnsPOB);
+	}
+}
+
+//======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParamArchive.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParamArchive.h
new file mode 100644
index 00000000..2dea1638
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GroupMemberParamArchive.h
@@ -0,0 +1,26 @@
+//======================================================================
+//
+// GroupMemberParamArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_GroupMemberParamArchive_H
+#define INCLUDED_GroupMemberParamArchive_H
+
+//======================================================================
+
+class GroupMemberParam;
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+
+	void get (Archive::ReadIterator & source, GroupMemberParam & target);
+	void put (ByteStream & target, const GroupMemberParam & source);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContainedObjectMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContainedObjectMessage.cpp
new file mode 100644
index 00000000..aaeb4e1f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContainedObjectMessage.cpp
@@ -0,0 +1,45 @@
+//========================================================================
+//
+// LoadContainedObjectMessage.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LoadContainedObjectMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+LoadContainedObjectMessage::LoadContainedObjectMessage(const NetworkId & containerId, const NetworkId &objectId) :
+	GameNetworkMessage("LoadContainedObjectMessage"),
+	m_containerId(containerId),
+	m_objectId(objectId)
+{
+	addVariable(m_containerId);
+	addVariable(m_objectId);
+}
+
+//-----------------------------------------------------------------------
+
+LoadContainedObjectMessage::LoadContainedObjectMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("LoadContainedObjectMessage"),
+		m_containerId(),
+		m_objectId()
+{
+	addVariable(m_containerId);
+	addVariable(m_objectId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoadContainedObjectMessage::~LoadContainedObjectMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContainedObjectMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContainedObjectMessage.h
new file mode 100644
index 00000000..a5e487f2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContainedObjectMessage.h
@@ -0,0 +1,65 @@
+//========================================================================
+//
+// LoadContainedObjectMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_LoadContainedObjectMessage_H
+#define	_INCLUDED_LoadContainedObjectMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent From:  GameServer
+ * Sent To:    DatabaseProcess
+ * Action:     Load the specified object (which must be in the specified
+ *             container), and send it to the GameServer that sent this message.
+ *
+ * Sent From:  DatabaseProcess
+ * Sent To:    GameServer
+ * Action:     Inform the GameServer that the requested load has been completed.
+ */
+class LoadContainedObjectMessage : public GameNetworkMessage
+{
+public:
+	LoadContainedObjectMessage            (const NetworkId & containerId, const NetworkId &objectId);
+	LoadContainedObjectMessage            (Archive::ReadIterator & source);
+	~LoadContainedObjectMessage           ();
+
+	const NetworkId& getContainerId       (void) const;
+	const NetworkId& getObjectId          (void) const;
+        
+private:
+	Archive::AutoVariable<NetworkId>      m_containerId;
+	Archive::AutoVariable<NetworkId>      m_objectId;
+
+	//disabled functions:
+	LoadContainedObjectMessage            ();
+	LoadContainedObjectMessage            (const LoadContainedObjectMessage&);
+	LoadContainedObjectMessage& operator= (const LoadContainedObjectMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId &LoadContainedObjectMessage::getContainerId(void) const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &LoadContainedObjectMessage::getObjectId(void) const
+{
+	return m_objectId.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif	// _INCLUDED_LoadContainedObjectMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContentsMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContentsMessage.cpp
new file mode 100644
index 00000000..f403378e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContentsMessage.cpp
@@ -0,0 +1,41 @@
+//========================================================================
+//
+// LoadContentsMessage.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LoadContentsMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+LoadContentsMessage::LoadContentsMessage(const NetworkId & containerId) :
+	GameNetworkMessage("LoadContentsMessage"),
+	m_containerId(containerId)
+{
+	addVariable(m_containerId);
+}
+
+//-----------------------------------------------------------------------
+
+LoadContentsMessage::LoadContentsMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("LoadContentsMessage"),
+		m_containerId()
+{
+	addVariable(m_containerId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoadContentsMessage::~LoadContentsMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContentsMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContentsMessage.h
new file mode 100644
index 00000000..7cb1652f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadContentsMessage.h
@@ -0,0 +1,56 @@
+//========================================================================
+//
+// LoadContentsMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_LoadContentsMessage_H
+#define	_INCLUDED_LoadContentsMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent From:  GameServer
+ * Sent To:    DatabaseProcess
+ * Action:     Load the contents of the specified container and send them
+ *             to the GameServer that sent this message.
+ *
+ * Sent From:  DatabaseProcess
+ * Sent To:    GameServer
+ * Action:     Inform the GameServer that the requested load has been completed.
+ */
+class LoadContentsMessage : public GameNetworkMessage
+{
+public:
+	LoadContentsMessage            (const NetworkId & containerId);
+	LoadContentsMessage            (Archive::ReadIterator & source);
+	~LoadContentsMessage           ();
+
+	const NetworkId& getContainerId       (void) const;
+        
+private:
+	Archive::AutoVariable<NetworkId>      m_containerId;
+
+	//disabled functions:
+	LoadContentsMessage            ();
+	LoadContentsMessage            (const LoadContentsMessage&);
+	LoadContentsMessage& operator= (const LoadContentsMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId &LoadContentsMessage::getContainerId(void) const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadStructureMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadStructureMessage.cpp
new file mode 100644
index 00000000..d4631f19
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadStructureMessage.cpp
@@ -0,0 +1,45 @@
+//========================================================================
+//
+// LoadStructureMessage.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LoadStructureMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+LoadStructureMessage::LoadStructureMessage(const NetworkId & structureId, const std::string &whoRequested) :
+	GameNetworkMessage("LoadStructureMessage"),
+	m_structureId(structureId),
+	m_whoRequested(whoRequested)
+{
+	AutoByteStream::addVariable(m_structureId);
+	AutoByteStream::addVariable(m_whoRequested);
+}
+
+//-----------------------------------------------------------------------
+
+LoadStructureMessage::LoadStructureMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("LoadStructureMessage"),
+	m_structureId(),
+	m_whoRequested()
+{
+	AutoByteStream::addVariable(m_structureId);
+	AutoByteStream::addVariable(m_whoRequested);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoadStructureMessage::~LoadStructureMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadStructureMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadStructureMessage.h
new file mode 100644
index 00000000..957d0190
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LoadStructureMessage.h
@@ -0,0 +1,52 @@
+//========================================================================
+//
+// LoadStructureMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_LoadStructureMessage_H
+#define	_INCLUDED_LoadStructureMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent From:  GameServer
+ * Sent To:    DatabaseProcess
+ * Action:     Load the contents of the specified structure and send them
+ *             to the GameServer that sent this message.
+ *
+ * Sent From:  DatabaseProcess
+ * Sent To:    GameServer
+ * Action:     Inform the GameServer that the requested load has been completed.
+ */
+class LoadStructureMessage : public GameNetworkMessage
+{
+public:
+	LoadStructureMessage            (const NetworkId & structureId, const std::string &whoRequested);
+	LoadStructureMessage            (Archive::ReadIterator & source);
+	~LoadStructureMessage           ();
+	const NetworkId& getStructureId       () const {return m_structureId.get();}
+	const std::string &getWhoRequested    () const {return m_whoRequested.get();}
+        
+
+private:
+	Archive::AutoVariable<NetworkId>      m_structureId;
+	Archive::AutoVariable<std::string>    m_whoRequested;
+
+	//disabled functions:
+	LoadStructureMessage            ();
+	LoadStructureMessage            (const LoadStructureMessage&);
+	LoadStructureMessage& operator= (const LoadStructureMessage&);
+
+};
+
+// ----------------------------------------------------------------------
+
+#endif
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateObjectResponseMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateObjectResponseMessage.cpp
new file mode 100644
index 00000000..9cf0f03a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateObjectResponseMessage.cpp
@@ -0,0 +1,144 @@
+// ======================================================================
+//
+// LocateObjectResponseMessage.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LocateObjectResponseMessage.h"
+
+// ======================================================================
+
+LocateObjectResponseMessage::LocateObjectResponseMessage(NetworkId const &targetId, NetworkId const &responseId, uint32 responsePid, Vector const &position_w, std::string const &scene, std::string const &sharedTemplateName, uint32 targetPid, std::vector<NetworkId> const &containers, bool isAuthoritative, NetworkId const &residenceOf) :
+	GameNetworkMessage("LocateObjectResponseMessage"),
+	m_targetId(targetId),
+	m_responseId(responseId),
+	m_responsePid(responsePid),
+	m_position_w(position_w),
+	m_scene(scene),
+	m_sharedTemplateName(sharedTemplateName),
+	m_targetPid(targetPid),
+	m_containers(containers),
+	m_isAthoritative(isAuthoritative),
+	m_residenceOf(residenceOf)
+{
+	addVariable(m_targetId);
+	addVariable(m_responseId);
+	addVariable(m_responsePid);
+	addVariable(m_position_w);
+	addVariable(m_scene);
+	addVariable(m_sharedTemplateName);
+	addVariable(m_targetPid);
+	addVariable(m_containers);
+	addVariable(m_isAthoritative);
+	addVariable(m_residenceOf);
+}
+
+// ----------------------------------------------------------------------
+
+LocateObjectResponseMessage::LocateObjectResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("LocateObjectResponseMessage"),
+	m_targetId(),
+	m_responseId(),
+	m_responsePid(),
+	m_position_w(),
+	m_scene(),
+	m_sharedTemplateName(),
+	m_targetPid(),
+	m_containers(),
+	m_isAthoritative(false),
+	m_residenceOf()
+{
+	addVariable(m_targetId);
+	addVariable(m_responseId);
+	addVariable(m_responsePid);
+	addVariable(m_position_w);
+	addVariable(m_scene);
+	addVariable(m_sharedTemplateName);
+	addVariable(m_targetPid);
+	addVariable(m_containers);
+	addVariable(m_isAthoritative);
+	addVariable(m_residenceOf);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+LocateObjectResponseMessage::~LocateObjectResponseMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &LocateObjectResponseMessage::getTargetId() const
+{
+	return m_targetId.get();
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &LocateObjectResponseMessage::getResponseId() const
+{
+	return m_responseId.get();
+}
+
+// ----------------------------------------------------------------------
+
+uint32 LocateObjectResponseMessage::getResponsePid() const
+{
+	return m_responsePid.get();
+}
+
+// ----------------------------------------------------------------------
+
+Vector const &LocateObjectResponseMessage::getPosition_w() const
+{
+	return m_position_w.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &LocateObjectResponseMessage::getScene() const
+{
+	return m_scene.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &LocateObjectResponseMessage::getSharedTemplateName() const
+{
+	return m_sharedTemplateName.get();
+}
+
+// ----------------------------------------------------------------------
+
+uint32 LocateObjectResponseMessage::getTargetPid() const
+{
+	return m_targetPid.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<NetworkId> const &LocateObjectResponseMessage::getContainers() const
+{
+	return m_containers.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool LocateObjectResponseMessage::getIsAuthoritative() const
+{
+	return m_isAthoritative.get();
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &LocateObjectResponseMessage::getResidenceOf() const
+{
+	return m_residenceOf.get();
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateObjectResponseMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateObjectResponseMessage.h
new file mode 100644
index 00000000..7adfccd6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateObjectResponseMessage.h
@@ -0,0 +1,57 @@
+// ======================================================================
+//
+// LocateObjectResponseMessage.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_LocateObjectResponseMessage_H
+#define	_INCLUDED_LocateObjectResponseMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class LocateObjectResponseMessage: public GameNetworkMessage
+{
+public:
+	LocateObjectResponseMessage(NetworkId const &targetId, NetworkId const &responseId, uint32 responsePid, Vector const &position_w, std::string const &scene, std::string const &sharedTemplateName, uint32 targetPid, std::vector<NetworkId> const &containers, bool isAuthoritative, NetworkId const &residenceOf);
+	LocateObjectResponseMessage(Archive::ReadIterator &source);
+	~LocateObjectResponseMessage();
+
+public:
+	NetworkId const &getTargetId() const;
+	NetworkId const &getResponseId() const;
+	uint32 getResponsePid() const;
+	Vector const &getPosition_w() const;
+	std::string const &getScene() const;
+	std::string const &getSharedTemplateName() const;
+	uint32 getTargetPid() const;
+	std::vector<NetworkId> const &getContainers() const;
+	bool getIsAuthoritative() const;
+	NetworkId const &getResidenceOf() const;
+	
+private:
+	Archive::AutoVariable<NetworkId> m_targetId;
+	Archive::AutoVariable<NetworkId> m_responseId;
+	Archive::AutoVariable<uint32> m_responsePid;
+	Archive::AutoVariable<Vector> m_position_w;
+	Archive::AutoVariable<std::string> m_scene;
+	Archive::AutoVariable<std::string> m_sharedTemplateName;
+	Archive::AutoVariable<uint32> m_targetPid;
+	Archive::AutoVariable<std::vector<NetworkId> > m_containers;
+	Archive::AutoVariable<bool> m_isAthoritative;
+	Archive::AutoVariable<NetworkId> m_residenceOf;
+
+private:
+	LocateObjectResponseMessage(LocateObjectResponseMessage const &);
+	LocateObjectResponseMessage &operator=(LocateObjectResponseMessage const &);
+};
+
+// ======================================================================
+
+#endif	// _INCLUDED_LocateObjectResponseMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocatePlayerResponseMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocatePlayerResponseMessage.cpp
new file mode 100644
index 00000000..c05710ef
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocatePlayerResponseMessage.cpp
@@ -0,0 +1,100 @@
+// ======================================================================
+//
+// LocatePlayerResponseMessage.cpp
+//
+// Copyright 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LocatePlayerResponseMessage.h"
+
+// ======================================================================
+
+LocatePlayerResponseMessage::LocatePlayerResponseMessage(NetworkId const &targetId, NetworkId const &responseId, uint32 responsePid, std::string const &scene, Vector const &position_w, uint32 targetPid) :
+	GameNetworkMessage("LocatePlayerResponseMessage"),
+	m_targetId(targetId),
+	m_responseId(responseId),
+	m_responsePid(responsePid),
+	m_scene(scene),
+	m_position_w(position_w),
+	m_targetPid(targetPid)
+{
+	addVariable(m_targetId);
+	addVariable(m_responseId);
+	addVariable(m_responsePid);
+	addVariable(m_scene);
+	addVariable(m_position_w);
+	addVariable(m_targetPid);
+}
+
+// ----------------------------------------------------------------------
+
+LocatePlayerResponseMessage::LocatePlayerResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("LocatePlayerResponseMessage"),
+	m_targetId(),
+	m_responseId(),
+	m_responsePid(),
+	m_scene(),
+	m_position_w(),
+	m_targetPid()
+{
+	addVariable(m_targetId);
+	addVariable(m_responseId);
+	addVariable(m_responsePid);
+	addVariable(m_scene);
+	addVariable(m_position_w);
+	addVariable(m_targetPid);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+LocatePlayerResponseMessage::~LocatePlayerResponseMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &LocatePlayerResponseMessage::getTargetId() const
+{
+	return m_targetId.get();
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &LocatePlayerResponseMessage::getResponseId() const
+{
+	return m_responseId.get();
+}
+
+// ----------------------------------------------------------------------
+
+uint32 LocatePlayerResponseMessage::getResponsePid() const
+{
+	return m_responsePid.get();
+}
+
+// ----------------------------------------------------------------------
+
+Vector const &LocatePlayerResponseMessage::getPosition_w() const
+{
+	return m_position_w.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &LocatePlayerResponseMessage::getScene() const
+{
+	return m_scene.get();
+}
+
+// ----------------------------------------------------------------------
+
+uint32 LocatePlayerResponseMessage::getTargetPid() const
+{
+	return m_targetPid.get();
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocatePlayerResponseMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocatePlayerResponseMessage.h
new file mode 100644
index 00000000..35224ba6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocatePlayerResponseMessage.h
@@ -0,0 +1,49 @@
+// ======================================================================
+//
+// LocateObjectResponseMessage.h
+//
+// Copyright 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_LocatePlayerResponseMessage_H
+#define	_INCLUDED_LocatePlayerResponseMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class LocatePlayerResponseMessage: public GameNetworkMessage
+{
+public:
+	LocatePlayerResponseMessage(NetworkId const &targetId, NetworkId const &responseId, uint32 responsePid, std::string const &scene, Vector const &position_w, uint32 targetPid);
+	LocatePlayerResponseMessage(Archive::ReadIterator &source);
+	~LocatePlayerResponseMessage();
+
+public:
+	NetworkId const &getTargetId() const;
+	NetworkId const &getResponseId() const;
+	uint32 getResponsePid() const;
+	Vector const &getPosition_w() const;
+	std::string const &getScene() const;
+	uint32 getTargetPid() const;
+	
+private:
+	Archive::AutoVariable<NetworkId>   m_targetId;
+	Archive::AutoVariable<NetworkId>   m_responseId;
+	Archive::AutoVariable<uint32>      m_responsePid;
+	Archive::AutoVariable<std::string> m_scene;
+	Archive::AutoVariable<Vector>      m_position_w;
+	Archive::AutoVariable<uint32>      m_targetPid;
+
+private:
+	LocatePlayerResponseMessage(LocatePlayerResponseMessage const &);
+	LocatePlayerResponseMessage &operator=(LocatePlayerResponseMessage const &);
+};
+
+// ======================================================================
+
+#endif	// _INCLUDED_LocatePlayerResponseMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateStructureMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateStructureMessage.cpp
new file mode 100644
index 00000000..52b852d4
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateStructureMessage.cpp
@@ -0,0 +1,57 @@
+//========================================================================
+//
+// LocateStructureMessage.cpp
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LocateStructureMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+LocateStructureMessage::LocateStructureMessage(const NetworkId & structureId, const int x, const int z, const std::string &sceneId, const std::string &whoRequested):
+	GameNetworkMessage("LocateStructureMessage"),
+	m_structureId(structureId),
+	m_x(x),
+	m_z(z),
+	m_sceneId(sceneId),
+	m_whoRequested(whoRequested)
+{
+	AutoByteStream::addVariable(m_structureId);
+	AutoByteStream::addVariable(m_x);
+	AutoByteStream::addVariable(m_z);
+	AutoByteStream::addVariable(m_sceneId);
+	AutoByteStream::addVariable(m_whoRequested);
+}
+
+//-----------------------------------------------------------------------
+
+LocateStructureMessage::LocateStructureMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("LocateStructureMessage"),
+	m_structureId(),
+	m_x(),
+	m_z(),
+	m_sceneId(),
+	m_whoRequested()
+{
+	AutoByteStream::addVariable(m_structureId);
+	AutoByteStream::addVariable(m_x);
+	AutoByteStream::addVariable(m_z);
+	AutoByteStream::addVariable(m_sceneId);
+	AutoByteStream::addVariable(m_whoRequested);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LocateStructureMessage::~LocateStructureMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateStructureMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateStructureMessage.h
new file mode 100644
index 00000000..68a1298a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/LocateStructureMessage.h
@@ -0,0 +1,57 @@
+//========================================================================
+//
+// LocateStructureMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_LocateStructureMessage_H
+#define	_INCLUDED_LocateStructureMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent From:  GameServer
+ * Sent To:    DatabaseProcess
+ * Action:     Load the contents of the specified structure and send them
+ *             to the GameServer that sent this message.
+ *
+ * Sent From:  DatabaseProcess
+ * Sent To:    GameServer
+ * Action:     Inform the GameServer that the requested load has been completed.
+ */
+class LocateStructureMessage : public GameNetworkMessage
+{
+public:
+	LocateStructureMessage            (const NetworkId & structureId, const int x, const int z, const std::string &sceneId, const std::string &whoRequested);
+	LocateStructureMessage            (Archive::ReadIterator & source);
+	~LocateStructureMessage           ();
+
+	const NetworkId& getStructureId    () const {return m_structureId.get();}
+	const int getX			   () const {return m_x.get();}
+	const int getZ			   () const {return m_z.get();}
+	const std::string &getSceneId	   () const {return m_sceneId.get();}
+	const std::string &getWhoRequested () const {return m_whoRequested.get();}
+        
+private:
+	Archive::AutoVariable<NetworkId>   m_structureId;
+	Archive::AutoVariable<int>	   m_x;
+	Archive::AutoVariable<int>	   m_z;
+	Archive::AutoVariable<std::string> m_sceneId;
+	Archive::AutoVariable<std::string> m_whoRequested;
+
+	//disabled functions:
+	LocateStructureMessage             ();
+	LocateStructureMessage             (const LocateStructureMessage&);
+	LocateStructureMessage& operator=  (const LocateStructureMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+#endif
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueAlterAttribute.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueAlterAttribute.cpp
new file mode 100644
index 00000000..af3c21a6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueAlterAttribute.cpp
@@ -0,0 +1,72 @@
+// ======================================================================
+//
+// MessageQueueAlterAttribute.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/MessageQueueAlterAttribute.h"
+
+#include <string>
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueAlterAttribute, CM_alterAttribute);
+
+//===================================================================
+
+
+// ----------------------------------------------------------------------
+
+MessageQueueAlterAttribute::MessageQueueAlterAttribute(int attrib, int delta, 
+	bool checkIncapacitation, const NetworkId & source) :
+	m_attrib(attrib),
+	m_delta(delta),
+	m_checkIncapacitation(checkIncapacitation),
+	m_source(source)
+{
+}	
+
+// ----------------------------------------------------------------------
+
+MessageQueueAlterAttribute::~MessageQueueAlterAttribute()
+{
+}
+
+void MessageQueueAlterAttribute::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueAlterAttribute* const msg = safe_cast<const MessageQueueAlterAttribute*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->m_attrib);
+		Archive::put(target, msg->m_delta);
+		Archive::put(target, msg->m_checkIncapacitation);
+		Archive::put(target, msg->m_source);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueAlterAttribute::unpack(Archive::ReadIterator & source)
+{
+	int attrib;
+	int delta;
+	bool checkIncapacitation;
+	NetworkId attacker;
+
+	Archive::get(source, attrib);
+	Archive::get(source, delta);
+	Archive::get(source, checkIncapacitation);
+	Archive::get(source, attacker);
+	
+	return new MessageQueueAlterAttribute(attrib, delta, checkIncapacitation, attacker);
+}
+
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueAlterAttribute.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueAlterAttribute.h
new file mode 100644
index 00000000..3ae0f40d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueAlterAttribute.h
@@ -0,0 +1,74 @@
+//======================================================================
+//
+// MessageQueueAlterAttribute.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueAlterAttribute_H
+#define INCLUDED_MessageQueueAlterAttribute_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+class MessageQueueAlterAttribute : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueAlterAttribute(int attrib, int delta, bool checkIncapacitation, const NetworkId & source);
+	virtual ~MessageQueueAlterAttribute();
+
+	int               getAttrib() const;
+	int               getDelta() const;
+	bool              getCheckIncapacitation() const;
+	const NetworkId & getSource() const;
+	
+
+private:
+
+	MessageQueueAlterAttribute              (const MessageQueueAlterAttribute & source);
+	MessageQueueAlterAttribute & operator = (const MessageQueueAlterAttribute & source);
+
+private:
+	int               m_attrib;
+	int               m_delta;
+	bool              m_checkIncapacitation;
+	const NetworkId & m_source;
+};
+
+
+//-----------------------------------------------------------------------
+
+inline int MessageQueueAlterAttribute::getAttrib() const
+{
+	return m_attrib;
+}
+
+inline int MessageQueueAlterAttribute::getDelta() const
+{
+	return m_delta;
+}
+
+inline bool MessageQueueAlterAttribute::getCheckIncapacitation() const
+{
+	return m_checkIncapacitation;
+}
+
+inline const NetworkId & MessageQueueAlterAttribute::getSource() const
+{
+	return m_source;
+}
+
+
+//-----------------------------------------------------------------------
+
+
+#endif	// INCLUDED_MessageQueueAlterAttribute_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueEnqueueFwd.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueEnqueueFwd.cpp
new file mode 100644
index 00000000..125923b6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueEnqueueFwd.cpp
@@ -0,0 +1,143 @@
+// ======================================================================
+//
+// MessageQueueCommandQueueEnqueueFwd.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/MessageQueueCommandQueueEnqueueFwd.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueCommandQueueEnqueueFwd, CM_commandQueueEnqueueFwd);
+
+//===================================================================
+
+
+
+MessageQueueCommandQueueEnqueueFwd::MessageQueueCommandQueueEnqueueFwd(
+	uint32 sequenceId, uint32 commandHash, NetworkId const &targetId,
+	Unicode::String const &params, bool clearable, int priority, bool fromServer) :
+	MessageQueue::Data(),
+	m_sequenceId(sequenceId),
+	m_commandHash(commandHash),
+	m_targetId(targetId),
+	m_params(params),
+	m_clearable(clearable),
+	m_priority(priority),
+	m_fromServer(fromServer)
+{
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueueCommandQueueEnqueueFwd::MessageQueueCommandQueueEnqueueFwd(
+	MessageQueueCommandQueueEnqueueFwd const &source) :
+	MessageQueue::Data(),
+	m_sequenceId(source.m_sequenceId),
+	m_commandHash(source.m_commandHash),
+	m_targetId(source.m_targetId),
+	m_params(source.m_params),
+	m_clearable(source.m_clearable),
+	m_priority(source.m_priority),
+	m_fromServer(source.m_fromServer)
+{
+}	
+
+// ----------------------------------------------------------------------
+
+uint32 MessageQueueCommandQueueEnqueueFwd::getSequenceId() const
+{
+	return m_sequenceId;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 MessageQueueCommandQueueEnqueueFwd::getCommandHash() const
+{
+	return m_commandHash;
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &MessageQueueCommandQueueEnqueueFwd::getTargetId() const
+{
+	return m_targetId;
+}
+
+// ----------------------------------------------------------------------
+
+Unicode::String const &MessageQueueCommandQueueEnqueueFwd::getParams() const
+{
+	return m_params;
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageQueueCommandQueueEnqueueFwd::getClearable() const
+{
+	return m_clearable;
+}
+
+// ----------------------------------------------------------------------
+
+int MessageQueueCommandQueueEnqueueFwd::getPriority() const
+{
+	return m_priority;
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageQueueCommandQueueEnqueueFwd::getFromServer() const
+{
+	return m_fromServer;
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueueCommandQueueEnqueueFwd::pack(const MessageQueue::Data* const data, Archive::ByteStream &target)
+{
+	MessageQueueCommandQueueEnqueueFwd const* const msg = safe_cast<MessageQueueCommandQueueEnqueueFwd const*> (data);
+	
+	if (msg)
+	{
+		Archive::put(target, msg->getSequenceId());
+		Archive::put(target, msg->getCommandHash());
+		Archive::put(target, msg->getTargetId());
+		Archive::put(target, msg->getParams());
+		Archive::put(target, msg->getClearable());
+		Archive::put(target, msg->getPriority());
+		Archive::put(target, msg->getFromServer());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueCommandQueueEnqueueFwd::unpack(Archive::ReadIterator &source)
+{
+	uint32 sequenceId;
+	uint32 commandHash;
+	NetworkId targetId;
+	Unicode::String params;
+	bool clearable;
+	int priority;
+	bool fromServer;
+	
+	Archive::get(source, sequenceId);
+	Archive::get(source, commandHash);
+	Archive::get(source, targetId);
+	Archive::get(source, params);
+	Archive::get(source, clearable);
+	Archive::get(source, priority);
+	Archive::get(source, fromServer);
+	
+	return new MessageQueueCommandQueueEnqueueFwd(sequenceId, commandHash, targetId, params, clearable, priority, fromServer);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueEnqueueFwd.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueEnqueueFwd.h
new file mode 100644
index 00000000..4be74598
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueEnqueueFwd.h
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// MessageQueueCommandQueueEnqueueFwd.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MessageQueueCommandQueueEnqueueFwd_H
+#define INCLUDED_MessageQueueCommandQueueEnqueueFwd_H
+
+// ======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+// ======================================================================
+
+class MemoryBlockManager;
+
+// ======================================================================
+
+class MessageQueueCommandQueueEnqueueFwd: public MessageQueue::Data
+{
+
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	MessageQueueCommandQueueEnqueueFwd(uint32 sequenceId, uint32 commandHash,
+		NetworkId const &targetId, Unicode::String const &params, bool clearable,
+		int priority, bool fromServer=false);
+	MessageQueueCommandQueueEnqueueFwd(const MessageQueueCommandQueueEnqueueFwd &source);
+
+	uint32 getSequenceId() const;
+	uint32 getCommandHash() const;
+	NetworkId const &getTargetId() const;
+	Unicode::String const &getParams() const;
+	bool getClearable() const;
+	int getPriority() const;
+	bool getFromServer() const;
+
+private:
+	MessageQueueCommandQueueEnqueueFwd();
+	MessageQueueCommandQueueEnqueueFwd &operator=(const MessageQueueCommandQueueEnqueueFwd &source);
+
+	uint32           m_sequenceId;
+	uint32           m_commandHash;
+	NetworkId        m_targetId;
+	Unicode::String  m_params;
+	bool             m_clearable;
+	int              m_priority;
+	bool			 m_fromServer;
+};
+
+// ======================================================================
+
+#endif // INCLUDED_MessageQueueCommandQueueEnqueueFwd_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueForceExecuteCommandFwd.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueForceExecuteCommandFwd.cpp
new file mode 100644
index 00000000..e6c9288a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueForceExecuteCommandFwd.cpp
@@ -0,0 +1,117 @@
+// ======================================================================
+//
+// MessageQueueCommandQueueForceExecuteCommandFwd.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/MessageQueueCommandQueueForceExecuteCommandFwd.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueCommandQueueForceExecuteCommandFwd, CM_commandQueueForceExecuteCommandFwd);
+
+//===================================================================
+
+// ----------------------------------------------------------------------
+
+MessageQueueCommandQueueForceExecuteCommandFwd::MessageQueueCommandQueueForceExecuteCommandFwd(uint32 commandHash, NetworkId const &targetId, Unicode::String const &params, int status, bool commandIsFromCommandQueue) :
+	MessageQueue::Data(),
+	m_commandHash(commandHash),
+	m_targetId(targetId),
+	m_params(params),
+	m_status(status),
+	m_commandIsFromCommandQueue(commandIsFromCommandQueue)
+{
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueueCommandQueueForceExecuteCommandFwd::MessageQueueCommandQueueForceExecuteCommandFwd(
+	MessageQueueCommandQueueForceExecuteCommandFwd const &source) :
+	MessageQueue::Data(),
+	m_commandHash(source.m_commandHash),
+	m_targetId(source.m_targetId),
+	m_params(source.m_params),
+	m_status(source.m_status),
+	m_commandIsFromCommandQueue(source.m_commandIsFromCommandQueue)
+{
+}	
+
+// ----------------------------------------------------------------------
+
+uint32 MessageQueueCommandQueueForceExecuteCommandFwd::getCommandHash() const
+{
+	return m_commandHash;
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &MessageQueueCommandQueueForceExecuteCommandFwd::getTargetId() const
+{
+	return m_targetId;
+}
+
+// ----------------------------------------------------------------------
+
+Unicode::String const &MessageQueueCommandQueueForceExecuteCommandFwd::getParams() const
+{
+	return m_params;
+}
+
+// ----------------------------------------------------------------------
+
+int MessageQueueCommandQueueForceExecuteCommandFwd::getStatus() const
+{
+	return m_status;
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageQueueCommandQueueForceExecuteCommandFwd::getCommandIsFromCommandQueue() const
+{
+	return m_commandIsFromCommandQueue;
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueueCommandQueueForceExecuteCommandFwd::pack(const MessageQueue::Data* const data, Archive::ByteStream &target)
+{
+	MessageQueueCommandQueueForceExecuteCommandFwd const* const msg = safe_cast<MessageQueueCommandQueueForceExecuteCommandFwd const*> (data);
+	
+	if (msg)
+	{
+		Archive::put(target, msg->getCommandHash());
+		Archive::put(target, msg->getTargetId());
+		Archive::put(target, msg->getParams());
+		Archive::put(target, msg->getStatus());
+		Archive::put(target, msg->getCommandIsFromCommandQueue());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueCommandQueueForceExecuteCommandFwd::unpack(Archive::ReadIterator &source)
+{
+	uint32 commandHash;
+	NetworkId targetId;
+	Unicode::String params;
+	int status;
+	bool commandIsFromCommandQueue;
+	
+	Archive::get(source, commandHash);
+	Archive::get(source, targetId);
+	Archive::get(source, params);
+	Archive::get(source, status);
+	Archive::get(source, commandIsFromCommandQueue);
+	
+	return new MessageQueueCommandQueueForceExecuteCommandFwd(commandHash, targetId, params, status, commandIsFromCommandQueue);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueForceExecuteCommandFwd.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueForceExecuteCommandFwd.h
new file mode 100644
index 00000000..7667ce8f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueCommandQueueForceExecuteCommandFwd.h
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// MessageQueueCommandQueueForceExecuteCommandFwd.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MessageQueueCommandQueueForceExecuteCommandFwd_H
+#define INCLUDED_MessageQueueCommandQueueForceExecuteCommandFwd_H
+
+// ======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+// ======================================================================
+
+class MessageQueueCommandQueueForceExecuteCommandFwd: public MessageQueue::Data
+{
+
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	MessageQueueCommandQueueForceExecuteCommandFwd(uint32 commandHash, NetworkId const &targetId, Unicode::String const &params, int status, bool commandIsFromCommandQueue);
+	MessageQueueCommandQueueForceExecuteCommandFwd(const MessageQueueCommandQueueForceExecuteCommandFwd &source);
+
+	uint32 getCommandHash() const;
+	NetworkId const &getTargetId() const;
+	Unicode::String const &getParams() const;
+	int getStatus() const;
+	bool getCommandIsFromCommandQueue() const;
+
+private:
+	MessageQueueCommandQueueForceExecuteCommandFwd();
+	MessageQueueCommandQueueForceExecuteCommandFwd &operator=(const MessageQueueCommandQueueForceExecuteCommandFwd &source);
+
+	uint32           m_commandHash;
+	NetworkId        m_targetId;
+	Unicode::String  m_params;
+	int              m_status;
+	bool             m_commandIsFromCommandQueue;
+};
+
+
+// ======================================================================
+
+#endif // INCLUDED_MessageQueueCommandQueueForceExecuteCommandFwd_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueGrantOfflineXp.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueGrantOfflineXp.cpp
new file mode 100644
index 00000000..0c148ae9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueGrantOfflineXp.cpp
@@ -0,0 +1,69 @@
+// ======================================================================
+//
+// MessageQueueGrantOfflineXp.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/MessageQueueGrantOfflineXp.h"
+
+#include <string>
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueGrantOfflineXp, CM_grantOfflineXp);
+
+//===================================================================
+
+
+// ----------------------------------------------------------------------
+
+MessageQueueGrantOfflineXp::MessageQueueGrantOfflineXp(const NetworkId & player, 
+	const std::string & experienceType, int amount) :
+	m_playerId(player),
+	m_xpType(experienceType),
+	m_xpAmount(amount)
+{
+}	
+
+// ----------------------------------------------------------------------
+
+MessageQueueGrantOfflineXp::~MessageQueueGrantOfflineXp()
+{
+	
+}
+
+void MessageQueueGrantOfflineXp::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueGrantOfflineXp* const msg = safe_cast<const MessageQueueGrantOfflineXp*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->m_playerId);
+		Archive::put(target, msg->m_xpType);
+		Archive::put(target, msg->m_xpAmount);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueGrantOfflineXp::unpack(Archive::ReadIterator & source)
+{
+	NetworkId player;
+	std::string experienceType;
+	int amount;
+
+	Archive::get(source, player);
+	Archive::get(source, experienceType);
+	Archive::get(source, amount);
+	
+	return new MessageQueueGrantOfflineXp(player, experienceType, amount);
+}
+
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueGrantOfflineXp.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueGrantOfflineXp.h
new file mode 100644
index 00000000..12fc49a9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueGrantOfflineXp.h
@@ -0,0 +1,63 @@
+//========================================================================
+//
+// MessageQueueGrantOfflineXp.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueGrantOfflineXp_H
+#define INCLUDED_MessageQueueGrantOfflineXp_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+/**
+ */
+class MessageQueueGrantOfflineXp : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	MessageQueueGrantOfflineXp(const NetworkId & player, const std::string & experienceType, int amount);
+	virtual ~MessageQueueGrantOfflineXp();
+	
+	MessageQueueGrantOfflineXp&	operator=	(const MessageQueueGrantOfflineXp & source);
+	MessageQueueGrantOfflineXp(const MessageQueueGrantOfflineXp & source);
+
+	const NetworkId &       getPlayerId() const;
+	const std::string &     getXpType() const;
+	int                     getXpAmount() const;
+	
+private:
+	const NetworkId   m_playerId;
+	const std::string m_xpType;
+	const int         m_xpAmount;
+};
+
+// ======================================================================
+
+inline const NetworkId & MessageQueueGrantOfflineXp::getPlayerId() const
+{
+	return m_playerId;
+}
+
+inline const std::string & MessageQueueGrantOfflineXp::getXpType() const
+{
+	return m_xpType;
+}
+
+inline int MessageQueueGrantOfflineXp::getXpAmount() const
+{
+	return m_xpAmount;
+}
+
+
+// ======================================================================
+
+
+#endif	// INCLUDED_MessageQueueGrantOfflineXp_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.cpp
new file mode 100644
index 00000000..581fb5af
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.cpp
@@ -0,0 +1,114 @@
+// ======================================================================
+//
+// MessageQueuePvpCommand.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/MessageQueuePvpCommand.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueuePvpCommand, CM_pvpMessage);
+
+//===================================================================
+
+MessageQueuePvpCommand::MessageQueuePvpCommand() :
+	MessageQueue::Data(),
+	m_pvpCommands()
+{
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueuePvpCommand::MessageQueuePvpCommand(uint32 command, NetworkId const &idParam, int intParam1, int intParam2) :
+	MessageQueue::Data(),
+	m_pvpCommands()
+{
+	PvpCommand pvpCommand;
+	pvpCommand.m_command = command;
+	pvpCommand.m_idParam = idParam;
+	pvpCommand.m_intParam1 = intParam1;
+	pvpCommand.m_intParam2 = intParam2;
+
+	m_pvpCommands.push_back(pvpCommand);
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueuePvpCommand::MessageQueuePvpCommand(MessageQueuePvpCommand const &source) :
+	MessageQueue::Data(),
+	m_pvpCommands(source.m_pvpCommands)
+{
+}	
+
+// ----------------------------------------------------------------------
+
+void MessageQueuePvpCommand::addPvpCommand(uint32 command, NetworkId const &idParam, int intParam1, int intParam2)
+{
+	PvpCommand pvpCommand;
+	pvpCommand.m_command = command;
+	pvpCommand.m_idParam = idParam;
+	pvpCommand.m_intParam1 = intParam1;
+	pvpCommand.m_intParam2 = intParam2;
+
+	m_pvpCommands.push_back(pvpCommand);
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueuePvpCommand::PvpCommands const & MessageQueuePvpCommand::getPvpCommands() const
+{
+	return m_pvpCommands;
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueuePvpCommand::pack(const MessageQueue::Data* const data, Archive::ByteStream &target)
+{
+	MessageQueuePvpCommand const* const msg = safe_cast<MessageQueuePvpCommand const*> (data);
+	
+	if (msg)
+	{
+		Archive::put(target, static_cast<int>(msg->m_pvpCommands.size()));
+
+		for (PvpCommands::const_iterator i = msg->m_pvpCommands.begin(); i != msg->m_pvpCommands.end(); ++i)
+		{
+			Archive::put(target, i->m_command);
+			Archive::put(target, i->m_idParam);
+			Archive::put(target, i->m_intParam1);
+			Archive::put(target, i->m_intParam2);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueuePvpCommand::unpack(Archive::ReadIterator &source)
+{
+	MessageQueuePvpCommand * const msg = new MessageQueuePvpCommand();
+	PvpCommand pvpCommand;
+	int size;
+
+	Archive::get(source, size);
+
+	for (int i = 0; i < size; ++i)
+	{
+		Archive::get(source, pvpCommand.m_command);
+		Archive::get(source, pvpCommand.m_idParam);
+		Archive::get(source, pvpCommand.m_intParam1);
+		Archive::get(source, pvpCommand.m_intParam2);
+
+		msg->m_pvpCommands.push_back(pvpCommand);
+	}
+
+	return msg;
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.h
new file mode 100644
index 00000000..1ccd61e2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.h
@@ -0,0 +1,52 @@
+// ======================================================================
+//
+// MessageQueuePvpCommand.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MessageQueuePvpCommand_H
+#define INCLUDED_MessageQueuePvpCommand_H
+
+// ======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+// ======================================================================
+
+class MessageQueuePvpCommand: public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	MessageQueuePvpCommand();
+	MessageQueuePvpCommand(uint32 command, NetworkId const &idParam, int intParam1, int intParam2);
+	MessageQueuePvpCommand(const MessageQueuePvpCommand &source);
+
+	struct PvpCommand
+	{
+		uint32    m_command;
+		NetworkId m_idParam;
+		int       m_intParam1;
+		int       m_intParam2;
+	};
+
+	typedef stdvector<PvpCommand>::fwd PvpCommands;
+
+	void addPvpCommand(uint32 command, NetworkId const &idParam, int intParam1, int intParam2);
+	PvpCommands const & getPvpCommands() const;
+
+private:
+	MessageQueuePvpCommand &operator=(const MessageQueuePvpCommand &source);
+
+	PvpCommands m_pvpCommands;
+};
+
+// ======================================================================
+
+#endif // INCLUDED_MessageQueuePvpCommand_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueScriptTrigger.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueScriptTrigger.cpp
new file mode 100644
index 00000000..3ab26fb6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueScriptTrigger.cpp
@@ -0,0 +1,59 @@
+// MessageQueueScriptTrigger.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/MessageQueueScriptTrigger.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueScriptTrigger, CM_scriptTrigger);
+
+//===================================================================
+
+
+//-----------------------------------------------------------------------
+
+MessageQueueScriptTrigger::MessageQueueScriptTrigger(const int i, const Archive::ByteStream & d) :
+scriptParamData(d),
+triggerId(i)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueScriptTrigger::~MessageQueueScriptTrigger()
+{
+}
+
+//-----------------------------------------------------------------------
+
+
+void MessageQueueScriptTrigger::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueScriptTrigger* const msg = safe_cast<const MessageQueueScriptTrigger*> (data);
+	if(msg)
+	{
+		Archive::put(target, msg->getTriggerId());
+		Archive::put(target, msg->getScriptParamData());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueScriptTrigger::unpack(Archive::ReadIterator & source)
+{
+	Archive::ByteStream paramData;
+	int triggerId;
+	Archive::get(source, triggerId);
+	Archive::get(source, paramData);
+	return new MessageQueueScriptTrigger(triggerId, paramData);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueScriptTrigger.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueScriptTrigger.h
new file mode 100644
index 00000000..a0969cf3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueScriptTrigger.h
@@ -0,0 +1,55 @@
+// MessageQueueScriptTrigger.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_MessageQueueScriptTrigger_H
+#define	_INCLUDED_MessageQueueScriptTrigger_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+namespace Archive {
+	class ByteStream;
+}
+
+//-----------------------------------------------------------------------
+
+class MessageQueueScriptTrigger : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	MessageQueueScriptTrigger(int trigId, const Archive::ByteStream & scriptParamData);
+	~MessageQueueScriptTrigger();
+
+	const Archive::ByteStream &  getScriptParamData  () const;
+	const int                    getTriggerId        () const;
+
+private:
+	MessageQueueScriptTrigger & operator = (const MessageQueueScriptTrigger & rhs);
+	MessageQueueScriptTrigger(const MessageQueueScriptTrigger & source);
+
+	Archive::ByteStream  scriptParamData;
+	int                  triggerId;
+};
+
+//-----------------------------------------------------------------------
+
+inline const Archive::ByteStream & MessageQueueScriptTrigger::getScriptParamData () const
+{
+	return scriptParamData;
+}
+
+//-----------------------------------------------------------------------
+
+inline const int MessageQueueScriptTrigger::getTriggerId () const
+{
+	return triggerId;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MessageQueueScriptTrigger_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueSetState.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueSetState.cpp
new file mode 100644
index 00000000..e1cdff16
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueSetState.cpp
@@ -0,0 +1,78 @@
+// ======================================================================
+//
+// MessageQueueSetState.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/MessageQueueSetState.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueSetState, CM_setState);
+
+//===================================================================
+
+
+
+MessageQueueSetState::MessageQueueSetState(int state, bool value) :
+	MessageQueue::Data(),
+	m_state(state),
+	m_value(value)
+{
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueueSetState::MessageQueueSetState(
+	MessageQueueSetState const &source) :
+	MessageQueue::Data(),
+	m_state(source.m_state),
+	m_value(source.m_value)
+{
+}	
+
+// ----------------------------------------------------------------------
+
+int MessageQueueSetState::getState() const
+{
+	return m_state;
+}
+
+// ----------------------------------------------------------------------
+
+bool MessageQueueSetState::getValue() const
+{
+	return m_value;
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueueSetState::pack(const MessageQueue::Data* data, Archive::ByteStream & target)
+{
+	const MessageQueueSetState * const msg = safe_cast<const MessageQueueSetState *>(data);
+	if (msg)
+	{
+		Archive::put(target, msg->getState());
+		Archive::put(target, msg->getValue());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data * MessageQueueSetState::unpack(Archive::ReadIterator & source)
+{
+	int state;
+	bool value;
+	Archive::get(source, state);
+	Archive::get(source, value);
+	return new MessageQueueSetState(state, value);
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueSetState.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueSetState.h
new file mode 100644
index 00000000..cf2395e6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueSetState.h
@@ -0,0 +1,46 @@
+// ======================================================================
+//
+// MessageQueueSetState.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MessageQueueSetState_H
+#define INCLUDED_MessageQueueSetState_H
+
+// ======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+// ======================================================================
+
+class MessageQueueSetState: public MessageQueue::Data
+{
+
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	MessageQueueSetState(int state, bool value);
+	MessageQueueSetState(const MessageQueueSetState &source);
+
+	int getState() const;
+	bool getValue() const;
+
+private:
+	MessageQueueSetState();
+	MessageQueueSetState &operator=(const MessageQueueSetState &source);
+
+	int   m_state;
+	bool  m_value;
+};
+
+// ----------------------------------------------------------------------
+
+// ======================================================================
+
+#endif // INCLUDED_MessageQueueSetState_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueTeleportObject.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueTeleportObject.cpp
new file mode 100644
index 00000000..41c64d6d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueTeleportObject.cpp
@@ -0,0 +1,74 @@
+// ======================================================================
+//
+// MessageQueueTeleportObject.cpp
+// Copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/MessageQueueTeleportObject.h"
+
+#include <string>
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueTeleportObject, CM_teleportObject);
+
+//===================================================================
+
+MessageQueueTeleportObject::MessageQueueTeleportObject(Vector const &position_w, NetworkId const &targetContainerId, std::string const &targetCellName, Vector const &position_p, std::string const &scriptCallback) :
+	m_position_w(position_w),
+	m_targetContainerId(targetContainerId),
+	m_targetCellName(targetCellName),
+	m_position_p(position_p),
+	m_scriptCallback(scriptCallback)
+{
+}	
+
+// ----------------------------------------------------------------------
+
+MessageQueueTeleportObject::~MessageQueueTeleportObject()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void MessageQueueTeleportObject::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueTeleportObject* const msg = safe_cast<const MessageQueueTeleportObject*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->m_position_w);
+		Archive::put(target, msg->m_targetContainerId);
+		Archive::put(target, msg->m_targetCellName);
+		Archive::put(target, msg->m_position_p);
+		Archive::put(target, msg->m_scriptCallback);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueTeleportObject::unpack(Archive::ReadIterator & source)
+{
+	Vector position_w;
+	NetworkId targetContainerId;
+	std::string targetCellName;
+	Vector position_p;
+	std::string scriptCallback;
+
+	Archive::get(source, position_w);
+	Archive::get(source, targetContainerId);
+	Archive::get(source, targetCellName);
+	Archive::get(source, position_p);
+	Archive::get(source, scriptCallback);
+	
+	return new MessageQueueTeleportObject(position_w, targetContainerId, targetCellName, position_p, scriptCallback);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueTeleportObject.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueTeleportObject.h
new file mode 100644
index 00000000..52b28f11
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueueTeleportObject.h
@@ -0,0 +1,86 @@
+// ======================================================================
+//
+// MessageQueueTeleportObject.h
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MessageQueueTeleportObject_H
+#define INCLUDED_MessageQueueTeleportObject_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+// ======================================================================
+
+class MemoryBlockManager;
+
+// ======================================================================
+
+class MessageQueueTeleportObject : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	MessageQueueTeleportObject(Vector const &position_w, NetworkId const &targetContainerId, std::string const &targetCellName, Vector const &position_p, std::string const &scriptCallback);
+	virtual ~MessageQueueTeleportObject();
+
+	Vector const &getPosition_w() const;
+	NetworkId const &getTargetContainerId() const;
+	std::string const &getTargetCellName() const;
+	Vector const &getPosition_p() const;
+	std::string const &getScriptCallback() const;
+
+private:
+	MessageQueueTeleportObject(MessageQueueTeleportObject const &);
+	MessageQueueTeleportObject &operator=(MessageQueueTeleportObject const &);
+
+private:
+	Vector m_position_w;
+	NetworkId m_targetContainerId;
+	std::string m_targetCellName;
+	Vector m_position_p;
+	std::string m_scriptCallback;
+};
+
+// ----------------------------------------------------------------------
+
+inline Vector const &MessageQueueTeleportObject::getPosition_w() const
+{
+	return m_position_w;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &MessageQueueTeleportObject::getTargetContainerId() const
+{
+	return m_targetContainerId;
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &MessageQueueTeleportObject::getTargetCellName() const
+{
+	return m_targetCellName;
+}
+
+// ----------------------------------------------------------------------
+
+inline Vector const &MessageQueueTeleportObject::getPosition_p() const
+{
+	return m_position_p;
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &MessageQueueTeleportObject::getScriptCallback() const
+{
+	return m_scriptCallback;
+}
+
+// ======================================================================
+
+#endif	// INCLUDED_MessageQueueTeleportObject_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PersistedPlayerMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PersistedPlayerMessage.cpp
new file mode 100644
index 00000000..e30aaccb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PersistedPlayerMessage.cpp
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// PersistedPlayerMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/PersistedPlayerMessage.h"
+
+// ======================================================================
+
+PersistedPlayerMessage::PersistedPlayerMessage(const NetworkId &playerId) :
+		GameNetworkMessage("PersistedPlayerMessage"),
+		m_playerId(playerId)
+{
+	addVariable(m_playerId);
+}
+
+// ----------------------------------------------------------------------
+
+PersistedPlayerMessage::PersistedPlayerMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("PersistedPlayerMessage"),
+		m_playerId()
+{
+	addVariable(m_playerId);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+PersistedPlayerMessage::~PersistedPlayerMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PersistedPlayerMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PersistedPlayerMessage.h
new file mode 100644
index 00000000..a48f7796
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PersistedPlayerMessage.h
@@ -0,0 +1,56 @@
+// ======================================================================
+//
+// PersistedPlayerMessage.h
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_PersistedPlayerMessage_H
+#define INCLUDED_PersistedPlayerMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Sent From:  DatabaseServer
+ *      To:    GameServer
+ * Action:     The specified player has been persisted.  The object can
+ *             be deleted from memory.
+ *
+ * Sent From:  GameServer
+ * Sent To:    PlanetServer
+ * Action:     The specified player has been persisted and deleted.
+ *             Reload him if he logs in again.
+ */
+class PersistedPlayerMessage: public GameNetworkMessage
+{
+public:
+	PersistedPlayerMessage(NetworkId const &playerId);
+	PersistedPlayerMessage(Archive::ReadIterator &source);
+	~PersistedPlayerMessage();
+	
+public:
+	NetworkId const &getPlayerId() const;
+
+private:
+	Archive::AutoVariable<NetworkId>  m_playerId;
+	
+private:
+	//disabled functions:
+	PersistedPlayerMessage            ();
+	PersistedPlayerMessage            (PersistedPlayerMessage const &);
+	PersistedPlayerMessage &operator= (PersistedPlayerMessage const &);
+
+};
+
+// ======================================================================
+
+inline NetworkId const &PersistedPlayerMessage::getPlayerId() const
+{
+	return m_playerId.get();
+} 
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PlayedTimeAccumMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PlayedTimeAccumMessage.cpp
new file mode 100644
index 00000000..8b680ba9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PlayedTimeAccumMessage.cpp
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// PlayedTimeAccumMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/PlayedTimeAccumMessage.h"
+
+// ======================================================================
+
+PlayedTimeAccumMessage::PlayedTimeAccumMessage(NetworkId const &networkId, float playedTimeAccum) :
+	GameNetworkMessage("PlayedTimeAccumMessage"),
+	m_networkId(networkId),
+	m_playedTimeAccum(playedTimeAccum)
+{
+	addVariable(m_networkId);
+	addVariable(m_playedTimeAccum);
+}
+
+// ----------------------------------------------------------------------
+
+PlayedTimeAccumMessage::PlayedTimeAccumMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("PlayedTimeAccumMessage"),
+	m_networkId(),
+	m_playedTimeAccum(0.0f)
+{
+	addVariable(m_networkId);
+	addVariable(m_playedTimeAccum);
+	unpack(source);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PlayedTimeAccumMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PlayedTimeAccumMessage.h
new file mode 100644
index 00000000..acb5fdf0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/PlayedTimeAccumMessage.h
@@ -0,0 +1,56 @@
+// ======================================================================
+//
+// PlayedTimeAccumMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_PlayedTimeAccumMessage_H
+#define	_INCLUDED_PlayedTimeAccumMessage_H
+
+// ======================================================================
+
+#include "sharedMath/Transform.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+class PlayedTimeAccumMessage: public GameNetworkMessage
+{
+public:
+	PlayedTimeAccumMessage(NetworkId const &networkId, float playedTimeAccum);
+	PlayedTimeAccumMessage(Archive::ReadIterator &source);
+
+	NetworkId const &getNetworkId() const;
+	float getPlayedTimeAccum() const;
+	
+private:
+	Archive::AutoVariable<NetworkId> m_networkId;
+	Archive::AutoVariable<float>     m_playedTimeAccum;
+
+private:
+	PlayedTimeAccumMessage(PlayedTimeAccumMessage const &);
+	PlayedTimeAccumMessage &operator=(PlayedTimeAccumMessage const &);
+};
+
+// ======================================================================
+
+inline NetworkId const &PlayedTimeAccumMessage::getNetworkId() const
+{
+	return m_networkId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float PlayedTimeAccumMessage::getPlayedTimeAccum() const
+{
+	return m_playedTimeAccum.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_PlayedTimeAccumMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ProfilerOperationMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ProfilerOperationMessage.cpp
new file mode 100644
index 00000000..fbd46a8d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ProfilerOperationMessage.cpp
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// ProfilerOperationMessage.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ProfilerOperationMessage.h"
+
+// ======================================================================
+
+ProfilerOperationMessage::ProfilerOperationMessage(uint32 processId, std::string const &operation) :
+	GameNetworkMessage("ProfilerOperationMessage"),
+	m_processId(processId),
+	m_operation(operation)
+{
+	addVariable(m_processId);
+	addVariable(m_operation);
+}
+
+// ----------------------------------------------------------------------
+
+ProfilerOperationMessage::ProfilerOperationMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("ProfilerOperationMessage"),
+	m_processId(),
+	m_operation()
+{
+	addVariable(m_processId);
+	addVariable(m_operation);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ProfilerOperationMessage::~ProfilerOperationMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ProfilerOperationMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ProfilerOperationMessage.h
new file mode 100644
index 00000000..52719a82
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ProfilerOperationMessage.h
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// ProfilerOperationMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_ProfilerOperationMessage_H
+#define	_INCLUDED_ProfilerOperationMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class ProfilerOperationMessage : public GameNetworkMessage
+{
+public:
+	ProfilerOperationMessage(uint32 processId, std::string const &operation);
+	ProfilerOperationMessage(Archive::ReadIterator & source);
+	~ProfilerOperationMessage();
+
+public:
+	uint32 getProcessId() const;
+	std::string const &getOperation() const;
+	
+private:
+	Archive::AutoVariable<uint32> m_processId;
+	Archive::AutoVariable<std::string> m_operation;
+
+private:
+	ProfilerOperationMessage(ProfilerOperationMessage const &);
+	ProfilerOperationMessage &operator=(ProfilerOperationMessage const &);
+};
+
+// ======================================================================
+
+inline uint32 ProfilerOperationMessage::getProcessId() const
+{
+	return m_processId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &ProfilerOperationMessage::getOperation() const
+{
+	return m_operation.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ProfilerOperationMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadAdminTableMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadAdminTableMessage.cpp
new file mode 100644
index 00000000..858f1744
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadAdminTableMessage.cpp
@@ -0,0 +1,34 @@
+// ======================================================================
+//
+// ReloadAdminTableMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ReloadAdminTableMessage.h"
+
+// ======================================================================
+
+ReloadAdminTableMessage::ReloadAdminTableMessage() :
+	GameNetworkMessage("ReloadAdminTableMessage")
+{
+}
+
+// ----------------------------------------------------------------------
+
+ReloadAdminTableMessage::ReloadAdminTableMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("ReloadAdminTableMessage")
+{
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ReloadAdminTableMessage::~ReloadAdminTableMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadAdminTableMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadAdminTableMessage.h
new file mode 100644
index 00000000..55b1b9fe
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadAdminTableMessage.h
@@ -0,0 +1,41 @@
+//========================================================================
+//
+// ReloadAdminTableMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_ReloadAdminTableMessage_H
+#define	_INCLUDED_ReloadAdminTableMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:  Game Server
+ * Action:  Tells a game server to reload the admin datatable
+ */
+class ReloadAdminTableMessage: public GameNetworkMessage
+{
+public:
+	ReloadAdminTableMessage();
+	ReloadAdminTableMessage(Archive::ReadIterator & source);
+	~ReloadAdminTableMessage();
+
+private:
+	ReloadAdminTableMessage(const ReloadAdminTableMessage&);
+	ReloadAdminTableMessage& operator= (const ReloadAdminTableMessage&);
+};
+
+
+// ======================================================================
+
+#endif	// _INCLUDED_ReloadAdminTableMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadCommandTableMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadCommandTableMessage.cpp
new file mode 100644
index 00000000..ed6bddf8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadCommandTableMessage.cpp
@@ -0,0 +1,34 @@
+// ======================================================================
+//
+// ReloadCommandTableMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ReloadCommandTableMessage.h"
+
+// ======================================================================
+
+ReloadCommandTableMessage::ReloadCommandTableMessage() :
+	GameNetworkMessage("ReloadCommandTableMessage")
+{
+}
+
+// ----------------------------------------------------------------------
+
+ReloadCommandTableMessage::ReloadCommandTableMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("ReloadCommandTableMessage")
+{
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ReloadCommandTableMessage::~ReloadCommandTableMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadCommandTableMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadCommandTableMessage.h
new file mode 100644
index 00000000..23f1ca6e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadCommandTableMessage.h
@@ -0,0 +1,41 @@
+//========================================================================
+//
+// ReloadCommandTableMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_ReloadCommandTableMessage_H
+#define	_INCLUDED_ReloadCommandTableMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:  Game Server
+ * Action:  Tells a game server to reload the command datatable
+ */
+class ReloadCommandTableMessage: public GameNetworkMessage
+{
+public:
+	ReloadCommandTableMessage();
+	ReloadCommandTableMessage(Archive::ReadIterator & source);
+	~ReloadCommandTableMessage();
+
+private:
+	ReloadCommandTableMessage(const ReloadCommandTableMessage&);
+	ReloadCommandTableMessage& operator= (const ReloadCommandTableMessage&);
+};
+
+
+// ======================================================================
+
+#endif	// _INCLUDED_ReloadCommandTableMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadDatatableMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadDatatableMessage.cpp
new file mode 100644
index 00000000..b9ae20d5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadDatatableMessage.cpp
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// ReloadDatatableMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ReloadDatatableMessage.h"
+
+const char * const ReloadDatatableMessage::ms_messageName = "ReloadDatatableMessage";
+
+// ======================================================================
+
+ReloadDatatableMessage::ReloadDatatableMessage(const std::string & table) :
+	GameNetworkMessage(ms_messageName),
+	m_table(table)
+{
+	addVariable(m_table);
+}
+
+// ----------------------------------------------------------------------
+
+ReloadDatatableMessage::ReloadDatatableMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage(ms_messageName),
+	m_table()
+{
+	addVariable(m_table);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ReloadDatatableMessage::~ReloadDatatableMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadDatatableMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadDatatableMessage.h
new file mode 100644
index 00000000..0ed2b436
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadDatatableMessage.h
@@ -0,0 +1,57 @@
+//========================================================================
+//
+// ReloadDatatableMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_ReloadDatatableMessage_H
+#define	_INCLUDED_ReloadDatatableMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:  DBProcess
+ * Action:  teleport a person to a target objectid
+ */
+class ReloadDatatableMessage: public GameNetworkMessage
+{
+public:
+	ReloadDatatableMessage(const std::string & table);
+	ReloadDatatableMessage(Archive::ReadIterator & source);
+	~ReloadDatatableMessage();
+
+public:
+	const std::string & getTable() const;
+	
+public:
+	// message name
+	static const char * const ms_messageName;
+
+private:
+	Archive::AutoVariable<std::string>  m_table;
+
+private:
+	ReloadDatatableMessage(const ReloadDatatableMessage&);
+	ReloadDatatableMessage& operator= (const ReloadDatatableMessage&);
+};
+
+// ======================================================================
+
+inline const std::string & ReloadDatatableMessage::getTable() const
+{
+	return m_table.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ReloadDatatableMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadScriptMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadScriptMessage.cpp
new file mode 100644
index 00000000..d2ce2403
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadScriptMessage.cpp
@@ -0,0 +1,38 @@
+// ======================================================================
+//
+// ReloadScriptMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ReloadScriptMessage.h"
+
+// ======================================================================
+
+ReloadScriptMessage::ReloadScriptMessage(const std::string & script) :
+	GameNetworkMessage("ReloadScriptMessage"),
+	m_script(script)
+{
+	addVariable(m_script);
+}
+
+// ----------------------------------------------------------------------
+
+ReloadScriptMessage::ReloadScriptMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("ReloadScriptMessage"),
+	m_script()
+{
+	addVariable(m_script);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ReloadScriptMessage::~ReloadScriptMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadScriptMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadScriptMessage.h
new file mode 100644
index 00000000..84047f80
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadScriptMessage.h
@@ -0,0 +1,53 @@
+//========================================================================
+//
+// ReloadScriptMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_ReloadScriptMessage_H
+#define	_INCLUDED_ReloadScriptMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:  DBProcess
+ * Action:  teleport a person to a target objectid
+ */
+class ReloadScriptMessage: public GameNetworkMessage
+{
+public:
+	ReloadScriptMessage(const std::string & script);
+	ReloadScriptMessage(Archive::ReadIterator & source);
+	~ReloadScriptMessage();
+
+public:
+	const std::string & getScript() const;
+	
+private:
+	Archive::AutoVariable<std::string>  m_script;
+
+private:
+	ReloadScriptMessage(const ReloadScriptMessage&);
+	ReloadScriptMessage& operator= (const ReloadScriptMessage&);
+};
+
+// ======================================================================
+
+inline const std::string & ReloadScriptMessage::getScript() const
+{
+	return m_script.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ReloadScriptMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadTemplateMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadTemplateMessage.cpp
new file mode 100644
index 00000000..901cefda
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadTemplateMessage.cpp
@@ -0,0 +1,38 @@
+// ======================================================================
+//
+// ReloadTemplateMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ReloadTemplateMessage.h"
+
+// ======================================================================
+
+ReloadTemplateMessage::ReloadTemplateMessage(const std::string & templateName) :
+	GameNetworkMessage("ReloadTemplateMessage"),
+	m_template(templateName)
+{
+	addVariable(m_template);
+}
+
+// ----------------------------------------------------------------------
+
+ReloadTemplateMessage::ReloadTemplateMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("ReloadTemplateMessage"),
+	m_template()
+{
+	addVariable(m_template);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ReloadTemplateMessage::~ReloadTemplateMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadTemplateMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadTemplateMessage.h
new file mode 100644
index 00000000..63437f39
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/ReloadTemplateMessage.h
@@ -0,0 +1,53 @@
+//========================================================================
+//
+// ReloadTemplateMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_ReloadTemplateMessage_H
+#define	_INCLUDED_ReloadTemplateMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:  DBProcess
+ * Action:  reload an object template from disk
+ */
+class ReloadTemplateMessage: public GameNetworkMessage
+{
+public:
+	ReloadTemplateMessage(const std::string & templateName);
+	ReloadTemplateMessage(Archive::ReadIterator & source);
+	~ReloadTemplateMessage();
+
+public:
+	const std::string & getTemplate() const;
+	
+private:
+	Archive::AutoVariable<std::string>  m_template;
+
+private:
+	ReloadTemplateMessage(const ReloadTemplateMessage&);
+	ReloadTemplateMessage& operator= (const ReloadTemplateMessage&);
+};
+
+// ======================================================================
+
+inline const std::string & ReloadTemplateMessage::getTemplate() const
+{
+	return m_template.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ReloadTemplateMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RenameCharacterMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RenameCharacterMessage.cpp
new file mode 100644
index 00000000..bd4cae1a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RenameCharacterMessage.cpp
@@ -0,0 +1,114 @@
+//========================================================================
+//
+// RenameCharacterMessage.cpp
+//
+// copyright 2002 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/RenameCharacterMessage.h"
+
+#include "UnicodeUtils.h"
+
+//-----------------------------------------------------------------------
+
+RenameCharacterMessage::RenameCharacterMessage(const NetworkId &characterId, const Unicode::String &newName, const NetworkId &requestedBy) :
+	GameNetworkMessage("RenameCharacterMessage"),
+	m_characterId(characterId),
+	m_newName(newName),
+	m_newNormalizedName(),
+	m_requestedBy(requestedBy)
+{
+	addVariable(m_characterId);
+	addVariable(m_newName);
+	addVariable(m_newNormalizedName);
+	addVariable(m_requestedBy);
+}
+
+//-----------------------------------------------------------------------
+
+RenameCharacterMessage::RenameCharacterMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("RenameCharacterMessage"),
+		m_characterId(),
+		m_newName(),
+		m_newNormalizedName(),
+		m_requestedBy()
+{
+	addVariable(m_characterId);
+	addVariable(m_newName);
+	addVariable(m_newNormalizedName);
+	addVariable(m_requestedBy);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RenameCharacterMessage::~RenameCharacterMessage()
+{
+}
+
+//========================================================================
+
+RenameCharacterMessageEx::RenameCharacterMessageEx(RenameCharacterMessageSource renameCharacterMessageSource, uint32 stationId, const NetworkId &characterId, const Unicode::String &newName, const Unicode::String &oldName, const NetworkId &requestedBy) :
+	GameNetworkMessage("RenameCharacterMessageEx"),
+	m_stationId(stationId),
+	m_characterId(characterId),
+	m_newName(newName),
+	m_oldName(oldName),
+	m_requestedBy(requestedBy),
+	m_renameCharacterMessageSource(static_cast<int8>(renameCharacterMessageSource)),
+	m_lastNameChangeOnly(false)
+{
+	{
+		static Unicode::String const delimiters(Unicode::narrowToWide(" "));
+
+		Unicode::UnicodeStringVector newNameTokens;
+		if (!Unicode::tokenize(newName, newNameTokens, &delimiters, NULL))
+			newNameTokens.clear();
+
+		Unicode::UnicodeStringVector oldNameTokens;
+		if (!Unicode::tokenize(oldName, oldNameTokens, &delimiters, NULL))
+			oldNameTokens.clear();
+
+		m_lastNameChangeOnly.set(((newNameTokens.size() >= 1) && (oldNameTokens.size() >= 1) && Unicode::caseInsensitiveCompare(newNameTokens[0], oldNameTokens[0])));
+	}
+
+	addVariable(m_stationId);
+	addVariable(m_characterId);
+	addVariable(m_newName);
+	addVariable(m_oldName);
+	addVariable(m_requestedBy);
+	addVariable(m_renameCharacterMessageSource);
+	addVariable(m_lastNameChangeOnly);
+}
+
+//-----------------------------------------------------------------------
+
+RenameCharacterMessageEx::RenameCharacterMessageEx(Archive::ReadIterator & source) :
+		GameNetworkMessage("RenameCharacterMessageEx"),
+		m_stationId(),
+		m_characterId(),
+		m_newName(),
+		m_oldName(),
+		m_requestedBy(),
+		m_renameCharacterMessageSource(),
+		m_lastNameChangeOnly(false)
+{
+	addVariable(m_stationId);
+	addVariable(m_characterId);
+	addVariable(m_newName);
+	addVariable(m_oldName);
+	addVariable(m_requestedBy);
+	addVariable(m_renameCharacterMessageSource);
+	addVariable(m_lastNameChangeOnly);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RenameCharacterMessageEx::~RenameCharacterMessageEx()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RenameCharacterMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RenameCharacterMessage.h
new file mode 100644
index 00000000..79d439e1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RenameCharacterMessage.h
@@ -0,0 +1,159 @@
+//========================================================================
+//
+// RenameCharacterMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_RenameCharacterMessage_H
+#define	_INCLUDED_RenameCharacterMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:    DBProcess
+ * Action:     Rename the specified character-controlled object.  Name rules
+ *             and uniqueness are not enforced.
+ *
+ * Sent from:  DBProcess
+ * Send to:    LoginServer (via Central)
+ * Action:     Update the character's name in the login database.
+ */
+class RenameCharacterMessage : public GameNetworkMessage
+{
+  public:
+	RenameCharacterMessage  (const NetworkId &characterId, const Unicode::String &newName, const NetworkId &requestedBy);
+	RenameCharacterMessage  (Archive::ReadIterator & source);
+	~RenameCharacterMessage ();
+
+  public:
+	const NetworkId &       getCharacterId       () const;
+	const Unicode::String & getNewName           () const;
+	const NetworkId &       getRequestedBy       () const;
+	
+  private:
+	Archive::AutoVariable<NetworkId>        m_characterId;
+	Archive::AutoVariable<Unicode::String>  m_newName;
+	Archive::AutoVariable<Unicode::String>  m_newNormalizedName;
+	Archive::AutoVariable<NetworkId>        m_requestedBy;
+
+  private:
+	RenameCharacterMessage            (const RenameCharacterMessage&);
+	RenameCharacterMessage& operator= (const RenameCharacterMessage&);
+};
+
+// ======================================================================
+
+inline const NetworkId &RenameCharacterMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String &RenameCharacterMessage::getNewName() const
+{
+	return m_newName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &RenameCharacterMessage::getRequestedBy() const
+{
+	return m_requestedBy.get();
+}
+
+// ======================================================================
+
+class RenameCharacterMessageEx : public GameNetworkMessage
+{
+public:
+	enum RenameCharacterMessageSource {RCMS_console_god_command, RCMS_cs_tool, RCMS_cts_rename, RCMS_player_request};
+
+  public:
+	RenameCharacterMessageEx  (RenameCharacterMessageSource renameCharacterMessageSource, uint32 stationId, const NetworkId &characterId, const Unicode::String &newName, const Unicode::String &oldName, const NetworkId &requestedBy);
+	RenameCharacterMessageEx  (Archive::ReadIterator & source);
+	~RenameCharacterMessageEx ();
+
+  public:
+	uint32                  getStationId         () const;
+	const NetworkId &       getCharacterId       () const;
+	const Unicode::String & getNewName           () const;
+	const Unicode::String & getOldName           () const;
+	const NetworkId &       getRequestedBy       () const;
+	RenameCharacterMessageSource getRenameCharacterMessageSource () const;
+	bool                    getLastNameChangeOnly() const;
+
+  private:
+	Archive::AutoVariable<uint32>           m_stationId;
+	Archive::AutoVariable<NetworkId>        m_characterId;
+	Archive::AutoVariable<Unicode::String>  m_newName;
+	Archive::AutoVariable<Unicode::String>  m_oldName;
+	Archive::AutoVariable<NetworkId>        m_requestedBy;
+	Archive::AutoVariable<int8>             m_renameCharacterMessageSource;
+	Archive::AutoVariable<bool>             m_lastNameChangeOnly;
+
+  private:
+	RenameCharacterMessageEx            (const RenameCharacterMessageEx&);
+	RenameCharacterMessageEx& operator= (const RenameCharacterMessageEx&);
+};
+
+// ======================================================================
+
+inline uint32 RenameCharacterMessageEx::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &RenameCharacterMessageEx::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String &RenameCharacterMessageEx::getNewName() const
+{
+	return m_newName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String &RenameCharacterMessageEx::getOldName() const
+{
+	return m_oldName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &RenameCharacterMessageEx::getRequestedBy() const
+{
+	return m_requestedBy.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline RenameCharacterMessageEx::RenameCharacterMessageSource RenameCharacterMessageEx::getRenameCharacterMessageSource () const
+{
+	return static_cast<RenameCharacterMessageSource>(m_renameCharacterMessageSource.get());
+}
+
+// ----------------------------------------------------------------------
+
+inline bool RenameCharacterMessageEx::getLastNameChangeOnly() const
+{
+	return m_lastNameChangeOnly.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RequestBiographyMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RequestBiographyMessage.cpp
new file mode 100644
index 00000000..16b078b8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RequestBiographyMessage.cpp
@@ -0,0 +1,38 @@
+//========================================================================
+//
+// RequestBiographyMessage.cpp - tells Gameserver object baseline data has ended.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/RequestBiographyMessage.h"
+
+//-----------------------------------------------------------------------
+
+RequestBiographyMessage::RequestBiographyMessage(const NetworkId &owner) :
+	GameNetworkMessage("RequestBiographyMessage"),
+	m_owner(owner)
+{
+	addVariable(m_owner);
+}
+
+//-----------------------------------------------------------------------
+
+RequestBiographyMessage::RequestBiographyMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("RequestBiographyMessage"),
+		m_owner()
+{
+	addVariable(m_owner);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RequestBiographyMessage::~RequestBiographyMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RequestBiographyMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RequestBiographyMessage.h
new file mode 100644
index 00000000..76a19b59
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RequestBiographyMessage.h
@@ -0,0 +1,50 @@
+//========================================================================
+//
+// RequestBiographyMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_RequestBiographyMessage_H
+#define	_INCLUDED_RequestBiographyMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:  DBProcess
+ * Action:  Retrieve the biography from the database and respond with
+ *          BiographyMessage
+ */
+class RequestBiographyMessage : public GameNetworkMessage
+{
+  public:
+	RequestBiographyMessage  (const NetworkId &owner);
+	RequestBiographyMessage  (Archive::ReadIterator & source);
+	~RequestBiographyMessage ();
+
+	const NetworkId &getOwner() const;
+	
+  private:
+	Archive::AutoVariable<NetworkId> m_owner;
+
+  private:
+	RequestBiographyMessage(const RequestBiographyMessage&);
+	RequestBiographyMessage& operator= (const RequestBiographyMessage&);
+};
+
+// ======================================================================
+
+inline const NetworkId &RequestBiographyMessage::getOwner() const
+{
+	return m_owner.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_RequestBiographyMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RestartServerMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RestartServerMessage.cpp
new file mode 100644
index 00000000..b4c3a5d0
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RestartServerMessage.cpp
@@ -0,0 +1,65 @@
+// ======================================================================
+//
+// RestartServerMessage.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/RestartServerMessage.h"
+
+// ======================================================================
+
+RestartServerMessage::RestartServerMessage(std::string const & scene, int x, int z) :
+	GameNetworkMessage("RestartServerMessage"),
+	m_scene(scene),
+	m_x(x),
+	m_z(z)
+{
+	addVariable(m_scene);
+	addVariable(m_x);
+	addVariable(m_z);
+}
+
+//-----------------------------------------------------------------------
+
+RestartServerMessage::RestartServerMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("RestartServerMessage"),
+	m_scene(),
+	m_x(),
+	m_z()
+{
+	addVariable(m_scene);
+	addVariable(m_x);
+	addVariable(m_z);
+	unpack(source); //lint !e1506 // virtual in constructor
+}
+
+//-----------------------------------------------------------------------
+
+RestartServerMessage::~RestartServerMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & RestartServerMessage::getScene() const
+{
+	return m_scene.get();
+}
+
+// ----------------------------------------------------------------------
+
+int RestartServerMessage::getX() const
+{
+	return m_x.get();
+}
+
+// ----------------------------------------------------------------------
+
+int RestartServerMessage::getZ() const
+{
+	return m_z.get();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RestartServerMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RestartServerMessage.h
new file mode 100644
index 00000000..59240811
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RestartServerMessage.h
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// RestartServerMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_RestartServerMessage_H
+#define	_INCLUDED_RestartServerMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class RestartServerMessage: public GameNetworkMessage
+{
+public:
+	RestartServerMessage(std::string const & scene, int x, int z);
+	RestartServerMessage(Archive::ReadIterator &source);
+	~RestartServerMessage();
+
+	std::string const & getScene() const;
+	int getX() const;
+	int getZ() const;
+
+private:
+	RestartServerMessage(RestartServerMessage const &);
+	RestartServerMessage &operator=(RestartServerMessage const &);
+
+private:
+	Archive::AutoVariable<std::string> m_scene;
+	Archive::AutoVariable<int> m_x;
+	Archive::AutoVariable<int> m_z;
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RetrievedItemLoadMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RetrievedItemLoadMessage.cpp
new file mode 100644
index 00000000..8247f037
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RetrievedItemLoadMessage.cpp
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// RetrievedItemLoadMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/RetrievedItemLoadMessage.h"
+
+// ======================================================================
+
+RetrievedItemLoadMessage::RetrievedItemLoadMessage(NetworkId const &ownerId, NetworkId const &itemId) :
+	GameNetworkMessage("RetrievedItemLoadMessage"),
+	m_ownerId(ownerId),
+	m_itemId(itemId)
+{
+	addVariable(m_ownerId);
+	addVariable(m_itemId);
+}
+
+// ----------------------------------------------------------------------
+
+RetrievedItemLoadMessage::RetrievedItemLoadMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("RetrievedItemLoadMessage"),
+	m_ownerId(),
+	m_itemId()
+{
+	addVariable(m_ownerId);
+	addVariable(m_itemId);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+RetrievedItemLoadMessage::~RetrievedItemLoadMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RetrievedItemLoadMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RetrievedItemLoadMessage.h
new file mode 100644
index 00000000..ad14c733
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/RetrievedItemLoadMessage.h
@@ -0,0 +1,60 @@
+//========================================================================
+//
+// RetrievedItemLoadMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_RetrievedItemLoadMessage_H
+#define	_INCLUDED_RetrievedItemLoadMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  DBProcess
+ * Sent to:  GameServer
+ * Action:  Notifies game servers that an auction item has been retrieved and may be loaded
+ */
+class RetrievedItemLoadMessage : public GameNetworkMessage
+{
+public:
+	RetrievedItemLoadMessage  (NetworkId const &ownerId, NetworkId const &itemId);
+	RetrievedItemLoadMessage  (Archive::ReadIterator & source);
+	~RetrievedItemLoadMessage ();
+
+public:
+	NetworkId const &    getOwnerId() const;
+	NetworkId const &    getItemId() const;
+	
+private:
+	Archive::AutoVariable<NetworkId>    m_ownerId;
+	Archive::AutoVariable<NetworkId>    m_itemId;
+
+private:
+	RetrievedItemLoadMessage(const RetrievedItemLoadMessage&);
+	RetrievedItemLoadMessage& operator= (const RetrievedItemLoadMessage&);
+};
+
+// ======================================================================
+
+inline NetworkId const &RetrievedItemLoadMessage::getOwnerId() const
+{
+	return m_ownerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &RetrievedItemLoadMessage::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_RetrievedItemLoadMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/StructuresForPurgeMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/StructuresForPurgeMessage.cpp
new file mode 100644
index 00000000..f9fd2e04
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/StructuresForPurgeMessage.cpp
@@ -0,0 +1,78 @@
+// ======================================================================
+//
+// StructuresForPurgeMessage.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/StructuresForPurgeMessage.h"
+
+// ======================================================================
+
+StructuresForPurgeMessage::StructuresForPurgeMessage(StationId stationId, std::vector<std::pair<NetworkId, NetworkId> > const & structures, std::vector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > > const & vendors, bool warnOnly) :
+		GameNetworkMessage("StructuresForPurgeMessage"),
+		m_stationId(stationId),
+		m_structures(),
+		m_vendors(),
+		m_warnOnly(warnOnly)
+{
+	m_structures.set(structures);
+	m_vendors.set(vendors);
+	addVariable(m_stationId);
+	addVariable(m_structures);
+	addVariable(m_vendors);
+	addVariable(m_warnOnly);
+}
+
+//-----------------------------------------------------------------------
+
+StructuresForPurgeMessage::StructuresForPurgeMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("StructuresForPurgeMessage"),
+		m_stationId(),
+		m_structures(),
+		m_vendors(),
+		m_warnOnly()
+{
+	addVariable(m_stationId);
+	addVariable(m_structures);
+	addVariable(m_vendors);
+	addVariable(m_warnOnly);
+	unpack(source); //lint !e1506 // virtual in constructor
+}
+
+//-----------------------------------------------------------------------
+
+StructuresForPurgeMessage::~StructuresForPurgeMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+StationId StructuresForPurgeMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<std::pair<NetworkId, NetworkId> > const & StructuresForPurgeMessage::getStructures() const
+{
+	return m_structures.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > > const & StructuresForPurgeMessage::getVendors() const
+{
+	return m_vendors.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool StructuresForPurgeMessage::getWarnOnly() const
+{
+	return m_warnOnly.get();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/StructuresForPurgeMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/StructuresForPurgeMessage.h
new file mode 100644
index 00000000..74d67dd5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/StructuresForPurgeMessage.h
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// StructuresForPurgeMessage.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_StructuresForPurgeMessage_H
+#define INCLUDED_StructuresForPurgeMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "Unicode.h"
+
+// ======================================================================
+
+/**
+ * Sent from:  DB Process
+ * Sent to:  Game Server
+ * Action:  Identifies a list of structures that should be purged.  Send
+ * messages to each structure to get them to purge themselves.  Report
+ * back to the database process when all structures have been purged.
+ */
+class StructuresForPurgeMessage : public GameNetworkMessage
+{
+  public:
+	StructuresForPurgeMessage  (StationId stationId, std::vector<std::pair<NetworkId, NetworkId> > const & structures, std::vector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > > const & vendors, bool warnOnly);
+	StructuresForPurgeMessage  (Archive::ReadIterator & source);
+	~StructuresForPurgeMessage ();
+
+	StationId getStationId() const;
+	std::vector<std::pair<NetworkId, NetworkId> > const & getStructures() const; // pair of (structure, owner)
+	std::vector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > > const & getVendors() const;    // pair of (vendor, pair(owner, vendor name))
+	bool getWarnOnly() const;
+	
+  private:
+	Archive::AutoVariable<StationId> m_stationId;
+	Archive::AutoArray<std::pair<NetworkId, NetworkId> > m_structures;
+	Archive::AutoArray<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > > m_vendors;
+	Archive::AutoVariable<bool> m_warnOnly;
+	
+  private:        
+	StructuresForPurgeMessage(const StructuresForPurgeMessage&);
+	StructuresForPurgeMessage& operator= (const StructuresForPurgeMessage&);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarDeltasMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarDeltasMessage.cpp
new file mode 100644
index 00000000..124ecccf
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarDeltasMessage.cpp
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// SynchronizeScriptVarDeltasMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/SynchronizeScriptVarDeltasMessage.h"
+
+// ======================================================================
+
+SynchronizeScriptVarDeltasMessage::SynchronizeScriptVarDeltasMessage(NetworkId const &networkId, std::vector<int8> const &data) :
+	GameNetworkMessage("SynchronizeScriptVarDeltasMessage"),
+	m_networkId(networkId),
+	m_data(data)
+{
+	addVariable(m_networkId);
+	addVariable(m_data);
+}
+
+// ----------------------------------------------------------------------
+
+SynchronizeScriptVarDeltasMessage::SynchronizeScriptVarDeltasMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("SynchronizeScriptVarDeltasMessage"),
+	m_networkId(),
+	m_data()
+{
+	addVariable(m_networkId);
+	addVariable(m_data);
+	unpack(source);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarDeltasMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarDeltasMessage.h
new file mode 100644
index 00000000..febf5307
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarDeltasMessage.h
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// SynchronizeScriptVarDeltasMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_SynchronizeScriptVarDeltasMessage_H
+#define	_INCLUDED_SynchronizeScriptVarDeltasMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include <vector>
+
+// ======================================================================
+
+class SynchronizeScriptVarDeltasMessage: public GameNetworkMessage
+{
+public:
+	SynchronizeScriptVarDeltasMessage(NetworkId const &networkId, std::vector<int8> const &data);
+	SynchronizeScriptVarDeltasMessage(Archive::ReadIterator &source);
+
+	NetworkId const &getNetworkId() const;
+	std::vector<int8> const &getData() const;
+	
+private:
+	Archive::AutoVariable<NetworkId> m_networkId;
+	Archive::AutoVariable<std::vector<int8> > m_data;
+
+private:
+	SynchronizeScriptVarDeltasMessage(SynchronizeScriptVarDeltasMessage const &);
+	SynchronizeScriptVarDeltasMessage &operator=(SynchronizeScriptVarDeltasMessage const &);
+};
+
+// ======================================================================
+
+inline NetworkId const &SynchronizeScriptVarDeltasMessage::getNetworkId() const
+{
+	return m_networkId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::vector<int8> const &SynchronizeScriptVarDeltasMessage::getData() const
+{
+	return m_data.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_SynchronizeScriptVarDeltasMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarsMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarsMessage.cpp
new file mode 100644
index 00000000..940989ee
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarsMessage.cpp
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// SynchronizeScriptVarsMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/SynchronizeScriptVarsMessage.h"
+
+// ======================================================================
+
+SynchronizeScriptVarsMessage::SynchronizeScriptVarsMessage(NetworkId const &networkId, std::vector<int8> const &data) :
+	GameNetworkMessage("SynchronizeScriptVarsMessage"),
+	m_networkId(networkId),
+	m_data(data)
+{
+	addVariable(m_networkId);
+	addVariable(m_data);
+}
+
+// ----------------------------------------------------------------------
+
+SynchronizeScriptVarsMessage::SynchronizeScriptVarsMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("SynchronizeScriptVarsMessage"),
+	m_networkId(),
+	m_data()
+{
+	addVariable(m_networkId);
+	addVariable(m_data);
+	unpack(source);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarsMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarsMessage.h
new file mode 100644
index 00000000..c8db26a7
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/SynchronizeScriptVarsMessage.h
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// SynchronizeScriptVarsMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_SynchronizeScriptVarsMessage_H
+#define	_INCLUDED_SynchronizeScriptVarsMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include <vector>
+
+// ======================================================================
+
+class SynchronizeScriptVarsMessage: public GameNetworkMessage
+{
+public:
+	SynchronizeScriptVarsMessage(NetworkId const &networkId, std::vector<int8> const &data);
+	SynchronizeScriptVarsMessage(Archive::ReadIterator &source);
+
+	NetworkId const &getNetworkId() const;
+	std::vector<int8> const &getData() const;
+	
+private:
+	Archive::AutoVariable<NetworkId> m_networkId;
+	Archive::AutoVariable<std::vector<int8> > m_data;
+
+private:
+	SynchronizeScriptVarsMessage(SynchronizeScriptVarsMessage const &);
+	SynchronizeScriptVarsMessage &operator=(SynchronizeScriptVarsMessage const &);
+};
+
+// ======================================================================
+
+inline NetworkId const &SynchronizeScriptVarsMessage::getNetworkId() const
+{
+	return m_networkId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::vector<int8> const &SynchronizeScriptVarsMessage::getData() const
+{
+	return m_data.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_SynchronizeScriptVarsMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportMessage.cpp
new file mode 100644
index 00000000..807892ed
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportMessage.cpp
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// TeleportMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/TeleportMessage.h"
+
+// ======================================================================
+
+TeleportMessage::TeleportMessage(NetworkId const &actorId, std::string const &sceneId, Vector const &position_w, NetworkId const &containerId, Vector const &position_p) :
+	GameNetworkMessage("TeleportMessage"),
+	m_actorId(actorId),
+	m_sceneId(sceneId),
+	m_position_w(position_w),
+	m_containerId(containerId),
+	m_position_p(position_p)
+{
+	addVariable(m_actorId);
+	addVariable(m_sceneId);
+	addVariable(m_position_w);
+	addVariable(m_containerId);
+	addVariable(m_position_p);
+}
+
+// ----------------------------------------------------------------------
+
+TeleportMessage::TeleportMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("TeleportMessage"),
+	m_actorId(),
+	m_sceneId(),
+	m_position_w(),
+	m_containerId(),
+	m_position_p()
+{
+	addVariable(m_actorId);
+	addVariable(m_sceneId);
+	addVariable(m_position_w);
+	addVariable(m_containerId);
+	addVariable(m_position_p);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+TeleportMessage::~TeleportMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportMessage.h
new file mode 100644
index 00000000..fbca874e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportMessage.h
@@ -0,0 +1,89 @@
+//========================================================================
+//
+// TeleportMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_TeleportMessage_H
+#define	_INCLUDED_TeleportMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:  DBProcess
+ * Action:  teleport a person to a target objectid
+ */
+class TeleportMessage: public GameNetworkMessage
+{
+public:
+	TeleportMessage(NetworkId const &actorId, std::string const &sceneId, Vector const &position_w, NetworkId const &containerId, Vector const &position_p);
+	TeleportMessage(Archive::ReadIterator & source);
+	~TeleportMessage();
+
+public:
+	NetworkId const &    getActorId() const;
+	std::string const &  getSceneId() const;
+	Vector const &       getPosition_w() const;
+	NetworkId const &    getContainerId() const;
+	Vector const &       getPosition_p() const;
+	
+private:
+	Archive::AutoVariable<NetworkId>    m_actorId;
+	Archive::AutoVariable<std::string>  m_sceneId;
+	Archive::AutoVariable<Vector>       m_position_w;
+	Archive::AutoVariable<NetworkId>    m_containerId;
+	Archive::AutoVariable<Vector>       m_position_p;
+
+private:
+	TeleportMessage(const TeleportMessage&);
+	TeleportMessage& operator= (const TeleportMessage&);
+};
+
+// ======================================================================
+
+inline NetworkId const &TeleportMessage::getActorId() const
+{
+	return m_actorId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &TeleportMessage::getSceneId() const
+{
+	return m_sceneId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline Vector const &TeleportMessage::getPosition_w() const
+{
+	return m_position_w.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &TeleportMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline Vector const &TeleportMessage::getPosition_p() const
+{
+	return m_position_p.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_TeleportMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportToMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportToMessage.cpp
new file mode 100644
index 00000000..04855ea1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportToMessage.cpp
@@ -0,0 +1,46 @@
+// ======================================================================
+//
+// TeleportToMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/TeleportToMessage.h"
+
+// ======================================================================
+
+TeleportToMessage::TeleportToMessage(NetworkId const &actorId, NetworkId const &targetId, uint32 processId) :
+	GameNetworkMessage("TeleportToMessage"),
+	m_actorId(actorId),
+	m_targetId(targetId),
+	m_processId(processId)
+{
+	addVariable(m_actorId);
+	addVariable(m_targetId);
+	addVariable(m_processId);
+}
+
+// ----------------------------------------------------------------------
+
+TeleportToMessage::TeleportToMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("TeleportToMessage"),
+	m_actorId(),
+	m_targetId(),
+	m_processId()
+{
+	addVariable(m_actorId);
+	addVariable(m_targetId);
+	addVariable(m_processId);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+TeleportToMessage::~TeleportToMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportToMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportToMessage.h
new file mode 100644
index 00000000..c8576b79
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/TeleportToMessage.h
@@ -0,0 +1,69 @@
+//========================================================================
+//
+// TeleportToMessage.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_TeleportToMessage_H
+#define	_INCLUDED_TeleportToMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:  DBProcess
+ * Action:  teleport a person to a target objectid
+ */
+class TeleportToMessage : public GameNetworkMessage
+{
+public:
+	TeleportToMessage  (NetworkId const &actorId, NetworkId const &targetId, uint32 processId);
+	TeleportToMessage  (Archive::ReadIterator & source);
+	~TeleportToMessage ();
+
+public:
+	NetworkId const &  getActorId() const;
+	NetworkId const &  getTargetId() const;
+	uint32             getProcessId() const;
+	
+private:
+	Archive::AutoVariable<NetworkId>  m_actorId;
+	Archive::AutoVariable<NetworkId>  m_targetId;
+	Archive::AutoVariable<uint32>     m_processId;
+
+private:
+	TeleportToMessage(const TeleportToMessage&);
+	TeleportToMessage& operator= (const TeleportToMessage&);
+};
+
+// ======================================================================
+
+inline NetworkId const &TeleportToMessage::getActorId() const
+{
+	return m_actorId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &TeleportToMessage::getTargetId() const
+{
+	return m_targetId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 TeleportToMessage::getProcessId() const
+{
+	return m_processId.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_TeleportToMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UnloadedPlayerMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UnloadedPlayerMessage.cpp
new file mode 100644
index 00000000..4bb8885b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UnloadedPlayerMessage.cpp
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// UnloadedPlayerMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/UnloadedPlayerMessage.h"
+
+// ======================================================================
+
+UnloadedPlayerMessage::UnloadedPlayerMessage(const NetworkId &playerId) :
+		GameNetworkMessage("UnloadedPlayerMessage"),
+		m_playerId(playerId)
+{
+	addVariable(m_playerId);
+}
+
+// ----------------------------------------------------------------------
+
+UnloadedPlayerMessage::UnloadedPlayerMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("UnloadedPlayerMessage"),
+		m_playerId()
+{
+	addVariable(m_playerId);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+UnloadedPlayerMessage::~UnloadedPlayerMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UnloadedPlayerMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UnloadedPlayerMessage.h
new file mode 100644
index 00000000..fb18c49a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UnloadedPlayerMessage.h
@@ -0,0 +1,56 @@
+// ======================================================================
+//
+// UnloadedPlayerMessage.h
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_UnloadedPlayerMessage_H
+#define INCLUDED_UnloadedPlayerMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Sent From:  GameServer
+ * Sent To:    DatabaseProcess
+ * Action:     The specified player is unloading.  Reply us when all
+ *             changes have been saved.
+ *
+ * Sent From:  GameServer
+ * Sent To:    PlanetServer
+ * Action:     The specified player is unloading.  If the player tries to
+ *             log in again before his data is saved, send him to the GameServer.
+ */
+class UnloadedPlayerMessage : public GameNetworkMessage
+{
+  public:
+	UnloadedPlayerMessage(const NetworkId &playerId);
+	UnloadedPlayerMessage(Archive::ReadIterator & source);
+	~UnloadedPlayerMessage();
+	
+  public:
+	const NetworkId &getPlayerId();
+
+  private:
+	Archive::AutoVariable<NetworkId>  m_playerId;
+	
+  private:
+	//disabled functions:
+	UnloadedPlayerMessage            ();
+	UnloadedPlayerMessage            (const UnloadedPlayerMessage&);
+	UnloadedPlayerMessage& operator= (const UnloadedPlayerMessage&);
+
+};
+
+// ======================================================================
+
+inline const NetworkId &UnloadedPlayerMessage::getPlayerId()
+{
+	return m_playerId.get();
+} 
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UpdateObjectPositionMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UpdateObjectPositionMessage.cpp
new file mode 100644
index 00000000..15008b19
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UpdateObjectPositionMessage.cpp
@@ -0,0 +1,62 @@
+// ======================================================================
+//
+// UpdateObjectPositionMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/UpdateObjectPositionMessage.h"
+
+// ======================================================================
+
+
+
+UpdateObjectPositionMessage::UpdateObjectPositionMessage(NetworkId const &networkId, Transform const &transform, Transform const &worldspaceTransform, NetworkId const &containerId, int slotArrangement, NetworkId const &loadWith, bool playerControlled, bool isCreatureObject) :
+	GameNetworkMessage("UpdateObjectPositionMessage"),
+	m_networkId(networkId),
+	m_transform(transform),
+	m_worldspaceTransform(worldspaceTransform),
+	m_containerId(containerId),
+	m_slotArrangement(slotArrangement),
+	m_loadWith(loadWith),
+	m_playerControlled(playerControlled),
+	m_creatureObject(isCreatureObject)
+{
+	addVariable(m_networkId);
+	addVariable(m_transform);
+	addVariable(m_worldspaceTransform);
+	addVariable(m_containerId);
+	addVariable(m_slotArrangement);
+	addVariable(m_loadWith);
+	addVariable(m_playerControlled);
+	addVariable(m_creatureObject);
+}
+
+// ----------------------------------------------------------------------
+
+UpdateObjectPositionMessage::UpdateObjectPositionMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("UpdateObjectPositionMessage"),
+	m_networkId(),
+	m_transform(),
+	m_worldspaceTransform(),
+	m_containerId(),
+	m_slotArrangement(),
+	m_loadWith(),
+	m_playerControlled(),
+	m_creatureObject()
+{
+	addVariable(m_networkId);
+	addVariable(m_transform);
+	addVariable(m_worldspaceTransform);
+	addVariable(m_containerId);
+	addVariable(m_slotArrangement);
+	addVariable(m_loadWith);
+	addVariable(m_playerControlled);
+	addVariable(m_creatureObject);
+	unpack(source);
+}
+
+// ======================================================================
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UpdateObjectPositionMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UpdateObjectPositionMessage.h
new file mode 100644
index 00000000..1c86497e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/UpdateObjectPositionMessage.h
@@ -0,0 +1,113 @@
+// ======================================================================
+//
+// UpdateObjectPositionMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_UpdateObjectPositionMessage_H
+#define	_INCLUDED_UpdateObjectPositionMessage_H
+
+// ======================================================================
+
+#include "sharedMath/Transform.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+class UpdateObjectPositionMessage: public GameNetworkMessage
+{
+public:
+
+	UpdateObjectPositionMessage(NetworkId const &networkId, Transform const &transform, Transform const &worldspaceTransform, NetworkId const &containerId, int slotArrangement, NetworkId const &loadWith, bool playerControlled, bool bCreatureObject);
+	UpdateObjectPositionMessage(Archive::ReadIterator &source);
+
+	NetworkId const &getNetworkId() const;
+	Transform const &getTransform() const;
+	Transform const &getWorldspaceTransform() const;
+	NetworkId const &getContainerId() const;
+	int getSlotArrangement() const;
+	NetworkId const &getLoadWith() const;
+	bool isCreatureObject() const; 
+	bool getPlayerControlled() const;
+	
+private:
+	Archive::AutoVariable<NetworkId> m_networkId;
+	Archive::AutoVariable<Transform> m_transform;
+	Archive::AutoVariable<Transform> m_worldspaceTransform;
+	Archive::AutoVariable<NetworkId> m_containerId;
+	Archive::AutoVariable<int> m_slotArrangement;
+	Archive::AutoVariable<NetworkId> m_loadWith;
+	Archive::AutoVariable<bool> m_playerControlled;
+	Archive::AutoVariable<bool> m_creatureObject;
+
+
+private:
+	UpdateObjectPositionMessage(UpdateObjectPositionMessage const &);
+	UpdateObjectPositionMessage &operator=(UpdateObjectPositionMessage const &);
+};
+
+// ======================================================================
+
+inline NetworkId const &UpdateObjectPositionMessage::getNetworkId() const
+{
+	return m_networkId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline Transform const &UpdateObjectPositionMessage::getTransform() const
+{
+	return m_transform.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline Transform const &UpdateObjectPositionMessage::getWorldspaceTransform() const
+{
+	return m_worldspaceTransform.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &UpdateObjectPositionMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdateObjectPositionMessage::getSlotArrangement() const
+{
+	return m_slotArrangement.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &UpdateObjectPositionMessage::getLoadWith() const
+{
+	return m_loadWith.get();
+}
+
+
+inline bool UpdateObjectPositionMessage::isCreatureObject() const
+{
+	return m_creatureObject.get();
+}
+
+
+// ----------------------------------------------------------------------
+
+inline bool UpdateObjectPositionMessage::getPlayerControlled() const
+{
+	return m_playerControlled.get();
+}
+
+
+// ======================================================================
+
+#endif	// _INCLUDED_UpdateObjectPositionMessage_H
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FactionalSystemMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FactionalSystemMessage.cpp
new file mode 100644
index 00000000..a1e94b39
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FactionalSystemMessage.cpp
@@ -0,0 +1,55 @@
+// ======================================================================
+//
+// FactionalSystemMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/FactionalSystemMessage.h"
+
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+FactionalSystemMessage::FactionalSystemMessage(Unicode::String const & prosePackage, Vector const & location, float radius, bool notifyImperial, bool notifyRebel) :
+	GameNetworkMessage("FactionalSystemMessage"),
+	m_prosePackage(prosePackage),
+	m_location(location),
+	m_radius(radius),
+	m_notifyImperial(notifyImperial),
+	m_notifyRebel(notifyRebel)
+{
+	addVariable(m_prosePackage);
+	addVariable(m_location);
+	addVariable(m_radius);
+	addVariable(m_notifyImperial);
+	addVariable(m_notifyRebel);
+}
+
+// ----------------------------------------------------------------------
+
+FactionalSystemMessage::FactionalSystemMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("FactionalSystemMessage"),
+	m_prosePackage(),
+	m_location(),
+	m_radius(0.0f),
+	m_notifyImperial(false),
+	m_notifyRebel(false)
+{
+	addVariable(m_prosePackage);
+	addVariable(m_location);
+	addVariable(m_radius);
+	addVariable(m_notifyImperial);
+	addVariable(m_notifyRebel);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+FactionalSystemMessage::~FactionalSystemMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FactionalSystemMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FactionalSystemMessage.h
new file mode 100644
index 00000000..d60559a9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FactionalSystemMessage.h
@@ -0,0 +1,79 @@
+// ======================================================================
+//
+// FactionalSystemMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_FactionalSystemMessage_H
+#define INCLUDED_FactionalSystemMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class FactionalSystemMessage : public GameNetworkMessage
+{
+public:
+	FactionalSystemMessage  (Unicode::String const & prosePackage, Vector const & location, float radius, bool notifyImperial, bool notifyRebel);
+	FactionalSystemMessage  (Archive::ReadIterator & source);
+	~FactionalSystemMessage ();
+
+	Unicode::String const & getProsePackage() const;
+	Vector const & getLocation() const;
+	float getRadius() const;
+	bool getNotifyImperial() const;
+	bool getNotifyRebel() const;
+
+private:
+	Archive::AutoVariable<Unicode::String> m_prosePackage;
+	Archive::AutoVariable<Vector> m_location;
+	Archive::AutoVariable<float> m_radius;
+	Archive::AutoVariable<bool> m_notifyImperial;
+	Archive::AutoVariable<bool> m_notifyRebel;
+
+	FactionalSystemMessage();
+	FactionalSystemMessage(const FactionalSystemMessage&);
+	FactionalSystemMessage& operator= (const FactionalSystemMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline Unicode::String const & FactionalSystemMessage::getProsePackage() const
+{
+	return m_prosePackage.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline Vector const & FactionalSystemMessage::getLocation() const
+{
+	return m_location.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float FactionalSystemMessage::getRadius() const
+{
+	return m_radius.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool FactionalSystemMessage::getNotifyImperial() const
+{
+	return m_notifyImperial.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool FactionalSystemMessage::getNotifyRebel() const
+{
+	return m_notifyRebel.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FirstPlanetGameServerIdMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FirstPlanetGameServerIdMessage.cpp
new file mode 100644
index 00000000..b79d4fa8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FirstPlanetGameServerIdMessage.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// FirstPlanetGameServerIdMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/FirstPlanetGameServerIdMessage.h"
+
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+FirstPlanetGameServerIdMessage::FirstPlanetGameServerIdMessage  (uint32 gameServerId) :
+		GameNetworkMessage("FirstPlanetGameServerIdMessage"),
+		m_gameServerId(gameServerId)
+{
+	addVariable(m_gameServerId);
+}
+
+// ----------------------------------------------------------------------
+
+FirstPlanetGameServerIdMessage::FirstPlanetGameServerIdMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("FirstPlanetGameServerIdMessage"),
+		m_gameServerId()
+{
+	addVariable(m_gameServerId);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+FirstPlanetGameServerIdMessage::~FirstPlanetGameServerIdMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FirstPlanetGameServerIdMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FirstPlanetGameServerIdMessage.h
new file mode 100644
index 00000000..12131939
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/FirstPlanetGameServerIdMessage.h
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// FirstPlanetGameServerIdMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_FirstPlanetGameServerIdMessage_H
+#define INCLUDED_FirstPlanetGameServerIdMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Sent from:  PlanetServer 
+ * Sent to:  GameServer
+ * Action:  Identifies the "first" GameServer for a particular planet.
+ *   This GameServer will be used by certain systems that require an
+ *   arbitrary GameServer or that are only supposed to run on one server
+ *   per planet.
+ */
+class FirstPlanetGameServerIdMessage : public GameNetworkMessage
+{
+  public:
+	FirstPlanetGameServerIdMessage  (uint32 gameServerId);
+	FirstPlanetGameServerIdMessage  (Archive::ReadIterator & source);
+	~FirstPlanetGameServerIdMessage ();
+
+	uint32 getGameServerId() const;
+
+  private:
+	Archive::AutoVariable<uint32> m_gameServerId;
+
+	FirstPlanetGameServerIdMessage();
+	FirstPlanetGameServerIdMessage(const FirstPlanetGameServerIdMessage&);
+	FirstPlanetGameServerIdMessage& operator= (const FirstPlanetGameServerIdMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline uint32 FirstPlanetGameServerIdMessage::getGameServerId() const
+{
+	return m_gameServerId.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/GameServerForceChangeAuthorityMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/GameServerForceChangeAuthorityMessage.cpp
new file mode 100644
index 00000000..6021c838
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/GameServerForceChangeAuthorityMessage.cpp
@@ -0,0 +1,61 @@
+//========================================================================
+//
+// GameServerForceChangeAuthorityMessage.cpp - tells the PlanetServer a game 
+// server has forced an object to change it's authoritative server.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GameServerForceChangeAuthorityMessage.h"
+
+#include "serverNetworkMessages/CentralGameServerMessages.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class constructor.
+ *
+ * @param id			id of object being made authoritative
+ * @param process		process that is authoritative
+ */
+GameServerForceChangeAuthorityMessage::GameServerForceChangeAuthorityMessage(
+	const NetworkId& id, uint32 fromProcess, uint32 toProcess) :
+	GameNetworkMessage("GameServerForceChangeAuthorityMessage"),
+	m_id(id),
+	m_fromProcess(fromProcess),
+	m_toProcess(toProcess)
+{
+	addVariable(m_id);
+	addVariable(m_fromProcess);
+	addVariable(m_toProcess);
+}	// GameServerForceChangeAuthorityMessage::GameServerForceChangeAuthorityMessage
+
+//-----------------------------------------------------------------------
+
+GameServerForceChangeAuthorityMessage::GameServerForceChangeAuthorityMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("GameServerForceChangeAuthorityMessage"),
+	m_id(),
+	m_fromProcess(),
+	m_toProcess()
+{
+	addVariable(m_id);
+	addVariable(m_fromProcess);
+	addVariable(m_toProcess);
+	unpack(source);
+}	// GameServerForceChangeAuthorityMessage::GameServerForceChangeAuthorityMessage
+
+//-----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+GameServerForceChangeAuthorityMessage::~GameServerForceChangeAuthorityMessage()
+{
+}	// GameServerForceChangeAuthorityMessage::~GameServerForceChangeAuthorityMessage
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/GameServerForceChangeAuthorityMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/GameServerForceChangeAuthorityMessage.h
new file mode 100644
index 00000000..d8019339
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/GameServerForceChangeAuthorityMessage.h
@@ -0,0 +1,68 @@
+//========================================================================
+//
+// GameServerForceChangeAuthorityMessage.h - tells the PlanetServer a game server has
+// forced an object to change it's authoritative server.
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef	_INCLUDED_GameServerForceChangeAuthorityMessage_H
+#define	_INCLUDED_GameServerForceChangeAuthorityMessage_H
+
+//-----------------------------------------------------------------------
+
+#include <vector>
+#include "sharedMath/Transform.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Game Server
+ * Sent to:    Planet Server
+ * Action:     Tells the PlanetServer a game server has forced an object to change 
+ *             it's authoritative server.
+ */
+class GameServerForceChangeAuthorityMessage : public GameNetworkMessage
+{
+public:
+	typedef std::vector<uint32> ProcessList;
+
+	GameServerForceChangeAuthorityMessage  (const NetworkId& id, uint32 fromProcess, uint32 toProcess);
+	GameServerForceChangeAuthorityMessage  (Archive::ReadIterator & source);
+	~GameServerForceChangeAuthorityMessage ();
+
+	const NetworkId&            getId(void) const;
+	uint32                      getFromProcess(void) const;
+	uint32                      getToProcess(void) const;
+	
+private:
+	Archive::AutoVariable<NetworkId>  m_id;			    // id of object being made authoritative
+	Archive::AutoVariable<uint32>     m_fromProcess;	// process that the object was authoritative on
+	Archive::AutoVariable<uint32>     m_toProcess;      // process that the object is being made authoritative on
+
+	GameServerForceChangeAuthorityMessage();
+	GameServerForceChangeAuthorityMessage(const GameServerForceChangeAuthorityMessage&);
+	GameServerForceChangeAuthorityMessage& operator= (const GameServerForceChangeAuthorityMessage&);
+};
+
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId& GameServerForceChangeAuthorityMessage::getId(void) const
+{
+	return m_id.get();
+}
+
+inline uint32 GameServerForceChangeAuthorityMessage::getFromProcess(void) const
+{
+	return m_fromProcess.get();
+}
+
+inline uint32 GameServerForceChangeAuthorityMessage::getToProcess(void) const
+{
+	return m_toProcess.get();
+}
+
+#endif	// _INCLUDED_GameServerForceChangeAuthorityMessage_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationRequest.cpp b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationRequest.cpp
new file mode 100644
index 00000000..a80d3dbf
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationRequest.cpp
@@ -0,0 +1,136 @@
+// ======================================================================
+//
+// LocationRequest.cpp
+// asommers
+//
+// copyright 2003, sony online entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LocationRequest.h"
+
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+LocationRequest::LocationRequest (uint32 const processId, NetworkId const & networkId, std::string const & locationId, float const searchX, float const searchZ, float const searchRadius, float const locationReservationRadius, bool const checkWater, bool const checkSlope) :
+	GameNetworkMessage ("LocationRequest"),
+	m_processId (processId),
+	m_networkId (networkId),
+	m_locationId (locationId),
+	m_searchX (searchX),
+	m_searchZ (searchZ),
+	m_searchRadius (searchRadius),
+	m_locationReservationRadius (locationReservationRadius),
+	m_checkWater (checkWater),
+	m_checkSlope (checkSlope)
+{
+	addVariable (m_processId);
+	addVariable (m_networkId);
+	addVariable (m_locationId);
+	addVariable (m_searchX);
+	addVariable (m_searchZ);
+	addVariable (m_searchRadius);
+	addVariable (m_locationReservationRadius);
+	addVariable (m_checkWater);
+	addVariable (m_checkSlope);
+}
+
+// ----------------------------------------------------------------------
+
+LocationRequest::LocationRequest (Archive::ReadIterator & source) :
+	GameNetworkMessage ("LocationRequest"),
+	m_processId (0),
+	m_networkId (),
+	m_locationId (),
+	m_searchX (0.f),
+	m_searchZ (0.f),
+	m_searchRadius (0.f),
+	m_locationReservationRadius (0.f),
+	m_checkWater (false),
+	m_checkSlope (false)
+{
+	addVariable (m_processId);
+	addVariable (m_networkId);
+	addVariable (m_locationId);
+	addVariable (m_searchX);
+	addVariable (m_searchZ);
+	addVariable (m_searchRadius);
+	addVariable (m_locationReservationRadius);
+	addVariable (m_checkWater);
+	addVariable (m_checkSlope);
+	
+	unpack (source);
+}
+
+// ----------------------------------------------------------------------
+
+LocationRequest::~LocationRequest ()
+{
+}
+
+// ----------------------------------------------------------------------
+
+uint32 LocationRequest::getProcessId () const
+{
+	return m_processId.get ();
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & LocationRequest::getNetworkId () const
+{
+	return m_networkId.get ();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & LocationRequest::getLocationId () const
+{
+	return m_locationId.get ();
+}
+
+// ----------------------------------------------------------------------
+
+float LocationRequest::getSearchX () const
+{
+	return m_searchX.get ();
+}
+
+// ----------------------------------------------------------------------
+
+float LocationRequest::getSearchZ () const
+{
+	return m_searchZ.get ();
+}
+
+// ----------------------------------------------------------------------
+
+float LocationRequest::getSearchRadius () const
+{
+	return m_searchRadius.get ();
+}
+
+// ----------------------------------------------------------------------
+
+float LocationRequest::getLocationReservationRadius () const
+{
+	return m_locationReservationRadius.get ();
+}
+
+// ----------------------------------------------------------------------
+
+bool LocationRequest::getCheckWater () const
+{
+	return m_checkWater.get ();
+}
+
+// ----------------------------------------------------------------------
+
+bool LocationRequest::getCheckSlope () const
+{
+	return m_checkSlope.get ();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationRequest.h b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationRequest.h
new file mode 100644
index 00000000..1f2edf95
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationRequest.h
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// LocationRequest.h
+// asommers
+//
+// copyright 2003, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_LocationRequest_H
+#define INCLUDED_LocationRequest_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class LocationRequest : public GameNetworkMessage
+{
+public:
+
+	LocationRequest (uint32 processId, NetworkId const & networkId, std::string const & locationId, float searchX, float searchZ, float searchRadius, float locationReservationRadius, bool checkWater, bool checkSlope);
+	explicit LocationRequest (Archive::ReadIterator & source);
+	~LocationRequest ();
+
+	uint32 getProcessId () const;
+	NetworkId const & getNetworkId () const;
+	std::string const & getLocationId () const;
+	float getSearchX () const;
+	float getSearchZ () const;
+	float getSearchRadius () const;
+	float getLocationReservationRadius () const;
+	bool getCheckWater () const;
+	bool getCheckSlope () const;
+
+private:
+
+	Archive::AutoVariable<uint32> m_processId;
+	Archive::AutoVariable<NetworkId> m_networkId;
+	Archive::AutoVariable<std::string> m_locationId;
+	Archive::AutoVariable<float> m_searchX;
+	Archive::AutoVariable<float> m_searchZ;
+	Archive::AutoVariable<float> m_searchRadius;
+	Archive::AutoVariable<float> m_locationReservationRadius;
+	Archive::AutoVariable<bool> m_checkWater;
+	Archive::AutoVariable<bool> m_checkSlope;
+	
+private:
+
+	LocationRequest ();
+	LocationRequest (LocationRequest const &);
+	LocationRequest & operator= (LocationRequest const &);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationResponse.cpp b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationResponse.cpp
new file mode 100644
index 00000000..93f18f51
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationResponse.cpp
@@ -0,0 +1,103 @@
+// ======================================================================
+//
+// LocationResponse.cpp
+// asommers
+//
+// copyright 2003, sony online entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LocationResponse.h"
+
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+LocationResponse::LocationResponse (NetworkId const & networkId, bool const valid, std::string const & locationId, float const x, float const z, float const radius) :
+	GameNetworkMessage ("LocationResponse"),
+	m_networkId (networkId),
+	m_valid (valid),
+	m_locationId (locationId),
+	m_x (x),
+	m_z (z),
+	m_radius (radius)
+{
+	addVariable (m_networkId);
+	addVariable (m_valid);
+	addVariable (m_locationId);
+	addVariable (m_x);
+	addVariable (m_z);
+	addVariable (m_radius);
+}
+
+// ----------------------------------------------------------------------
+
+LocationResponse::LocationResponse (Archive::ReadIterator & source) :
+	GameNetworkMessage ("LocationResponse"),
+	m_networkId (),
+	m_valid (false),
+	m_locationId (),
+	m_x (0.f),
+	m_z (0.f),
+	m_radius (0.f)
+{
+	addVariable (m_networkId);
+	addVariable (m_valid);
+	addVariable (m_locationId);
+	addVariable (m_x);
+	addVariable (m_z);
+	addVariable (m_radius);
+	
+	unpack (source);
+}
+
+// ----------------------------------------------------------------------
+
+LocationResponse::~LocationResponse ()
+{
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & LocationResponse::getNetworkId () const
+{
+	return m_networkId.get ();
+}
+
+// ----------------------------------------------------------------------
+
+bool LocationResponse::getValid () const
+{
+	return m_valid.get ();
+}
+
+// ----------------------------------------------------------------------
+
+std::string const & LocationResponse::getLocationId () const
+{
+	return m_locationId.get ();
+}
+
+// ----------------------------------------------------------------------
+
+float LocationResponse::getX () const
+{
+	return m_x.get ();
+}
+
+// ----------------------------------------------------------------------
+
+float LocationResponse::getZ () const
+{
+	return m_z.get ();
+}
+
+// ----------------------------------------------------------------------
+
+float LocationResponse::getRadius () const
+{
+	return m_radius.get ();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationResponse.h b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationResponse.h
new file mode 100644
index 00000000..0a91bdff
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/LocationResponse.h
@@ -0,0 +1,52 @@
+// ======================================================================
+//
+// LocationResponse.h
+// asommers
+//
+// copyright 2003, sony online entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_LocationResponse_H
+#define INCLUDED_LocationResponse_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class LocationResponse : public GameNetworkMessage
+{
+public:
+
+	LocationResponse (NetworkId const & networkId, bool valid, std::string const & locationId, float x, float z, float radius);
+	explicit LocationResponse (Archive::ReadIterator & source);
+	~LocationResponse ();
+
+	NetworkId const & getNetworkId () const;
+	bool getValid () const;
+	std::string const & getLocationId () const;
+	float getX () const;
+	float getZ () const;
+	float getRadius () const;
+
+private:
+
+	Archive::AutoVariable<NetworkId> m_networkId;
+	Archive::AutoVariable<bool> m_valid;
+	Archive::AutoVariable<std::string> m_locationId;
+	Archive::AutoVariable<float> m_x;
+	Archive::AutoVariable<float> m_z;
+	Archive::AutoVariable<float> m_radius;
+	
+private:
+
+	LocationResponse ();
+	LocationResponse (LocationResponse const &);
+	LocationResponse & operator= (LocationResponse const &);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetLoadCharacterMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetLoadCharacterMessage.cpp
new file mode 100644
index 00000000..5cee83a8
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetLoadCharacterMessage.cpp
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// PlanetLoadCharacterMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/PlanetLoadCharacterMessage.h"
+
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+PlanetLoadCharacterMessage::PlanetLoadCharacterMessage  (const NetworkId &characterId, uint32 gameServerId) :
+		GameNetworkMessage("PlanetLoadCharacterMessage"),
+		m_characterId(characterId),
+		m_gameServerId(gameServerId)
+{
+	addVariable(m_characterId);
+	addVariable(m_gameServerId);
+}
+
+// ----------------------------------------------------------------------
+
+PlanetLoadCharacterMessage::PlanetLoadCharacterMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("PlanetLoadCharacterMessage"),
+		m_characterId(),
+		m_gameServerId()
+{
+	addVariable(m_characterId);
+	addVariable(m_gameServerId);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+PlanetLoadCharacterMessage::~PlanetLoadCharacterMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetLoadCharacterMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetLoadCharacterMessage.h
new file mode 100644
index 00000000..029951fd
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetLoadCharacterMessage.h
@@ -0,0 +1,60 @@
+// ======================================================================
+//
+// PlanetLoadCharacterMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_PlanetLoadCharacterMessage_H
+#define INCLUDED_PlanetLoadCharacterMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Request that a character be loaded on a gameserver.
+ *
+ * Sent from:  PlanetServer 
+ * Sent to:  DatabaseProcess
+ * Action:  Load the specified character and send it to the specified
+ * game server.
+ */
+class PlanetLoadCharacterMessage : public GameNetworkMessage
+{
+  public:
+	PlanetLoadCharacterMessage  (const NetworkId &characterId, uint32 gameServerId);
+	PlanetLoadCharacterMessage  (Archive::ReadIterator & source);
+	~PlanetLoadCharacterMessage ();
+
+	const NetworkId &getCharacterId() const;
+	uint32 getGameServerId() const;
+
+  private:
+	Archive::AutoVariable<NetworkId> m_characterId;
+	Archive::AutoVariable<uint32> m_gameServerId;
+
+	PlanetLoadCharacterMessage();
+	PlanetLoadCharacterMessage(const PlanetLoadCharacterMessage&);
+	PlanetLoadCharacterMessage& operator= (const PlanetLoadCharacterMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &PlanetLoadCharacterMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 PlanetLoadCharacterMessage::getGameServerId() const
+{
+	return m_gameServerId.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetRemoveObject.cpp b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetRemoveObject.cpp
new file mode 100644
index 00000000..45b25f35
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetRemoveObject.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// PlanetRemoveObject.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/PlanetRemoveObject.h"
+
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+PlanetRemoveObject::PlanetRemoveObject(NetworkId objectId) :
+		GameNetworkMessage("PlanetRemoveObject"),
+		m_objectId(objectId)
+{
+	addVariable(m_objectId);
+}
+
+// ----------------------------------------------------------------------
+
+PlanetRemoveObject::PlanetRemoveObject(Archive::ReadIterator & source) :
+		GameNetworkMessage("PlanetRemoveObject"),
+		m_objectId()
+{
+	addVariable(m_objectId);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+PlanetRemoveObject::~PlanetRemoveObject()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetRemoveObject.h b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetRemoveObject.h
new file mode 100644
index 00000000..8cdf6829
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/PlanetRemoveObject.h
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// PlanetRemoveObject.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_PlanetRemoveObject_H
+#define INCLUDED_PlanetRemoveObject_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Tells Planet Server that we have removed an object from the world.
+ *
+ * Sent from:  Gameserver 
+ * Sent to:  Planet Server
+ * Action:  Remove the object from Planet Server's data structures, if
+ * it hasn't been removed already.
+ */
+class PlanetRemoveObject : public GameNetworkMessage
+{
+  public:
+	PlanetRemoveObject  (NetworkId objectId);
+	PlanetRemoveObject  (Archive::ReadIterator & source);
+	~PlanetRemoveObject ();
+
+	NetworkId getObjectId() const;
+
+  private:
+	Archive::AutoVariable<NetworkId> m_objectId;
+
+	PlanetRemoveObject();
+	PlanetRemoveObject(const PlanetRemoveObject&);
+	PlanetRemoveObject& operator= (const PlanetRemoveObject&);
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId PlanetRemoveObject::getObjectId() const
+{
+	return m_objectId.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UnloadProxyMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UnloadProxyMessage.cpp
new file mode 100644
index 00000000..d5f4ce02
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UnloadProxyMessage.cpp
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// UnloadProxyMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/UnloadProxyMessage.h"
+
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+UnloadProxyMessage::UnloadProxyMessage(NetworkId objectId, uint32 proxyGameServerId) :
+		GameNetworkMessage("UnloadProxyMessage"),
+		m_objectId(objectId),
+		m_proxyGameServerId(proxyGameServerId)
+{
+	addVariable(m_objectId);
+	addVariable(m_proxyGameServerId);
+}
+
+// ----------------------------------------------------------------------
+
+UnloadProxyMessage::UnloadProxyMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("UnloadProxyMessage"),
+		m_objectId(),
+		m_proxyGameServerId()
+{
+	addVariable(m_objectId);
+	addVariable(m_proxyGameServerId);
+	
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+UnloadProxyMessage::~UnloadProxyMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UnloadProxyMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UnloadProxyMessage.h
new file mode 100644
index 00000000..a2ad1fad
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UnloadProxyMessage.h
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// UnloadProxyMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_UnloadProxyMessage_H
+#define INCLUDED_UnloadProxyMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Tells the authoritative game server to remove a proxy for an object
+ *
+ * Sent from:  Planet Server 
+ * Sent to:  Game Server
+ * Action:  Remove the specified proxy
+ */
+class UnloadProxyMessage : public GameNetworkMessage
+{
+  public:
+	UnloadProxyMessage  (NetworkId objectId, uint32 proxyGameServerId);
+	UnloadProxyMessage  (Archive::ReadIterator & source);
+	~UnloadProxyMessage ();
+
+	NetworkId getObjectId() const;
+	uint32 getProxyGameServerId() const;
+
+  private:
+	Archive::AutoVariable<NetworkId> m_objectId;
+	Archive::AutoVariable<uint32> m_proxyGameServerId;
+
+	UnloadProxyMessage();
+	UnloadProxyMessage(const UnloadProxyMessage&);
+	UnloadProxyMessage& operator= (const UnloadProxyMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId UnloadProxyMessage::getObjectId() const
+{
+	return m_objectId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 UnloadProxyMessage::getProxyGameServerId() const
+{
+	return m_proxyGameServerId.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UpdateObjectOnPlanetMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UpdateObjectOnPlanetMessage.cpp
new file mode 100644
index 00000000..0bac9437
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UpdateObjectOnPlanetMessage.cpp
@@ -0,0 +1,95 @@
+// ======================================================================
+//
+// UpdateObjectOnPlanetMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/UpdateObjectOnPlanetMessage.h"
+
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+UpdateObjectOnPlanetMessage::UpdateObjectOnPlanetMessage(const NetworkId &objectId, const NetworkId &topmostContainer, int x, int y, int z, int interestRadius, int locationReservationRadius, bool watched, bool requiresSimulation, const int objectTypeTag, int const level, bool const hibernating, uint32 const templateCrc, int const aiActivity, int const creationType) :
+		GameNetworkMessage("UpdateObjectOnPlanetMessage"),
+		m_objectId(objectId),
+		m_topmostContainer(topmostContainer),
+		m_x(x),
+		m_y(y),
+		m_z(z),
+		m_interestRadius(interestRadius),
+		m_locationReservationRadius(locationReservationRadius),
+		m_objectTypeTag(objectTypeTag),
+		m_watched(watched),
+		m_requiresSimulation(requiresSimulation),
+		m_level(level),
+		m_hibernating(hibernating),
+		m_templateCrc(templateCrc),
+		m_aiActivity(aiActivity),
+		m_creationType(creationType)
+{
+	addVariable(m_objectId);
+	addVariable(m_topmostContainer);
+	addVariable(m_x);
+	addVariable(m_y);
+	addVariable(m_z);
+	addVariable(m_interestRadius);
+	addVariable(m_locationReservationRadius);
+	addVariable(m_objectTypeTag);
+	addVariable(m_watched);
+	addVariable(m_requiresSimulation);
+	addVariable(m_level);
+	addVariable(m_hibernating);
+	addVariable(m_templateCrc);
+	addVariable(m_aiActivity);
+	addVariable(m_creationType);
+}
+
+// ----------------------------------------------------------------------
+
+UpdateObjectOnPlanetMessage::UpdateObjectOnPlanetMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("UpdateObjectOnPlanetMessage"),
+		m_objectId(),
+		m_topmostContainer(),
+		m_x(),
+		m_y(),
+		m_z(),
+		m_interestRadius(),
+		m_locationReservationRadius(),
+		m_objectTypeTag(),
+		m_watched(),
+		m_requiresSimulation(),
+		m_level(0),
+		m_hibernating(false),
+		m_templateCrc(0),
+		m_aiActivity(-1),
+		m_creationType(-1)
+{
+	addVariable(m_objectId);
+	addVariable(m_topmostContainer);
+	addVariable(m_x);
+	addVariable(m_y);
+	addVariable(m_z);
+	addVariable(m_interestRadius);
+	addVariable(m_locationReservationRadius);
+	addVariable(m_objectTypeTag);
+	addVariable(m_watched);
+	addVariable(m_requiresSimulation);
+	addVariable(m_level);
+	addVariable(m_hibernating);
+	addVariable(m_templateCrc);
+	addVariable(m_aiActivity);
+	addVariable(m_creationType);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+UpdateObjectOnPlanetMessage::~UpdateObjectOnPlanetMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UpdateObjectOnPlanetMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UpdateObjectOnPlanetMessage.h
new file mode 100644
index 00000000..0a494495
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gamePlanetServer/UpdateObjectOnPlanetMessage.h
@@ -0,0 +1,191 @@
+// ======================================================================
+//
+// UpdateObjectOnPlanetMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_UpdateObjectOnPlanetMessage_H
+#define INCLUDED_UpdateObjectOnPlanetMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Updates Planet Server with the status of an object.
+ *
+ * Sent from:  Gameserver 
+ * Sent to:  Planet Server
+ * Action:  This message is sent periodically to update Planet's
+ * information about an object.  This may cause Planet Server to create new
+ * proxies, load more of the map, etc.
+ *
+ * Planet Server should check whether it knows about the object, and add it to
+ * its data if this is the first time it has heard of the object.
+ *
+ * The Gameserver should always send this message when it becomes
+ * authoritative.  After that, it only needs to send it when the object's
+ * position changes by more than a certain threshold.
+ *
+ * The coordinates are reduced to int's because the Planet Server does not
+ * need more than 1-meter accuracy.
+ *
+ * @todo:  Should this be replaced with something that uses the auto-
+ * synchronization system?
+ */
+class UpdateObjectOnPlanetMessage : public GameNetworkMessage
+{
+  public:
+	UpdateObjectOnPlanetMessage  (const NetworkId &objectId, const NetworkId &topmostContainer, int x, int y, int z, int interestRadius, int locationReservationRadius, bool watched, bool requiresSimulation, const int objectTag, int level, bool hibernating, uint32 templateCrc, int aiActivity, int creationType);
+	UpdateObjectOnPlanetMessage  (Archive::ReadIterator & source);
+	~UpdateObjectOnPlanetMessage ();
+
+	const NetworkId &getObjectId() const;
+	const NetworkId &getTopmostContainer() const;
+	int getX() const;
+	int getY() const;
+	int getZ() const;
+	int getInterestRadius() const;
+	int getLocationReservationRadius() const;
+	int getObjectTypeTag() const;
+	const bool getWatched() const;
+	const bool getRequiresSimulation() const;
+	int getLevel() const;
+	bool getHibernating() const;
+	uint32 getTemplateCrc() const;
+	int getAiActivity() const;
+	int getCreationType() const;
+
+  private:
+	Archive::AutoVariable<NetworkId> m_objectId;
+	Archive::AutoVariable<NetworkId> m_topmostContainer;
+	Archive::AutoVariable<int> m_x;
+	Archive::AutoVariable<int> m_y;
+	Archive::AutoVariable<int> m_z;
+	Archive::AutoVariable<int> m_interestRadius;
+	Archive::AutoVariable<int> m_locationReservationRadius;
+	Archive::AutoVariable<int> m_objectTypeTag;
+	Archive::AutoVariable<bool> m_watched;
+	Archive::AutoVariable<bool> m_requiresSimulation;
+	Archive::AutoVariable<int> m_level;
+	Archive::AutoVariable<bool> m_hibernating;
+	Archive::AutoVariable<uint32> m_templateCrc;
+	Archive::AutoVariable<int> m_aiActivity;
+	Archive::AutoVariable<int> m_creationType;
+
+  private:
+	UpdateObjectOnPlanetMessage();
+	UpdateObjectOnPlanetMessage(const UpdateObjectOnPlanetMessage&);
+	UpdateObjectOnPlanetMessage& operator= (const UpdateObjectOnPlanetMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &UpdateObjectOnPlanetMessage::getObjectId() const
+{
+	return m_objectId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdateObjectOnPlanetMessage::getX() const
+{
+	return m_x.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int UpdateObjectOnPlanetMessage::getObjectTypeTag() const
+{
+	return m_objectTypeTag.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdateObjectOnPlanetMessage::getY() const
+{
+	return m_y.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdateObjectOnPlanetMessage::getZ() const
+{
+	return m_z.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdateObjectOnPlanetMessage::getLevel() const
+{
+	return m_level.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool UpdateObjectOnPlanetMessage::getHibernating() const
+{
+	return m_hibernating.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 UpdateObjectOnPlanetMessage::getTemplateCrc() const
+{
+	return m_templateCrc.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdateObjectOnPlanetMessage::getAiActivity() const
+{
+	return m_aiActivity.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdateObjectOnPlanetMessage::getCreationType() const
+{
+	return m_creationType.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdateObjectOnPlanetMessage::getInterestRadius() const
+{
+	return m_interestRadius.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int UpdateObjectOnPlanetMessage::getLocationReservationRadius() const
+{
+	return m_locationReservationRadius.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool UpdateObjectOnPlanetMessage::getWatched() const
+{
+	return m_watched.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool UpdateObjectOnPlanetMessage::getRequiresSimulation() const
+{
+	return m_requiresSimulation.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &UpdateObjectOnPlanetMessage::getTopmostContainer() const
+{
+	return m_topmostContainer.get();
+}
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameStationPlayersCollector/SPCharacterProfileMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameStationPlayersCollector/SPCharacterProfileMessage.cpp
new file mode 100644
index 00000000..c36fbc22
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameStationPlayersCollector/SPCharacterProfileMessage.cpp
@@ -0,0 +1,99 @@
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "SPCharacterProfileMessage.h"
+
+SPCharacterProfileMessage::SPCharacterProfileMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("SPCharacterProfileMessage"),
+m_clusterName(),
+m_characterId(),
+m_characterName(),
+m_objectName(),
+m_x(),
+m_y(),
+m_z(),
+m_sceneId(),
+m_cash_balance(),
+m_bank_balance(),
+m_objectTemplateName(),
+m_stationId(),
+m_containedby(),
+m_createTime(),
+m_playedTime(),
+m_numLots()
+{
+	AutoByteStream::addVariable(m_clusterName);
+	AutoByteStream::addVariable(m_characterId);
+	AutoByteStream::addVariable(m_characterName);
+	AutoByteStream::addVariable(m_objectName);
+	AutoByteStream::addVariable(m_x);
+	AutoByteStream::addVariable(m_y);
+	AutoByteStream::addVariable(m_z);
+	AutoByteStream::addVariable(m_sceneId);
+	AutoByteStream::addVariable(m_cash_balance);
+	AutoByteStream::addVariable(m_bank_balance);
+	AutoByteStream::addVariable(m_objectTemplateName);
+	AutoByteStream::addVariable(m_stationId);
+	AutoByteStream::addVariable(m_containedby);
+	AutoByteStream::addVariable(m_createTime);
+	AutoByteStream::addVariable(m_playedTime);
+	AutoByteStream::addVariable(m_numLots);
+	unpack(source);
+}
+
+SPCharacterProfileMessage::SPCharacterProfileMessage(
+		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
+) :
+GameNetworkMessage("SPCharacterProfileMessage"),
+m_clusterName(clusterName),
+m_characterId(characterId),
+m_characterName(characterName),
+m_objectName(objectName),
+m_x(x),
+m_y(y),
+m_z(z),
+m_sceneId(sceneId),
+m_cash_balance(cash_balance),
+m_bank_balance(bank_balance),
+m_objectTemplateName(objectTemplateName),
+m_stationId(stationId),
+m_containedby(containedBy),
+m_createTime(createTime),
+m_playedTime(playedTime),
+m_numLots(numLots)
+{
+	AutoByteStream::addVariable(m_clusterName);
+	AutoByteStream::addVariable(m_characterId);
+	AutoByteStream::addVariable(m_characterName);
+	AutoByteStream::addVariable(m_objectName);
+	AutoByteStream::addVariable(m_x);
+	AutoByteStream::addVariable(m_y);
+	AutoByteStream::addVariable(m_z);
+	AutoByteStream::addVariable(m_sceneId);
+	AutoByteStream::addVariable(m_cash_balance);
+	AutoByteStream::addVariable(m_bank_balance);
+	AutoByteStream::addVariable(m_objectTemplateName);
+	AutoByteStream::addVariable(m_stationId);
+	AutoByteStream::addVariable(m_containedby);
+	AutoByteStream::addVariable(m_createTime);
+	AutoByteStream::addVariable(m_playedTime);
+	AutoByteStream::addVariable(m_numLots);
+}
+
+SPCharacterProfileMessage::~SPCharacterProfileMessage()
+{
+}
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameStationPlayersCollector/SPCharacterProfileMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameStationPlayersCollector/SPCharacterProfileMessage.h
new file mode 100644
index 00000000..81cd0797
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameStationPlayersCollector/SPCharacterProfileMessage.h
@@ -0,0 +1,71 @@
+#ifndef SPCharacterProfileMessage_h
+#define SPCharacterProfileMessage_h
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+class SPCharacterProfileMessage : public GameNetworkMessage
+{
+
+public:
+	SPCharacterProfileMessage(
+		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
+	);
+	SPCharacterProfileMessage(Archive::ReadIterator & source);
+	~SPCharacterProfileMessage();
+
+	const std::string &        GetClusterName() const {return m_clusterName.get();}
+	const NetworkId &          GetCharacterId() const {return m_characterId.get();}
+	const std::string &        GetCharacterName() const {return m_characterName.get();}
+	const std::string &        GetObjectName() const {return m_objectName.get();}
+	float                      GetX() const {return m_x.get();}
+	float                      GetY() const {return m_y.get();}
+	float                      GetZ() const {return m_z.get();}
+	const std::string &        GetSceneId() const {return m_sceneId.get();}
+	float                      GetCash_Balance() const {return m_cash_balance.get();}
+	float                      GetBank_Balance() const {return m_bank_balance.get();}
+	const std::string &        GetObjectTemplateName() const {return m_objectTemplateName.get();}
+	int                        GetStationId() const {return m_stationId.get();}
+	const NetworkId &          GetContainedBy() const {return m_containedby.get();}
+	int                        GetCreateTime() const {return m_createTime.get();}
+	int                        GetPlayedTime() const {return m_playedTime.get();}
+	int                        GetNumLots() const {return m_numLots.get();}
+
+protected:
+
+private:
+	Archive::AutoVariable<std::string>      m_clusterName;
+	Archive::AutoVariable<NetworkId>        m_characterId;
+	Archive::AutoVariable<std::string>      m_characterName;
+	Archive::AutoVariable<std::string>      m_objectName;
+	Archive::AutoVariable<float>            m_x;
+	Archive::AutoVariable<float>            m_y;
+	Archive::AutoVariable<float>            m_z;
+	Archive::AutoVariable<std::string>      m_sceneId;
+	Archive::AutoVariable<float>            m_cash_balance;
+	Archive::AutoVariable<float>            m_bank_balance;
+	Archive::AutoVariable<std::string>      m_objectTemplateName;
+	Archive::AutoVariable<int>              m_stationId;
+	Archive::AutoVariable<NetworkId>        m_containedby;
+	Archive::AutoVariable<int>              m_createTime;
+	Archive::AutoVariable<int>              m_playedTime;
+	Archive::AutoVariable<int>              m_numLots;
+
+};
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameTaskManager/GameTaskManagerMessages.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameTaskManager/GameTaskManagerMessages.cpp
new file mode 100644
index 00000000..1a87ba59
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameTaskManager/GameTaskManagerMessages.cpp
@@ -0,0 +1,107 @@
+// GameTaskManagerMessages.cpp
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/GameTaskManagerMessages.h"
+
+//-----------------------------------------------------------------------
+
+TaskShutdownGameServer::TaskShutdownGameServer() :
+GameNetworkMessage("TaskShutdownGameServer")
+{
+}
+
+//-----------------------------------------------------------------------
+
+TaskShutdownGameServer::TaskShutdownGameServer(Archive::ReadIterator & source) :
+GameNetworkMessage("TaskShutdownGameServer")
+{
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TaskShutdownGameServer::~TaskShutdownGameServer()
+{
+}
+
+//-----------------------------------------------------------------------
+
+GameSetClusterName::GameSetClusterName(const std::string & newClusterName, const std::string & newGameServerName) :
+GameNetworkMessage("GameSetClusterName"),
+clusterName(newClusterName),
+gameServerName(newGameServerName)
+{
+	addVariable(clusterName);
+	addVariable(gameServerName);
+}
+
+//-----------------------------------------------------------------------
+
+GameSetClusterName::GameSetClusterName(Archive::ReadIterator & source) :
+GameNetworkMessage("GameSetClusterName"),
+clusterName(),
+gameServerName()
+{
+	addVariable(clusterName);
+	addVariable(gameServerName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+GameSetClusterName::~GameSetClusterName()
+{
+}
+
+//-----------------------------------------------------------------------
+
+GameSetDbProcess::GameSetDbProcess() :
+GameNetworkMessage("GameSetDbProcess")
+{
+
+}
+
+//-----------------------------------------------------------------------
+
+GameSetDbProcess::GameSetDbProcess(Archive::ReadIterator & source) :
+GameNetworkMessage("GameSetDbProcess")
+{
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+GameSetDbProcess::~GameSetDbProcess()
+{
+}
+
+// ======================================================================
+
+ServerIdleMessage::ServerIdleMessage(bool isIdle) :
+		GameNetworkMessage("ServerIdleMessage"),
+		m_isIdle(isIdle)
+{
+	addVariable(m_isIdle);
+}
+
+// ----------------------------------------------------------------------
+
+ServerIdleMessage::ServerIdleMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("ServerIdleMessage"),
+		m_isIdle(false)
+{
+	addVariable(m_isIdle);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ServerIdleMessage::~ServerIdleMessage()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameTaskManager/GameTaskManagerMessages.h b/engine/server/library/serverNetworkMessages/src/shared/gameTaskManager/GameTaskManagerMessages.h
new file mode 100644
index 00000000..303a49f2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/gameTaskManager/GameTaskManagerMessages.h
@@ -0,0 +1,114 @@
+// GameTaskManagerMessages.h
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_GameTaskManagerMessages_H
+#define	_INCLUDED_GameTaskManagerMessages_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+namespace GameTaskManagerMessageConstants
+{
+	const unsigned char        ShutdownGameServer = 1;
+	const unsigned char        GameSetClusterName = 2;
+	const unsigned char        GameSetDbProcess   = 3;
+}
+
+//-----------------------------------------------------------------------
+
+class TaskShutdownGameServer : public GameNetworkMessage
+{
+public:
+	TaskShutdownGameServer();
+	TaskShutdownGameServer(Archive::ReadIterator & source);
+	virtual ~TaskShutdownGameServer();
+private:
+	TaskShutdownGameServer(const TaskShutdownGameServer & source);
+	TaskShutdownGameServer & operator = (const TaskShutdownGameServer & rhs);
+};
+
+//-----------------------------------------------------------------------
+
+class GameSetClusterName : public GameNetworkMessage
+{
+public:
+	GameSetClusterName(const std::string & newClusterName, const std::string & newGameServerName);
+	GameSetClusterName(Archive::ReadIterator & source);
+	virtual ~GameSetClusterName();
+
+	const std::string & getClusterName    (void) const;
+	const std::string & getGameServerName (void) const;
+
+private:
+	Archive::AutoVariable<std::string> clusterName;
+	Archive::AutoVariable<std::string> gameServerName;
+
+	GameSetClusterName();
+	GameSetClusterName(const GameSetClusterName&);
+	GameSetClusterName& operator= (const GameSetClusterName&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & GameSetClusterName::getClusterName(void) const
+{
+	return clusterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & GameSetClusterName::getGameServerName(void) const
+{
+	return gameServerName.get();
+}
+
+//-----------------------------------------------------------------------
+class GameSetDbProcess : public GameNetworkMessage
+{
+public:
+	GameSetDbProcess();
+	GameSetDbProcess(Archive::ReadIterator & source);
+	virtual ~GameSetDbProcess();
+
+private:
+	GameSetDbProcess(const GameSetDbProcess&);
+	GameSetDbProcess& operator= (const GameSetDbProcess&);
+};
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  various processes (only DatabaseServer yet, as of when this comment was written)
+ * Sent to:    task manager
+ * Action:     Notify the task manager that the process isn't doing anything
+ *             significant, e.g. has no data to save or load
+ */
+class ServerIdleMessage : public GameNetworkMessage
+{
+  public:
+	ServerIdleMessage(bool isIdle);
+	ServerIdleMessage(Archive::ReadIterator & source);
+	virtual ~ServerIdleMessage();
+
+	bool getIsIdle();
+	
+  private:
+	Archive::AutoVariable<bool> m_isIdle;
+	
+  private:
+	ServerIdleMessage(const ServerIdleMessage&);
+	ServerIdleMessage& operator= (const ServerIdleMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline bool ServerIdleMessage::getIsIdle()
+{
+	return m_isIdle.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif	// _INCLUDED_GameTaskManagerMessages_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolRequest.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolRequest.cpp
new file mode 100644
index 00000000..708b0d6d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolRequest.cpp
@@ -0,0 +1,51 @@
+// CSToolRequest.cpp
+// Copyright 2005, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Rob Hanz
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CSToolRequest.h"
+
+
+CSToolRequest::CSToolRequest( uint32 accountId, uint32 accessLevel, const std::string & sCommand, const std::string & sCommandName, uint32 toolId, const std::string & sUserName ) :
+GameNetworkMessage( "CSToolRequest" ),
+m_accountId( accountId ),
+m_command( sCommand ),
+m_commandName( sCommandName ),
+m_accessLevel( accessLevel ),
+m_toolId( toolId ),
+m_userName( sUserName )
+{
+	addVariable( m_accountId );
+	addVariable( m_command );
+	addVariable( m_commandName );
+	addVariable( m_accessLevel );
+	addVariable( m_toolId );
+	addVariable( m_userName );
+}
+
+CSToolRequest::CSToolRequest( Archive::ReadIterator & source ) :
+GameNetworkMessage("CSToolRequest"),
+m_accountId( 0 ),
+m_command( "" ),
+m_commandName( "" ),
+m_accessLevel( 0 ),
+m_toolId( 0 ),
+m_userName( "" )
+{
+	addVariable( m_accountId );
+	addVariable( m_command );
+	addVariable( m_commandName );
+	addVariable( m_accessLevel );
+	addVariable( m_toolId );
+	addVariable( m_userName );
+	AutoByteStream::unpack( source );
+}
+
+CSToolRequest::~CSToolRequest()
+{
+}
+
+
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolRequest.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolRequest.h
new file mode 100644
index 00000000..ad6204f9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolRequest.h
@@ -0,0 +1,76 @@
+// CSToolREquest.h
+// Copyright 2004, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Rob Hanz
+
+#ifndef	_INCLUDED_CSToolRequest_H
+#define	_INCLUDED_CSToolRequest_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+/** A Central Server is telling the login server which cluster it is
+	servicing.
+*/
+class CSToolRequest : public GameNetworkMessage
+{
+  public:
+    CSToolRequest (uint32 accountId, uint32 accessLevel, const std::string & sCommand, const std::string & sCommandName, uint32 toolId, const std::string & sUserName );
+    CSToolRequest (Archive::ReadIterator & source);
+    virtual ~CSToolRequest ();
+    
+    uint32 			getAccountId () const;
+    uint32			getAccessLevel() const;
+    const std::string & 	getCommandName() const;
+    const std::string & 	getCommandString() const;
+    uint32			getToolId() const;
+    const std::string &		getUserName() const;
+
+  private:
+    Archive::AutoVariable< uint32 >      m_accountId;
+    Archive::AutoVariable<std::string>   m_command;
+    Archive::AutoVariable<std::string>	 m_commandName;
+    Archive::AutoVariable< uint32 >	 m_accessLevel;
+    Archive::AutoVariable< uint32 > 	 m_toolId;
+    Archive::AutoVariable< std::string > m_userName;
+    
+
+    CSToolRequest();
+    CSToolRequest(const CSToolRequest&);
+    CSToolRequest& operator= (const CSToolRequest&);
+
+};
+
+inline uint32 CSToolRequest::getAccountId() const
+{
+	return m_accountId.get();
+}
+
+inline uint32 CSToolRequest::getAccessLevel() const
+{
+	return m_accessLevel.get();
+}
+
+inline const std::string & CSToolRequest::getCommandString() const
+{
+	return m_command.get();
+}
+
+inline const std::string & CSToolRequest::getCommandName() const
+{
+	return m_commandName.get();
+}
+
+inline uint32 CSToolRequest::getToolId() const
+{
+	return m_toolId.get();
+}
+
+inline const std::string & CSToolRequest::getUserName() const
+{
+	return m_userName.get();
+}
+
+
+#endif //_INCLUDED_CSToolRequest_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolResponse.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolResponse.cpp
new file mode 100644
index 00000000..bb6b6d96
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolResponse.cpp
@@ -0,0 +1,46 @@
+// CSToolResponse.cpp
+// Copyright 2005, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Rob Hanz
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/CSToolRequest.h"
+#include "serverNetworkMessages/CSToolResponse.h"
+
+CSToolResponse::CSToolResponse( const CSToolRequest & request, const std::string & sResult) :
+GameNetworkMessage( "CSToolResponse" ),
+m_accountId( request.getAccountId() ),
+m_result( sResult),
+m_toolId( request.getToolId() )
+{
+	addVariable( m_accountId );
+	addVariable( m_result );
+	addVariable( m_toolId );
+}
+CSToolResponse::CSToolResponse ( uint32 accountId, const std::string & response, uint32 toolId ) :
+GameNetworkMessage( "CSToolResponse" ),
+m_accountId( accountId ),
+m_result( response ),
+m_toolId( toolId )
+{
+	addVariable( m_accountId );
+	addVariable( m_result );
+	addVariable( m_toolId );
+}
+
+CSToolResponse::CSToolResponse( Archive::ReadIterator & source ) :
+GameNetworkMessage("CSToolResponse"),
+m_accountId( 0 ),
+m_result( "" ),
+m_toolId( 0 )
+{
+	addVariable( m_accountId );
+	addVariable( m_result );
+	addVariable( m_toolId );
+	AutoByteStream::unpack( source );
+}
+
+CSToolResponse::~CSToolResponse()
+{
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolResponse.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolResponse.h
new file mode 100644
index 00000000..f7fe17c3
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/CSToolResponse.h
@@ -0,0 +1,54 @@
+// CSToolResponse.h
+// Copyright 2004, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Rob Hanz
+
+#ifndef	_INCLUDED_CSToolResponse_H
+#define	_INCLUDED_CSToolResponse_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+class CSToolRequest;
+//-----------------------------------------------------------------------
+/** A Central server is responding to a CS Tool request from a LS
+*/
+class CSToolResponse : public GameNetworkMessage
+{
+  public:
+    CSToolResponse ( const CSToolRequest & pRequest, const std::string &sResult );
+    CSToolResponse ( uint32 accountId, const std::string & response, uint32 toolId );
+    CSToolResponse (Archive::ReadIterator & source);
+    virtual ~CSToolResponse ();
+    
+    uint32 			getAccountId () const;
+    const std::string & 	getResult() const;
+    uint32			getToolId() const;
+
+  private:
+    Archive::AutoVariable< uint32 >      m_accountId;
+    Archive::AutoVariable<std::string>   m_result;
+    Archive::AutoVariable< uint32 > 	 m_toolId;
+    
+
+    CSToolResponse();
+    CSToolResponse(const CSToolResponse&);
+    CSToolResponse& operator= (const CSToolResponse&);
+
+};
+
+inline const std::string & CSToolResponse::getResult() const
+{
+	return m_result.get();
+}
+
+inline uint32 CSToolResponse::getAccountId() const
+{
+	return m_accountId.get();
+}
+
+inline uint32 CSToolResponse::getToolId() const
+{
+	return m_toolId.get();
+}
+
+#endif //_INCLUDED_CSToolResponse_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ConnectionServerDown.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ConnectionServerDown.cpp
new file mode 100644
index 00000000..7e47628e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ConnectionServerDown.cpp
@@ -0,0 +1,36 @@
+// ConnectionServerDown.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ConnectionServerDown.h"
+
+//-----------------------------------------------------------------------
+
+ConnectionServerDown::ConnectionServerDown(int id) :
+GameNetworkMessage("ConnectionServerDown"),
+m_id(id)
+{
+	addVariable(m_id);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionServerDown::ConnectionServerDown(Archive::ReadIterator & source) :
+GameNetworkMessage("ConnectionServerDown"),
+m_id(0)
+{
+	addVariable(m_id);
+	AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ConnectionServerDown::~ConnectionServerDown()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ConnectionServerDown.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ConnectionServerDown.h
new file mode 100644
index 00000000..82cbc9fc
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ConnectionServerDown.h
@@ -0,0 +1,36 @@
+// ConnectionServerDown.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ConnectionServerDown_H
+#define	_INCLUDED_ConnectionServerDown_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ConnectionServerDown : public GameNetworkMessage
+{
+public:
+	explicit ConnectionServerDown(int id);
+	ConnectionServerDown(Archive::ReadIterator & source);
+	~ConnectionServerDown();
+
+	int       getId() const;
+
+private:
+	Archive::AutoVariable<int>      m_id;
+};
+
+//-----------------------------------------------------------------------
+
+inline int ConnectionServerDown::getId() const
+{
+	return m_id.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ConnectionServerDown_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName.cpp
new file mode 100644
index 00000000..16615291
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName.cpp
@@ -0,0 +1,40 @@
+// LoginClusterName.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LoginClusterName.h"
+
+//-----------------------------------------------------------------------
+
+LoginClusterName::LoginClusterName(const std::string & clusterName, int timeZone) :
+GameNetworkMessage("LoginClusterName"),
+m_clusterName(clusterName),
+m_timeZone(timeZone)
+{
+	addVariable(m_clusterName);
+	addVariable(m_timeZone);
+}
+
+//-----------------------------------------------------------------------
+
+LoginClusterName::LoginClusterName(Archive::ReadIterator & source) :
+GameNetworkMessage("LoginClusterName"),
+m_clusterName(),
+m_timeZone()
+{
+	addVariable(m_clusterName);
+	addVariable(m_timeZone);
+	AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoginClusterName::~LoginClusterName()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName.h
new file mode 100644
index 00000000..a128cccb
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName.h
@@ -0,0 +1,51 @@
+// LoginClusterName.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_LoginClusterName_H
+#define	_INCLUDED_LoginClusterName_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+/** A Central Server is telling the login server which cluster it is
+	servicing.
+*/
+class LoginClusterName : public GameNetworkMessage
+{
+  public:
+    LoginClusterName (const std::string & newClusterName, int timeZone);
+    LoginClusterName (Archive::ReadIterator & source);
+    virtual ~LoginClusterName ();
+    const std::string & getClusterName () const;
+	int                 getTimeZone    () const;
+
+  private:
+    Archive::AutoVariable<std::string>   m_clusterName;
+	Archive::AutoVariable<int>           m_timeZone;
+
+    LoginClusterName();
+    LoginClusterName(const LoginClusterName&);
+    LoginClusterName& operator= (const LoginClusterName&);
+
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & LoginClusterName::getClusterName() const
+{
+	return m_clusterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int LoginClusterName::getTimeZone() const
+{
+	return m_timeZone.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_LoginClusterName_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName2.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName2.cpp
new file mode 100644
index 00000000..ca8e3841
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName2.cpp
@@ -0,0 +1,51 @@
+// LoginClusterName2.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LoginClusterName2.h"
+#include "sharedFoundation/Branch.h"
+#include "sharedFoundation/ApplicationVersion.h"
+
+//-----------------------------------------------------------------------
+
+LoginClusterName2::LoginClusterName2(const std::string & clusterName, int timeZone) :
+GameNetworkMessage("LoginClusterName2"),
+m_clusterName(clusterName),
+m_timeZone(timeZone),
+m_branch( Branch().getBranchName() ),
+m_changelist( atoi( ApplicationVersion::getPublicVersion() ) ),
+m_networkVersion( GameNetworkMessage::NetworkVersionId )
+{
+	addVariable(m_clusterName);
+	addVariable(m_timeZone);
+	addVariable(m_branch);
+	addVariable(m_changelist);
+	addVariable(m_networkVersion);
+}
+
+//-----------------------------------------------------------------------
+
+LoginClusterName2::LoginClusterName2(Archive::ReadIterator & source) :
+GameNetworkMessage("LoginClusterName2"),
+m_clusterName(),
+m_timeZone()
+{
+	addVariable(m_clusterName);
+	addVariable(m_timeZone);
+	addVariable(m_branch);
+	addVariable(m_changelist);
+	addVariable(m_networkVersion);
+	AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoginClusterName2::~LoginClusterName2()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName2.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName2.h
new file mode 100644
index 00000000..3208e374
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginClusterName2.h
@@ -0,0 +1,79 @@
+// LoginClusterName2.h
+// Copyright 2005, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall, JMatzen
+
+#ifndef	_INCLUDED_LoginClusterName2_H
+#define	_INCLUDED_LoginClusterName2_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+/** A Central Server is telling the login server which cluster it is
+	servicing.
+*/
+class LoginClusterName2 : public GameNetworkMessage
+{
+  public:
+    LoginClusterName2 (const std::string & newClusterName, int timeZone);
+    LoginClusterName2 (Archive::ReadIterator & source);
+    virtual ~LoginClusterName2 ();
+    const std::string & getClusterName () const;
+	int                 getTimeZone    () const;
+	int                 getChangelist()   const;
+	const std::string & getBranch() const;
+	const std::string & getNetworkVersion() const;
+
+  private:
+	Archive::AutoVariable<std::string>   m_clusterName;
+	Archive::AutoVariable<int>           m_timeZone;
+	Archive::AutoVariable<std::string>   m_branch;
+	Archive::AutoVariable<int>           m_changelist;
+	Archive::AutoVariable<std::string>   m_networkVersion;
+	
+
+    LoginClusterName2();
+    LoginClusterName2(const LoginClusterName2&);
+    LoginClusterName2& operator= (const LoginClusterName2&);
+
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & LoginClusterName2::getClusterName() const
+{
+	return m_clusterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int LoginClusterName2::getTimeZone() const
+{
+	return m_timeZone.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int LoginClusterName2::getChangelist() const
+{
+	return m_changelist.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string &LoginClusterName2::getBranch() const
+{
+	return m_branch.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string &LoginClusterName2::getNetworkVersion() const
+{
+	return m_networkVersion.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_LoginClusterName2_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginConnectionServerAddress.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginConnectionServerAddress.cpp
new file mode 100644
index 00000000..a324e900
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginConnectionServerAddress.cpp
@@ -0,0 +1,56 @@
+// LoginConnectionServerAddress.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "LoginConnectionServerAddress.h"
+
+//-----------------------------------------------------------------------
+
+LoginConnectionServerAddress::LoginConnectionServerAddress (int newId, const std::string & newServiceAddress, const uint16 newClientPortPrivate, const uint16 newClientPortPublic, int newNumClients, const uint16 _pingPort) :
+GameNetworkMessage        ("LoginConnectionServerAddress"),
+clientServiceAddress      (newServiceAddress),
+clientServicePortPrivate  (newClientPortPrivate),
+clientServicePortPublic   (newClientPortPublic),
+id(newId),
+numClients(newNumClients),
+pingPort                  (_pingPort)
+{
+	addVariable(clientServiceAddress);
+	addVariable(clientServicePortPrivate);
+	addVariable(clientServicePortPublic);
+	addVariable(id);
+	addVariable(numClients);
+	addVariable(pingPort);
+}
+
+//-----------------------------------------------------------------------
+
+LoginConnectionServerAddress::LoginConnectionServerAddress (Archive::ReadIterator & source) :
+GameNetworkMessage        ("LoginConnectionServerAddress"),
+clientServiceAddress      (),
+clientServicePortPrivate  (0),
+clientServicePortPublic   (0),
+id(0),
+numClients(0),
+pingPort                  (0)
+{
+	addVariable(clientServiceAddress);
+	addVariable(clientServicePortPrivate);
+	addVariable(clientServicePortPublic);
+	addVariable(id);
+	addVariable(numClients);
+	addVariable(pingPort);
+
+	AutoByteStream::unpack(source);
+}
+//-----------------------------------------------------------------------
+
+LoginConnectionServerAddress::~LoginConnectionServerAddress ()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginConnectionServerAddress.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginConnectionServerAddress.h
new file mode 100644
index 00000000..2f2016aa
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginConnectionServerAddress.h
@@ -0,0 +1,84 @@
+// LoginConnectionServerAddress.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_LoginConnectionServerAddress_H
+#define	_INCLUDED_LoginConnectionServerAddress_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class LoginConnectionServerAddress : public GameNetworkMessage
+{
+public:
+
+	LoginConnectionServerAddress (int id, const std::string & newServiceAddress, const uint16 newClientPortPrivate, const uint16 newClientPortPublic, int newNumClients, const uint16 _pingPort);
+	LoginConnectionServerAddress (Archive::ReadIterator & source);
+    virtual ~LoginConnectionServerAddress ();
+
+    const std::string &            getClientServiceAddress() const;
+    uint16                         getClientServicePortPrivate() const;
+    uint16                         getClientServicePortPublic() const;
+	int                            getId() const;
+	int                            getNumClients() const;
+    uint16                         getPingPort () const;
+
+private:
+	Archive::AutoVariable<std::string>   clientServiceAddress;
+	Archive::AutoVariable<uint16>        clientServicePortPrivate;
+	Archive::AutoVariable<uint16>        clientServicePortPublic;
+	Archive::AutoVariable<int>           id;
+	Archive::AutoVariable<int>           numClients;
+	Archive::AutoVariable<uint16>        pingPort;
+
+	LoginConnectionServerAddress(const LoginConnectionServerAddress&);
+	LoginConnectionServerAddress& operator= (const LoginConnectionServerAddress&);
+};
+//-----------------------------------------------------------------------
+
+inline int LoginConnectionServerAddress::getId() const
+{
+	return id.get();
+}
+
+
+//-----------------------------------------------------------------------
+
+inline const std::string & LoginConnectionServerAddress::getClientServiceAddress (void) const
+{
+	return clientServiceAddress.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline uint16 LoginConnectionServerAddress::getClientServicePortPrivate (void) const
+{
+	return clientServicePortPrivate.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline uint16 LoginConnectionServerAddress::getClientServicePortPublic (void) const
+{
+	return clientServicePortPublic.get();
+}
+
+//----------------------------------------------------------------------
+inline int LoginConnectionServerAddress::getNumClients (void) const
+{
+	return numClients.get();
+}
+
+//----------------------------------------------------------------------
+
+inline uint16 LoginConnectionServerAddress::getPingPort () const
+{
+	return pingPort.get ();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterAckMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterAckMessage.cpp
new file mode 100644
index 00000000..0a2e7e13
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterAckMessage.cpp
@@ -0,0 +1,41 @@
+// ======================================================================
+//
+// LoginCreateCharacterAckMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LoginCreateCharacterAckMessage.h"
+
+// ======================================================================
+
+LoginCreateCharacterAckMessage::LoginCreateCharacterAckMessage (const StationId &stationId, const NetworkId &characterNetworkId) :
+		GameNetworkMessage("LoginCreateCharacterAckMessage"),
+		m_stationId(stationId),
+		m_characterNetworkId(characterNetworkId)
+{
+	addVariable(m_stationId);
+	addVariable(m_characterNetworkId);
+}
+
+// ----------------------------------------------------------------------
+
+LoginCreateCharacterAckMessage::LoginCreateCharacterAckMessage (Archive::ReadIterator & source) :
+		GameNetworkMessage("LoginCreateCharacterAckMessage"),
+		m_stationId(),
+		m_characterNetworkId()
+{
+	addVariable(m_stationId);
+	addVariable(m_characterNetworkId);
+	
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+LoginCreateCharacterAckMessage::~LoginCreateCharacterAckMessage ()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterAckMessage.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterAckMessage.h
new file mode 100644
index 00000000..3424f718
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterAckMessage.h
@@ -0,0 +1,63 @@
+// ======================================================================
+//
+// LoginCreateCharacterAckMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_LoginCreateCharacterAckMessage_H
+#define INCLUDED_LoginCreateCharacterAckMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Sent From:  LoginServer
+ * Sent To:    Central
+ * Action:     Acknowledge that the character has been saved to the login
+ *             server database.
+ */
+
+class LoginCreateCharacterAckMessage : public GameNetworkMessage
+{
+  public:
+    LoginCreateCharacterAckMessage (const StationId &stationId, const NetworkId &characterNetworkId);
+    LoginCreateCharacterAckMessage (Archive::ReadIterator & source);
+    virtual ~LoginCreateCharacterAckMessage ();
+
+  public:
+	StationId           getStationId() const;
+	const NetworkId &   getCharacterNetworkId() const;
+	
+  private:
+    Archive::AutoVariable<StationId> m_stationId;
+	Archive::AutoVariable<NetworkId> m_characterNetworkId;
+  
+  private: // disable:
+    LoginCreateCharacterAckMessage();
+    LoginCreateCharacterAckMessage(const LoginCreateCharacterAckMessage&);
+    LoginCreateCharacterAckMessage& operator= (const LoginCreateCharacterAckMessage&);
+
+};
+
+// ======================================================================
+
+inline StationId LoginCreateCharacterAckMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &LoginCreateCharacterAckMessage::getCharacterNetworkId() const
+{
+	return m_characterNetworkId.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterMessage.cpp
new file mode 100644
index 00000000..51068d01
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterMessage.cpp
@@ -0,0 +1,53 @@
+// ======================================================================
+//
+// LoginCreateCharacterMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LoginCreateCharacterMessage.h"
+
+// ======================================================================
+
+LoginCreateCharacterMessage::LoginCreateCharacterMessage (const StationId &stationId, const Unicode::String &characterName, const NetworkId &characterObjectId, int templateId, bool jedi) :
+		GameNetworkMessage("LoginCreateCharacterMessage"),
+		m_stationId(stationId),
+		m_characterName(characterName),
+		m_characterObjectId(characterObjectId),
+		m_templateId(templateId),
+		m_jedi(jedi)
+{
+	addVariable(m_stationId);
+	addVariable(m_characterName);
+	addVariable(m_characterObjectId);
+	addVariable(m_templateId);
+	addVariable(m_jedi);
+}
+
+// ----------------------------------------------------------------------
+
+LoginCreateCharacterMessage::LoginCreateCharacterMessage (Archive::ReadIterator & source) :
+		GameNetworkMessage("LoginCreateCharacterMessage"),
+		m_stationId(),
+		m_characterName(),
+		m_characterObjectId(),
+		m_templateId(),
+		m_jedi()
+{
+	addVariable(m_stationId);
+	addVariable(m_characterName);
+	addVariable(m_characterObjectId);
+	addVariable(m_templateId);
+	addVariable(m_jedi);
+
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+LoginCreateCharacterMessage::~LoginCreateCharacterMessage ()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterMessage.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterMessage.h
new file mode 100644
index 00000000..556ba9f7
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginCreateCharacterMessage.h
@@ -0,0 +1,90 @@
+// ======================================================================
+//
+// LoginCreateCharacterMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_LoginCreateCharacterMessage_H
+#define INCLUDED_LoginCreateCharacterMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Sent From:  Central
+ * Sent To:    LoginServer
+ * Action:     Add the specified character to the login database and
+ *             reply with LoginCreateCharacterAckMessage
+ */
+
+class LoginCreateCharacterMessage : public GameNetworkMessage
+{
+  public:
+    LoginCreateCharacterMessage (const StationId &stationId, const Unicode::String &characterName, const NetworkId &characterObjectId, int templateId, bool jedi);
+    LoginCreateCharacterMessage (Archive::ReadIterator & source);
+    virtual ~LoginCreateCharacterMessage ();
+
+  public:
+	StationId           getStationId() const;
+	const Unicode::String & getCharacterName() const;
+	const NetworkId &   getCharacterObjectId() const;
+	int                 getTemplateId() const;
+	bool                getJedi() const;
+	
+  private:
+    Archive::AutoVariable<StationId> m_stationId;
+	Archive::AutoVariable<Unicode::String> m_characterName;
+	Archive::AutoVariable<NetworkId> m_characterObjectId;
+	Archive::AutoVariable<int> m_templateId;
+	Archive::AutoVariable<bool> m_jedi;
+  
+  private: // disable:
+    LoginCreateCharacterMessage();
+    LoginCreateCharacterMessage(const LoginCreateCharacterMessage&);
+    LoginCreateCharacterMessage& operator= (const LoginCreateCharacterMessage&);
+
+};
+
+// ======================================================================
+
+inline StationId LoginCreateCharacterMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & LoginCreateCharacterMessage::getCharacterName() const
+{
+	return m_characterName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & LoginCreateCharacterMessage::getCharacterObjectId() const
+{
+	return m_characterObjectId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int LoginCreateCharacterMessage::getTemplateId() const
+{
+	return m_templateId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool LoginCreateCharacterMessage::getJedi() const
+{
+	return m_jedi.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginKeyPush.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginKeyPush.cpp
new file mode 100644
index 00000000..c475ebdc
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginKeyPush.cpp
@@ -0,0 +1,37 @@
+// LoginKeyPush.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LoginKeyPush.h"
+
+//-----------------------------------------------------------------------
+
+LoginKeyPush::LoginKeyPush(const KeyShare::Key & sourceKey) :
+GameNetworkMessage("LoginKeyPush"),
+key(sourceKey)
+{
+    addVariable(key);
+}
+
+//-----------------------------------------------------------------------
+
+LoginKeyPush::LoginKeyPush(Archive::ReadIterator & source) :
+GameNetworkMessage("LoginKeyPush"),
+key()
+{
+    addVariable(key);
+    AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoginKeyPush::~LoginKeyPush()
+{
+}
+
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginKeyPush.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginKeyPush.h
new file mode 100644
index 00000000..5fc8cc25
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginKeyPush.h
@@ -0,0 +1,39 @@
+// LoginKeyPush.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_LoginKeyPush_H
+#define	_INCLUDED_LoginKeyPush_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "serverKeyShare/KeyShare.h"
+
+//-----------------------------------------------------------------------
+
+class LoginKeyPush : public GameNetworkMessage
+{
+public:
+	explicit LoginKeyPush	(const KeyShare::Key & sourceKey);
+	LoginKeyPush            (Archive::ReadIterator & source);
+	~LoginKeyPush	();
+	const KeyShare::Key &		getKey (void) const;
+private:
+	AutoVariableKeyShare		key;
+
+	LoginKeyPush();
+	LoginKeyPush(const LoginKeyPush&);
+	LoginKeyPush& operator= (const LoginKeyPush&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const KeyShare::Key & LoginKeyPush::getKey(void) const
+{
+	return key;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_LoginKeyPush_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginRestoreCharacterMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginRestoreCharacterMessage.cpp
new file mode 100644
index 00000000..682ec5c5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginRestoreCharacterMessage.cpp
@@ -0,0 +1,57 @@
+// ======================================================================
+//
+// LoginRestoreCharacterMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LoginRestoreCharacterMessage.h"
+
+// ======================================================================
+
+LoginRestoreCharacterMessage::LoginRestoreCharacterMessage(const std::string &whoRequested, const NetworkId &characterId, StationId account, const Unicode::String &characterName, int templateId, bool jedi) :
+		GameNetworkMessage("LoginRestoreCharacterMessage"),
+		m_whoRequested(whoRequested),
+		m_characterId(characterId),
+		m_account(account),
+		m_characterName(characterName),
+		m_templateId(templateId),
+		m_jedi(jedi)
+{
+	addVariable(m_whoRequested);
+	addVariable(m_characterId);
+	addVariable(m_account);
+	addVariable(m_characterName);
+	addVariable(m_templateId);
+	addVariable(m_jedi);
+}
+
+// ----------------------------------------------------------------------
+
+LoginRestoreCharacterMessage::LoginRestoreCharacterMessage (Archive::ReadIterator & source) :
+		GameNetworkMessage("LoginRestoreCharacterMessage"),
+		m_whoRequested(),
+		m_characterId(),
+		m_account(),
+		m_characterName(),
+		m_templateId(),
+		m_jedi()
+{
+	addVariable(m_whoRequested);
+	addVariable(m_characterId);
+	addVariable(m_account);
+	addVariable(m_characterName);
+	addVariable(m_templateId);
+	addVariable(m_jedi);
+
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+LoginRestoreCharacterMessage::~LoginRestoreCharacterMessage ()
+{
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginRestoreCharacterMessage.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginRestoreCharacterMessage.h
new file mode 100644
index 00000000..eda5b50d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginRestoreCharacterMessage.h
@@ -0,0 +1,98 @@
+// ======================================================================
+//
+// LoginRestoreCharacterMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_LoginRestoreCharacterMessage_H
+#define INCLUDED_LoginRestoreCharacterMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Sent From:  Central
+ * Sent To:    LoginServer
+ * Action:     Restore the specified character to the login database
+ */
+
+class LoginRestoreCharacterMessage : public GameNetworkMessage
+{
+  public:
+    LoginRestoreCharacterMessage (const std::string &whoRequested, const NetworkId &characterId, StationId account, const Unicode::String &characterName, int templateId, bool jedi);
+    LoginRestoreCharacterMessage (Archive::ReadIterator & source);
+    virtual ~LoginRestoreCharacterMessage ();
+
+  public:
+	const std::string &   getWhoRequested() const;
+	const NetworkId &     getCharacterId() const;
+	StationId             getAccount() const;
+	const Unicode::String getCharacterName() const;
+	int                   getTemplateId() const;
+	bool                  getJedi() const;
+  	
+  private:
+	Archive::AutoVariable<std::string>     m_whoRequested;
+	Archive::AutoVariable<NetworkId>       m_characterId;
+    Archive::AutoVariable<StationId>       m_account;
+	Archive::AutoVariable<Unicode::String> m_characterName;
+	Archive::AutoVariable<int>             m_templateId;
+	Archive::AutoVariable<bool>            m_jedi;
+  
+  private: // disable:
+    LoginRestoreCharacterMessage();
+    LoginRestoreCharacterMessage(const LoginRestoreCharacterMessage&);
+    LoginRestoreCharacterMessage& operator= (const LoginRestoreCharacterMessage&);
+
+};
+
+// ======================================================================
+
+inline const std::string & LoginRestoreCharacterMessage::getWhoRequested() const
+{
+	return m_whoRequested.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & LoginRestoreCharacterMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline StationId LoginRestoreCharacterMessage::getAccount() const
+{
+	return m_account.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String LoginRestoreCharacterMessage::getCharacterName() const
+{
+	return m_characterName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int LoginRestoreCharacterMessage::getTemplateId() const
+{
+	return m_templateId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool LoginRestoreCharacterMessage::getJedi() const
+{
+	return m_jedi.get();
+}
+ 
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginUpgradeAccountMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginUpgradeAccountMessage.cpp
new file mode 100644
index 00000000..282348e9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginUpgradeAccountMessage.cpp
@@ -0,0 +1,65 @@
+// ======================================================================
+//
+// LoginUpgradeAccountMessage.cpp
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/LoginUpgradeAccountMessage.h"
+
+// ======================================================================
+
+LoginUpgradeAccountMessage::LoginUpgradeAccountMessage (UpgradeType upgradeType, const StationId &stationId, const NetworkId &character, const NetworkId &replyToObject, const std::string &replyMessage, const std::string &packedMessageData, bool isAck) :
+		GameNetworkMessage("LoginUpgradeAccountMessage"),
+		m_upgradeType(static_cast<int>(upgradeType)),
+		m_stationId(stationId),
+		m_character(character),
+		m_replyToObject(replyToObject),
+		m_replyMessage(replyMessage),
+		m_packedMessageData(packedMessageData),
+		m_isAck(isAck)
+ 
+{
+	addVariable(m_upgradeType);
+	addVariable(m_stationId);
+	addVariable(m_character);
+	addVariable(m_replyToObject);
+	addVariable(m_replyMessage);
+	addVariable(m_packedMessageData);
+	addVariable(m_isAck);	
+ }
+
+// ----------------------------------------------------------------------
+
+LoginUpgradeAccountMessage::LoginUpgradeAccountMessage (Archive::ReadIterator & source) :
+		GameNetworkMessage("LoginUpgradeAccountMessage"),
+		m_upgradeType(),
+		m_stationId(),
+		m_character()
+{
+	addVariable(m_upgradeType);
+	addVariable(m_stationId);
+	addVariable(m_character);
+	addVariable(m_replyToObject);
+	addVariable(m_replyMessage);
+	addVariable(m_packedMessageData);
+	addVariable(m_isAck);	
+
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+LoginUpgradeAccountMessage::~LoginUpgradeAccountMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void LoginUpgradeAccountMessage::setAck()
+{
+	m_isAck.set(true);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginUpgradeAccountMessage.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginUpgradeAccountMessage.h
new file mode 100644
index 00000000..0b6bad4a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/LoginUpgradeAccountMessage.h
@@ -0,0 +1,120 @@
+// ======================================================================
+//
+// LoginUpgradeAccountMessage.h
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_LoginUpgradeAccountMessage_H
+#define INCLUDED_LoginUpgradeAccountMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Sent From:  GameServer
+ * Sent To:    LoginServer (via Central)
+ * Action:     Upgrade or adjust an account based on in-game player actions.
+ *
+ * Sent From:  LoginServer
+ * Sent To:    Central
+ * Action:     Acknowldege the upgrade.  isAck should be set to true.
+ */
+
+class LoginUpgradeAccountMessage : public GameNetworkMessage
+{
+  public:
+	enum UpgradeType {UT_addJedi, UT_setSpectral};
+	enum OccupyUnlockedSlotResponse {OUSR_success, OUSR_db_error, OUSR_account_has_no_unlocked_slot, OUSR_account_has_no_unoccupied_unlocked_slot, OUSR_cluster_already_has_unlocked_slot_character};
+	enum VacateUnlockedSlotResponse {VUSR_success, VUSR_db_error, VUSR_account_has_no_unlocked_slot, VUSR_not_unlocked_slot_character, VUSR_no_available_normal_character_slot};
+	enum SwapUnlockedSlotResponse   {SUSR_success, SUSR_db_error, SUSR_account_has_no_unlocked_slot, SUSR_not_unlocked_slot_character, SUSR_invalid_target_character, SUSR_target_character_already_unlocked_slot_character};
+
+  public:
+    LoginUpgradeAccountMessage (UpgradeType upgradeType, const StationId &stationId, const NetworkId &character, const NetworkId &replyToObject, const std::string &replyMessage, const std::string &packedMessageData, bool isAck);
+    LoginUpgradeAccountMessage (Archive::ReadIterator & source);
+    virtual ~LoginUpgradeAccountMessage ();
+
+  public:
+	UpgradeType         getUpgradeType() const;
+	StationId           getStationId() const;
+	const NetworkId &   getCharacter() const;
+	const NetworkId &   getReplyToObject() const;
+	const std::string & getReplyMessage() const;
+	const std::string & getPackedMessageData() const;
+	bool                getIsAck() const;
+
+	void                setAck();
+	
+  private:
+    Archive::AutoVariable<int> m_upgradeType;
+	Archive::AutoVariable<StationId> m_stationId;
+	Archive::AutoVariable<NetworkId> m_character;
+	Archive::AutoVariable<NetworkId> m_replyToObject;
+	Archive::AutoVariable<std::string> m_replyMessage;
+	Archive::AutoVariable<std::string> m_packedMessageData;
+	Archive::AutoVariable<bool> m_isAck;	
+  
+  private: // disable:
+    LoginUpgradeAccountMessage();
+    LoginUpgradeAccountMessage(const LoginUpgradeAccountMessage&);
+    LoginUpgradeAccountMessage& operator= (const LoginUpgradeAccountMessage&);
+};
+
+// ======================================================================
+
+inline LoginUpgradeAccountMessage::UpgradeType LoginUpgradeAccountMessage::getUpgradeType() const
+{
+	return static_cast<UpgradeType>(m_upgradeType.get());
+}
+
+// ----------------------------------------------------------------------
+
+
+inline StationId LoginUpgradeAccountMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & LoginUpgradeAccountMessage::getCharacter() const
+{
+	return m_character.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & LoginUpgradeAccountMessage::getReplyToObject() const
+{
+	return m_replyToObject.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string & LoginUpgradeAccountMessage::getReplyMessage() const
+{
+	return m_replyMessage.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string & LoginUpgradeAccountMessage::getPackedMessageData() const
+{
+	return m_packedMessageData.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool LoginUpgradeAccountMessage::getIsAck() const
+{
+	return m_isAck.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ServerDeleteCharacterMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ServerDeleteCharacterMessage.cpp
new file mode 100644
index 00000000..b135ebf9
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ServerDeleteCharacterMessage.cpp
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// ServerDeleteCharacterMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ServerDeleteCharacterMessage.h"
+
+// ======================================================================
+
+ServerDeleteCharacterMessage::ServerDeleteCharacterMessage (StationId stationId, const NetworkId &characterId, uint32 loginServerId) :
+		GameNetworkMessage("ServerDeleteCharacterMessage"),
+		m_stationId(stationId),
+		m_characterId(characterId),
+		m_loginServerId(loginServerId)
+{
+	addVariable(m_stationId);
+	addVariable(m_characterId);
+	addVariable(m_loginServerId);
+}
+
+// ----------------------------------------------------------------------
+
+ServerDeleteCharacterMessage::ServerDeleteCharacterMessage (Archive::ReadIterator & source) :
+		GameNetworkMessage("ServerDeleteCharacterMessage"),
+		m_stationId(),
+		m_characterId(),
+		m_loginServerId()
+{
+	addVariable(m_stationId);
+	addVariable(m_characterId);
+	addVariable(m_loginServerId);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ ServerDeleteCharacterMessage::~ServerDeleteCharacterMessage ()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void ServerDeleteCharacterMessage::setLoginServerId (uint32 loginServerId) 
+{
+	m_loginServerId.set(loginServerId);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ServerDeleteCharacterMessage.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ServerDeleteCharacterMessage.h
new file mode 100644
index 00000000..209857e7
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ServerDeleteCharacterMessage.h
@@ -0,0 +1,75 @@
+// ======================================================================
+//
+// ServerDeleteCharacterMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ServerDeleteCharacterMessage_H
+#define INCLUDED_ServerDeleteCharacterMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Sent From:  Login Server
+ * Sent To:    Central, which forwards to DBProcess
+ * Action:     Verify that the specified character belongs to the specified
+ *             account, then delete the character
+ */
+
+class ServerDeleteCharacterMessage : public GameNetworkMessage
+{
+  public:
+    ServerDeleteCharacterMessage (StationId stationId, const NetworkId &characterId, uint32 loginServerId);
+    ServerDeleteCharacterMessage (Archive::ReadIterator & source);
+    virtual ~ServerDeleteCharacterMessage ();
+
+  public:
+	void                    setLoginServerId (uint32 loginServerId);
+	StationId               getStationId     () const;
+    const NetworkId &       getCharacterId   () const;
+	uint32                  getLoginServerId () const;
+
+  private:
+    Archive::AutoVariable<StationId> m_stationId;
+    Archive::AutoVariable<NetworkId> m_characterId;
+	Archive::AutoVariable<uint32>    m_loginServerId;
+
+  private: // disable:
+    ServerDeleteCharacterMessage();
+    ServerDeleteCharacterMessage(const ServerDeleteCharacterMessage&);
+    ServerDeleteCharacterMessage& operator= (const ServerDeleteCharacterMessage&);
+
+};
+
+// ======================================================================
+
+inline StationId ServerDeleteCharacterMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & ServerDeleteCharacterMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 ServerDeleteCharacterMessage::getLoginServerId () const
+{
+	DEBUG_FATAL(m_loginServerId.get() == 0,("Programmer bug:  Login Server Id was not set in ServerDeleteCharacterMessage.  (It should be set when Central forwards the message.)\n"));
+	return m_loginServerId.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/UpdateLoginConnectionServerStatus.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/UpdateLoginConnectionServerStatus.cpp
new file mode 100644
index 00000000..b79dab67
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/UpdateLoginConnectionServerStatus.cpp
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// UpdateLoginConnectionServerStatus.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/UpdateLoginConnectionServerStatus.h"
+
+// ======================================================================
+
+UpdateLoginConnectionServerStatus::UpdateLoginConnectionServerStatus(int id, uint16 publicPort, uint16 privatePort, int playerCount) :
+		GameNetworkMessage("UpdateLoginConnectionServerStatus"),
+		m_id(id),
+		m_publicPort(publicPort),
+		m_privatePort(privatePort),
+		m_playerCount(playerCount)
+{
+	addVariable(m_id);
+	addVariable(m_publicPort);
+	addVariable(m_privatePort);
+	addVariable(m_playerCount);
+}
+
+// ----------------------------------------------------------------------
+
+UpdateLoginConnectionServerStatus::UpdateLoginConnectionServerStatus(Archive::ReadIterator & source) :
+		GameNetworkMessage("UpdateLoginConnectionServerStatus"),
+		m_id(0),
+		m_publicPort(0),
+		m_privatePort(0),
+		m_playerCount(0)
+{
+	addVariable(m_id);
+	addVariable(m_publicPort);
+	addVariable(m_privatePort);
+	addVariable(m_playerCount);	
+	unpack(source);
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/UpdateLoginConnectionServerStatus.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/UpdateLoginConnectionServerStatus.h
new file mode 100644
index 00000000..1aae0f3b
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/UpdateLoginConnectionServerStatus.h
@@ -0,0 +1,71 @@
+// ======================================================================
+//
+// UpdateLoginConnectionServerStatus.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_UpdateLoginConnectionServerStatus_H
+#define INCLUDED_UpdateLoginConnectionServerStatus_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * Sent from:  Connection Server
+ * Sent to:  Central
+ * Action:  Reports the number of players connected to that ConnectionServer
+ */
+class UpdateLoginConnectionServerStatus : public GameNetworkMessage
+{
+  public:
+	UpdateLoginConnectionServerStatus(int id, uint16 publicPort, uint16 privatePort, int playerCount);
+	UpdateLoginConnectionServerStatus(Archive::ReadIterator & source);
+
+  public:
+	int    getId() const;
+	uint16 getPublicPort() const;
+	uint16 getPrivatePort() const;
+	int    getPlayerCount() const;
+	
+  private:
+	Archive::AutoVariable<int> m_id;
+	Archive::AutoVariable<uint16> m_publicPort;
+	Archive::AutoVariable<uint16> m_privatePort;
+	Archive::AutoVariable<int>    m_playerCount;
+};
+
+// ======================================================================
+inline int UpdateLoginConnectionServerStatus::getId() const
+{
+	return m_id.get();
+}
+
+//----------------------------------------------------------------------
+
+inline uint16 UpdateLoginConnectionServerStatus::getPublicPort() const
+{
+	return m_publicPort.get();
+}
+
+//----------------------------------------------------------------------
+
+inline uint16 UpdateLoginConnectionServerStatus::getPrivatePort() const
+{
+	return m_privatePort.get();
+}
+
+//----------------------------------------------------------------------
+
+inline int UpdateLoginConnectionServerStatus::getPlayerCount() const
+{
+	return m_playerCount.get();
+}
+
+// ======================================================================
+
+#endif
+ 
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountMessage.cpp
new file mode 100644
index 00000000..1ed20367
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountMessage.cpp
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// ValidateAccountMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ValidateAccountMessage.h"
+
+// ======================================================================
+
+ValidateAccountMessage::ValidateAccountMessage (StationId stationId, unsigned int track, uint32 subscriptionBits) :
+	GameNetworkMessage("ValidateAccountMessage"),
+	m_stationId(stationId),
+	m_track(track),
+	m_subscriptionBits(subscriptionBits)
+{
+	addVariable(m_stationId);
+	addVariable(m_track);
+	addVariable(m_subscriptionBits);
+}
+
+// ----------------------------------------------------------------------
+
+ValidateAccountMessage::ValidateAccountMessage (Archive::ReadIterator & source) :
+	GameNetworkMessage("ValidateAccountMessage"),
+	m_stationId(),
+	m_track(),
+	m_subscriptionBits()
+{
+	addVariable(m_stationId);
+	addVariable(m_track);
+	addVariable(m_subscriptionBits);
+
+	AutoByteStream::unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ValidateAccountMessage::~ValidateAccountMessage ()
+{
+}
+
+// ----------------------------------------------------------------------
+
+unsigned int ValidateAccountMessage::getTrack() const
+{
+	return m_track.get();
+}
+
+// ----------------------------------------------------------------------
+
+uint32 ValidateAccountMessage::getSubscriptionBits() const
+{
+	return m_subscriptionBits.get();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountMessage.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountMessage.h
new file mode 100644
index 00000000..573fb837
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountMessage.h
@@ -0,0 +1,62 @@
+// ======================================================================
+//
+// ValidateAccountMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ValidateAccountMessage_H
+#define INCLUDED_ValidateAccountMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Sent From:  Connection Server
+ * Sent To:    Central
+ * Action:     Do whatever validation Central can, then forward to LoginServer.
+ *
+ * Sent From:  Central
+ * Sent To:    LoginServer
+ * Action:     Check the permissions for the account (can create characters, etc.)
+ *             Reply with ValidateAccountReplyMessage
+ */
+
+class ValidateAccountMessage : public GameNetworkMessage
+{
+public:
+	ValidateAccountMessage (StationId stationId, unsigned int track, uint32 subscriptionBits);
+	ValidateAccountMessage (Archive::ReadIterator & source);
+	virtual ~ValidateAccountMessage ();
+	
+public:
+	StationId     getStationId() const;
+	unsigned int  getTrack() const;
+	uint32        getSubscriptionBits() const;
+
+private:
+	Archive::AutoVariable<StationId>     m_stationId;
+	Archive::AutoVariable<unsigned int>  m_track;
+	Archive::AutoVariable<uint32>        m_subscriptionBits;
+
+private: // disable:
+	ValidateAccountMessage();
+	ValidateAccountMessage(const ValidateAccountMessage&);
+	ValidateAccountMessage& operator= (const ValidateAccountMessage&);
+
+};
+
+// ======================================================================
+
+inline StationId ValidateAccountMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountReplyMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountReplyMessage.cpp
new file mode 100644
index 00000000..3f63b398
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountReplyMessage.cpp
@@ -0,0 +1,123 @@
+// ======================================================================
+//
+// ValidateAccountReplyMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/ValidateAccountReplyMessage.h"
+
+// ======================================================================
+
+ValidateAccountReplyMessage::ValidateAccountReplyMessage (StationId stationId, bool canLogin, bool canCreateRegular, bool canCreateJedi, bool canSkipTutorial, unsigned int track, std::vector<std::pair<NetworkId, std::string> > const & consumedRewardEvents, std::vector<std::pair<NetworkId, std::string> > const & claimedRewardItems) :
+GameNetworkMessage("ValidateAccountReplyMessage"),
+m_stationId(stationId),
+m_canLogin(canLogin),
+m_canCreateRegular(canCreateRegular),
+m_canCreateJedi(canCreateJedi),
+m_canSkipTutorial(canSkipTutorial),
+m_track(track),
+m_consumedRewardEvents(),
+m_claimedRewardItems()
+{
+	m_consumedRewardEvents.set(consumedRewardEvents);
+	m_claimedRewardItems.set(claimedRewardItems);
+	
+	addVariable(m_stationId);
+	addVariable(m_canLogin);
+	addVariable(m_canCreateRegular);
+	addVariable(m_canCreateJedi);
+	addVariable(m_canSkipTutorial);
+	addVariable(m_track);
+	addVariable(m_consumedRewardEvents);
+	addVariable(m_claimedRewardItems);
+}
+
+// ----------------------------------------------------------------------
+
+ValidateAccountReplyMessage::ValidateAccountReplyMessage (Archive::ReadIterator & source) :
+GameNetworkMessage("ValidateAccountReplyMessage"),
+m_stationId(),
+m_canLogin(),
+m_canCreateRegular(),
+m_canCreateJedi(),
+m_canSkipTutorial(),
+m_track(),
+m_consumedRewardEvents(),
+m_claimedRewardItems()
+{
+	addVariable(m_stationId);
+	addVariable(m_canLogin);
+	addVariable(m_canCreateRegular);
+	addVariable(m_canCreateJedi);
+	addVariable(m_canSkipTutorial);
+	addVariable(m_track);
+	addVariable(m_consumedRewardEvents);
+	addVariable(m_claimedRewardItems);
+	AutoByteStream::unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ValidateAccountReplyMessage::~ValidateAccountReplyMessage ()
+{
+}
+
+// ----------------------------------------------------------------------
+
+unsigned int ValidateAccountReplyMessage::getTrack() const
+{
+	return m_track.get();
+}
+
+// ----------------------------------------------------------------------
+
+StationId ValidateAccountReplyMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool ValidateAccountReplyMessage::getCanLogin() const
+{
+	return m_canLogin.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool ValidateAccountReplyMessage::getCanCreateRegular() const
+{
+	return m_canCreateRegular.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool ValidateAccountReplyMessage::getCanCreateJedi() const
+{
+	return m_canCreateJedi.get();
+}
+
+// ----------------------------------------------------------------------
+
+bool ValidateAccountReplyMessage::getCanSkipTutorial() const
+{
+	return m_canSkipTutorial.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<std::pair<NetworkId, std::string> > const & ValidateAccountReplyMessage::getConsumedRewardEvents() const
+{
+	return m_consumedRewardEvents.get();
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<std::pair<NetworkId, std::string> > const & ValidateAccountReplyMessage::getClaimedRewardItems() const
+{
+	return m_claimedRewardItems.get();
+}
+
+// ======================================================================
diff --git a/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountReplyMessage.h b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountReplyMessage.h
new file mode 100644
index 00000000..014e48d7
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/loginCentralServer/ValidateAccountReplyMessage.h
@@ -0,0 +1,65 @@
+// ======================================================================
+//
+// ValidateAccountReplyMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ValidateAccountReplyMessage_H
+#define INCLUDED_ValidateAccountReplyMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/StationId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Sent From:  Connection Server
+ * Sent To:    Central
+ * Action:     Do whatever validation Central can, then forward to LoginServer.
+ *
+ * Sent From:  Central
+ * Sent To:    LoginServer
+ * Action:     Check the permissions for the account (can create characters, etc.)
+ *             Reply with ValidateAccountReplyMessage
+ */
+
+class ValidateAccountReplyMessage : public GameNetworkMessage
+{
+  public:
+    ValidateAccountReplyMessage (StationId stationId, bool canLogin, bool canCreateRegular, bool canCreateJedi, bool canSkipTutorial, unsigned int track, std::vector<std::pair<NetworkId, std::string> > const & consumedRewardEvents, std::vector<std::pair<NetworkId, std::string> > const & claimedRewardItems);
+    ValidateAccountReplyMessage (Archive::ReadIterator & source);
+    virtual ~ValidateAccountReplyMessage ();
+
+  public:
+	StationId     getStationId         () const;
+	bool          getCanLogin          () const;
+	bool          getCanCreateRegular  () const;
+	bool          getCanCreateJedi     () const;
+	bool          getCanSkipTutorial   () const;
+	unsigned int  getTrack             () const;
+	std::vector<std::pair<NetworkId, std::string> > const & getConsumedRewardEvents() const;
+	std::vector<std::pair<NetworkId, std::string> > const & getClaimedRewardItems() const;
+	
+  private:
+    Archive::AutoVariable<StationId> m_stationId;
+    Archive::AutoVariable<bool> m_canLogin;
+	Archive::AutoVariable<bool> m_canCreateRegular;
+	Archive::AutoVariable<bool> m_canCreateJedi;
+	Archive::AutoVariable<bool> m_canSkipTutorial;
+	Archive::AutoVariable<unsigned int> m_track;
+	Archive::AutoArray<std::pair<NetworkId, std::string> > m_consumedRewardEvents;
+	Archive::AutoArray<std::pair<NetworkId, std::string> > m_claimedRewardItems;
+
+  private: // disable:
+    ValidateAccountReplyMessage();
+    ValidateAccountReplyMessage(const ValidateAccountReplyMessage&);
+    ValidateAccountReplyMessage& operator= (const ValidateAccountReplyMessage&);
+
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsDataMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsDataMessage.cpp
new file mode 100644
index 00000000..52d84fe2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsDataMessage.cpp
@@ -0,0 +1,55 @@
+// MetricsDataMessage.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "MetricsDataMessage.h"
+
+
+//-----------------------------------------------------------------------
+
+
+MetricsDataMessage::MetricsDataMessage() :
+		GameNetworkMessage("MetricsDataMessage")
+{
+	addVariable(m_data);
+}
+
+//-----------------------------------------------------------------------
+MetricsDataMessage::MetricsDataMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("MetricsDataMessage")
+{
+	addVariable(m_data);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+MetricsDataMessage::~MetricsDataMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get(ReadIterator & source, MetricsPair &c)
+	{
+		get(source,c.m_label);
+		get(source,c.m_value);
+		get(source,c.m_description);
+		get(source,c.m_persistData);
+		get(source,c.m_summary);
+	}
+
+	void put(ByteStream & target, const MetricsPair &c)
+	{
+		put(target,c.m_label);
+		put(target,c.m_value);
+		put(target,c.m_description);
+		put(target,c.m_persistData);
+		put(target,c.m_summary);
+	}
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsDataMessage.h b/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsDataMessage.h
new file mode 100644
index 00000000..7d985867
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsDataMessage.h
@@ -0,0 +1,85 @@
+// MetricsDataMessage.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+
+#ifndef	_INCLUDED_MetricsDataMessage_H
+#define	_INCLUDED_MetricsDataMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+struct MetricsPair
+{
+	std::string  m_label;
+	int          m_value;
+	std::string  m_description;
+	bool         m_persistData;
+	bool         m_summary;
+};
+
+//-----------------------------------------------------------------------
+
+class MetricsDataMessage : public GameNetworkMessage
+{
+public:
+	MetricsDataMessage();
+	explicit MetricsDataMessage(Archive::ReadIterator & source);
+	~MetricsDataMessage();
+	
+	const std::vector<MetricsPair> & getData () const;
+	void                             setData (const std::vector<MetricsPair>&);
+	
+private:
+	MetricsDataMessage & operator = (const MetricsDataMessage & rhs);
+	MetricsDataMessage(const MetricsDataMessage & source);
+
+	Archive::AutoArray<MetricsPair> m_data;
+};
+
+//-----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get(ReadIterator & source, MetricsPair &c);
+	void put(ByteStream & target, const MetricsPair &c);
+}
+
+//-----------------------------------------------------------------------
+inline const std::vector<MetricsPair> & MetricsDataMessage::getData () const 
+{
+	return m_data.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void MetricsDataMessage::setData(const std::vector<MetricsPair>& data)
+{
+	m_data.set(data);
+}
+
+//-----------------------------------------------------------------------
+
+#ifndef ADD_METRICS_DATA
+
+#define ADD_METRICS_DATA(label, defaultValue, persistData)   \
+p.m_label = #label; \
+p.m_value = defaultValue; \
+p.m_description = ""; \
+p.m_persistData = persistData; \
+p.m_summary = false; \
+m_ ## label = m_data.size(); \
+m_data.push_back(p);
+
+#endif //ADD_METRICS_DATA
+
+
+//-----------------------------------------------------------------------
+
+
+
+
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsInitiationMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsInitiationMessage.cpp
new file mode 100644
index 00000000..99180101
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsInitiationMessage.cpp
@@ -0,0 +1,47 @@
+// MetricsInitiationMessage.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "MetricsInitiationMessage.h"
+
+
+//-----------------------------------------------------------------------
+
+
+MetricsInitiationMessage::MetricsInitiationMessage(bool isDynamic, const std::string & primaryName,const std::string & secondaryName, const int index) :
+		GameNetworkMessage("MetricsInitiationMessage"),
+		m_isDynamic(isDynamic),
+		m_primaryName(primaryName),
+		m_secondaryName(secondaryName),
+		m_index(index)
+{
+	addVariable(m_isDynamic);
+	addVariable(m_primaryName);
+	addVariable(m_secondaryName);
+	addVariable(m_index);
+}
+
+//-----------------------------------------------------------------------
+MetricsInitiationMessage::MetricsInitiationMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("MetricsInitiationMessage"),
+		m_isDynamic(false),
+		m_primaryName(),
+		m_secondaryName(),
+		m_index()
+{
+	addVariable(m_isDynamic);
+	addVariable(m_primaryName);
+	addVariable(m_secondaryName);
+	addVariable(m_index);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+MetricsInitiationMessage::~MetricsInitiationMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsInitiationMessage.h b/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsInitiationMessage.h
new file mode 100644
index 00000000..e84aca8f
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/metricsMessages/MetricsInitiationMessage.h
@@ -0,0 +1,63 @@
+// MetricsInititaionMessage.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+
+#ifndef	_INCLUDED_MetricsInitiationMessage_H
+#define	_INCLUDED_MetricsInitiationMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class MetricsInitiationMessage : public GameNetworkMessage
+{
+public:
+	MetricsInitiationMessage(bool isDynamic, const std::string & primaryName,const std::string & secondaryName, const int index);
+	explicit MetricsInitiationMessage(Archive::ReadIterator & source);
+	~MetricsInitiationMessage();
+
+	bool                getIsDynamic() const;
+	const std::string & getPrimaryName() const;
+	const std::string & getSecondaryName() const;
+	const int           getIndex() const;
+
+private:
+	MetricsInitiationMessage & operator = (const MetricsInitiationMessage & rhs);
+	MetricsInitiationMessage(const MetricsInitiationMessage & source);
+
+	Archive::AutoVariable<bool>        m_isDynamic;
+	Archive::AutoVariable<std::string> m_primaryName;
+	Archive::AutoVariable<std::string> m_secondaryName;
+	Archive::AutoVariable<int>         m_index;
+};
+
+//-----------------------------------------------------------------------
+
+inline bool MetricsInitiationMessage::getIsDynamic() const
+{
+	return m_isDynamic.get();
+}
+
+//-----------------------------------------------------------------------
+inline const std::string & MetricsInitiationMessage::getPrimaryName() const
+{
+	return m_primaryName.get();
+}
+//-----------------------------------------------------------------------
+inline const std::string & MetricsInitiationMessage::getSecondaryName() const
+{
+	return m_secondaryName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const int MetricsInitiationMessage::getIndex() const
+{
+	return m_index.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountData.cpp b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountData.cpp
new file mode 100644
index 00000000..c926e962
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountData.cpp
@@ -0,0 +1,167 @@
+// ======================================================================
+//
+// TransferAccountData.cpp
+// copyright (c) 2001-2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/TransferAccountData.h"
+#include "Unicode.h"
+#include "UnicodeUtils.h"
+
+//-----------------------------------------------------------------------
+
+TransferAccountData::TransferAccountData(const TransferAccountData & rhs) :
+m_track(rhs.m_track),
+m_sourceStationId(rhs.m_sourceStationId),
+m_destinationStationId(rhs.m_destinationStationId),
+m_transactionId(rhs.m_transactionId),
+m_startGalaxy(rhs.m_startGalaxy),
+m_destinationHasAvatars(rhs.m_destinationHasAvatars),
+m_sourceAvatarData(rhs.m_sourceAvatarData)
+{
+}
+
+//-----------------------------------------------------------------------
+
+TransferAccountData::TransferAccountData() :
+m_track(0),
+m_sourceStationId(0),
+m_destinationStationId(0),
+m_transactionId(0),
+m_startGalaxy(),
+m_destinationHasAvatars(),
+m_sourceAvatarData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+TransferAccountData::~TransferAccountData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferAccountData::getTrack() const
+{
+	return m_track;
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferAccountData::getSourceStationId() const
+{
+	return m_sourceStationId;
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferAccountData::getDestinationStationId() const
+{
+	return m_destinationStationId;
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferAccountData::getTransactionId() const
+{
+	return m_transactionId;
+}
+
+//-----------------------------------------------------------------------
+
+const std::vector<AvatarData> & TransferAccountData::getSourceAvatarData() const
+{
+	return m_sourceAvatarData;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferAccountData::getStartGalaxy() const
+{
+	return m_startGalaxy;
+}
+
+//-----------------------------------------------------------------------
+
+bool TransferAccountData::getDestinationHasAvatars() const
+{
+	return m_destinationHasAvatars;
+}
+
+//-----------------------------------------------------------------------
+
+std::string TransferAccountData::toString() const
+{
+	char buf[64] = {"\0"};
+
+	std::string result;
+
+	result += "startGalaxy: ";
+	result += getStartGalaxy();
+
+	result += " | sourceStationId: ";
+	memset(buf, 0, sizeof(buf));
+	snprintf(buf, sizeof(buf) - 1, "%d", getSourceStationId());
+	result += buf;
+
+	result += " | destinationStationId: ";
+	memset(buf, 0, sizeof(buf));
+	snprintf(buf, sizeof(buf) - 1, "%d", getDestinationStationId());
+	result += buf;
+
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferAccountData::setDestinationStationId(const unsigned int destinationStationId)
+{
+	m_destinationStationId = destinationStationId;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferAccountData::setSourceStationId(const unsigned int sourceStationId)
+{
+	m_sourceStationId = sourceStationId;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferAccountData::setTrack(const unsigned int track)
+{
+	m_track = track;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferAccountData::setTransactionId(const unsigned int transactionId)
+{
+	m_transactionId = transactionId;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferAccountData::setSourceAvatarData(const std::vector<AvatarData> & avatarData)
+{
+	m_sourceAvatarData = avatarData;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferAccountData::setStartGalaxy(const std::string & galaxy)
+{
+	m_startGalaxy = galaxy;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferAccountData::setDestinationHasAvatars(const bool avatars)
+{
+	m_destinationHasAvatars = avatars;
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountData.h b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountData.h
new file mode 100644
index 00000000..03cf11d5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountData.h
@@ -0,0 +1,63 @@
+// TransferAccountData.h
+// Copyright 2000-05, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Vijay Thakkar
+
+#ifndef	_INCLUDED_TransferAccountData_H
+#define	_INCLUDED_TransferAccountData_H
+
+//-----------------------------------------------------------------------
+#include "sharedFoundation/StationId.h"
+#include <string>
+//-----------------------------------------------------------------------
+
+typedef std::pair<std::string, std::string> AvatarData;
+
+class TransferAccountData;
+
+namespace Archive
+{
+	class ReadIterator;
+	void get(ReadIterator & source, TransferAccountData & target);
+}
+
+class TransferAccountData
+{
+public:
+	TransferAccountData(const TransferAccountData & rhs);
+	TransferAccountData();
+
+	~TransferAccountData();
+
+	unsigned int                              getDestinationStationId       () const;
+	unsigned int                              getSourceStationId            () const;
+	unsigned int                              getTrack                      () const;
+	unsigned int                              getTransactionId              () const;
+	const std::string &                       getStartGalaxy                () const;
+	bool                                      getDestinationHasAvatars      () const;
+	const std::vector<AvatarData> &           getSourceAvatarData           () const;
+	std::string                               toString                      () const;
+
+	void                                      setDestinationStationId       (const unsigned int destinationStationId);
+	void                                      setSourceStationId            (const unsigned int sourceStationId);
+	void                                      setTrack                      (const unsigned int track);
+	void                                      setTransactionId              (const unsigned int transactionId);
+	void                                      setStartGalaxy                (const std::string & galaxy);
+	void                                      setDestinationHasAvatars      (const bool avatars);
+	void                                      setSourceAvatarData           (const std::vector<AvatarData> & avatarData);
+
+private:
+	friend void Archive::get(Archive::ReadIterator & source, TransferAccountData & target);
+
+	unsigned int                        m_track;
+	StationId                           m_sourceStationId;
+	StationId                           m_destinationStationId;
+	unsigned int                        m_transactionId;
+	std::string                         m_startGalaxy;
+	bool                                m_destinationHasAvatars;
+	// avatarData elements: < clusterName, avatarName >
+	std::vector<AvatarData>             m_sourceAvatarData;
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_TransferAccountData_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountDataArchive.cpp b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountDataArchive.cpp
new file mode 100644
index 00000000..f8d8d0b2
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountDataArchive.cpp
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// TransferAccountDataArchive.cpp
+// copyright (c) 2001-2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/TransferAccountDataArchive.h"
+#include "serverNetworkMessages/TransferAccountData.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "Archive/Archive.h"
+
+namespace Archive
+{
+	void get(ReadIterator & source, TransferAccountData & target)
+	{
+		get(source, target.m_destinationStationId);
+		get(source, target.m_sourceStationId);
+		get(source, target.m_track);
+		get(source, target.m_transactionId);
+		get(source, target.m_destinationHasAvatars);
+		get(source, target.m_sourceAvatarData);
+		get(source, target.m_startGalaxy);
+	}
+
+	void put(ByteStream & target, const TransferAccountData & source)
+	{
+		put(target, source.getDestinationStationId());
+		put(target, source.getSourceStationId());
+		put(target, source.getTrack());
+		put(target, source.getTransactionId());
+		put(target, source.getDestinationHasAvatars());
+		put(target, source.getSourceAvatarData());
+		put(target, source.getStartGalaxy());
+	}
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountDataArchive.h b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountDataArchive.h
new file mode 100644
index 00000000..6cceb6e1
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferAccountDataArchive.h
@@ -0,0 +1,31 @@
+// ======================================================================
+//
+// TransferAccountDataArchive.h
+// copyright (c) 2001-2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _TransferAccountDataArchive_H
+#define _TransferAccountDataArchive_H
+
+//-----------------------------------------------------------------------
+
+class TransferAccountData;
+
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+}
+
+//-----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, TransferAccountData & target);
+	void put (ByteStream & target, const TransferAccountData & source);
+}
+
+//-----------------------------------------------------------------------
+
+#endif//_TransferAccountDataArchive_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterData.cpp b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterData.cpp
new file mode 100644
index 00000000..cccad1e5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterData.cpp
@@ -0,0 +1,761 @@
+// ======================================================================
+//
+// TransferCharacterData.cpp
+// copyright (c) 2001-2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/TransferCharacterData.h"
+#include "Unicode.h"
+#include "UnicodeUtils.h"
+
+//-----------------------------------------------------------------------
+
+TransferCharacterData::TransferCharacterData(const TransferCharacterData & rhs) :
+m_track(rhs.m_track),
+m_customerLocalizedLanguage(rhs.m_customerLocalizedLanguage),
+m_sourceGalaxy(rhs.m_sourceGalaxy),
+m_destinationGalaxy(rhs.m_destinationGalaxy),
+m_sourceCharacterName(rhs.m_sourceCharacterName),
+m_destinationCharacterName(rhs.m_destinationCharacterName),
+m_sourceStationId(rhs.m_sourceStationId),
+m_destinationStationId(rhs.m_destinationStationId),
+m_transactionId(rhs.m_transactionId),
+m_characterId(rhs.m_characterId),
+m_destinationCharacterId(rhs.m_destinationCharacterId),
+m_containerId(rhs.m_containerId),
+m_scene(rhs.m_scene),
+m_startingCoordinates(rhs.m_startingCoordinates),
+m_customizationData(rhs.m_customizationData),
+m_scriptDictionaryData(rhs.m_scriptDictionaryData),
+m_objectTemplateName(rhs.m_objectTemplateName),
+m_objectTemplateCrc(rhs.m_objectTemplateCrc),
+m_scaleFactor(rhs.m_scaleFactor),
+m_hairTemplateName(rhs.m_hairTemplateName),
+m_hairAppearanceData(rhs.m_hairAppearanceData),
+m_profession(rhs.m_profession),
+m_biography(rhs.m_biography),
+m_isValidName(rhs.m_isValidName),
+m_isMoveRequest(rhs.m_isMoveRequest),
+m_withItems(rhs.m_withItems),
+m_resultDescription(rhs.m_resultDescription),
+m_allowOverride(rhs.m_allowOverride),
+m_skillTemplate(rhs.m_skillTemplate),
+m_workingSkill(rhs.m_workingSkill),
+m_transferRequestSource(rhs.m_transferRequestSource),
+m_csToolId(rhs.m_csToolId)
+{
+}
+
+//-----------------------------------------------------------------------
+
+TransferCharacterData::TransferCharacterData(TransferRequestMoveValidation::TransferRequestSource transferRequestSource) :
+m_track(0),
+m_customerLocalizedLanguage(),
+m_sourceGalaxy(),
+m_destinationGalaxy(),
+m_sourceCharacterName(),
+m_destinationCharacterName(),
+m_sourceStationId(0),
+m_destinationStationId(0),
+m_transactionId(0),
+m_characterId(NetworkId::cms_invalid),
+m_destinationCharacterId(NetworkId::cms_invalid),
+m_containerId(NetworkId::cms_invalid),
+m_scene(),
+m_startingCoordinates(),
+m_customizationData(),
+m_scriptDictionaryData(),
+m_objectTemplateName(),
+m_objectTemplateCrc(0),
+m_scaleFactor(1.0f),
+m_hairTemplateName(),
+m_hairAppearanceData(),
+m_profession(),
+m_biography(),
+m_isValidName(false),
+m_isMoveRequest(false),
+m_withItems(false),
+m_resultDescription(),
+m_allowOverride(false),
+m_skillTemplate(),
+m_workingSkill(),
+m_transferRequestSource(transferRequestSource),
+m_csToolId(0)
+{
+}
+
+//-----------------------------------------------------------------------
+
+TransferCharacterData::TransferCharacterData() :
+m_track(0),
+m_customerLocalizedLanguage(),
+m_sourceGalaxy(),
+m_destinationGalaxy(),
+m_sourceCharacterName(),
+m_destinationCharacterName(),
+m_sourceStationId(0),
+m_destinationStationId(0),
+m_transactionId(0),
+m_characterId(NetworkId::cms_invalid),
+m_destinationCharacterId(NetworkId::cms_invalid),
+m_containerId(NetworkId::cms_invalid),
+m_scene(),
+m_startingCoordinates(),
+m_customizationData(),
+m_scriptDictionaryData(),
+m_objectTemplateName(),
+m_objectTemplateCrc(0),
+m_scaleFactor(1.0f),
+m_hairTemplateName(),
+m_hairAppearanceData(),
+m_profession(),
+m_biography(),
+m_isValidName(false),
+m_isMoveRequest(false),
+m_withItems(false),
+m_resultDescription(),
+m_allowOverride(false),
+m_skillTemplate(),
+m_workingSkill(),
+m_transferRequestSource(TransferRequestMoveValidation::TRS_transfer_server),
+m_csToolId(0)
+{
+}
+
+//-----------------------------------------------------------------------
+
+TransferCharacterData::~TransferCharacterData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId & TransferCharacterData::getCharacterId() const
+{
+	return m_characterId;
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId & TransferCharacterData::getContainerId() const
+{
+	return m_containerId;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getScene() const
+{
+	return m_scene;
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferCharacterData::getTrack() const
+{
+	return m_track;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getCustomerLocalizedLanguage() const
+{
+	return m_customerLocalizedLanguage;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getSourceGalaxy() const
+{
+	return m_sourceGalaxy;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getDestinationGalaxy() const
+{
+	return m_destinationGalaxy;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getSourceCharacterName() const
+{
+	return m_sourceCharacterName;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getDestinationCharacterName() const
+{
+	return m_destinationCharacterName;
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferCharacterData::getSourceStationId() const
+{
+	return m_sourceStationId;
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferCharacterData::getDestinationStationId() const
+{
+	return m_destinationStationId;
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferCharacterData::getTransactionId() const
+{
+	return m_transactionId;
+}
+
+//-----------------------------------------------------------------------
+
+const Vector & TransferCharacterData::getStartingCoordinates() const
+{
+	return m_startingCoordinates;
+}
+	
+//-----------------------------------------------------------------------
+
+bool TransferCharacterData::getAllowOverride() const
+{
+	return m_allowOverride;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getSkillTemplate() const
+{
+	return m_skillTemplate;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getWorkingSkill() const
+{
+	return m_workingSkill;
+}
+
+//-----------------------------------------------------------------------
+
+TransferRequestMoveValidation::TransferRequestSource TransferCharacterData::getTransferRequestSource() const
+{
+	return m_transferRequestSource;
+}
+
+//-----------------------------------------------------------------------
+
+std::string TransferCharacterData::toString() const
+{
+	char buf[64] = {"\0"};
+
+	std::string result;
+
+	result += " transactionId=";
+	memset(buf, 0, sizeof(buf));
+	snprintf(buf, sizeof(buf) - 1, "%d", getTransactionId());
+	result += buf;
+
+	result += " track=";
+	memset(buf, 0, sizeof(buf));
+	snprintf(buf, sizeof(buf) - 1, "%d", getTrack());
+	result += buf;
+
+	TransferRequestMoveValidation::TransferRequestSource const transferRequestSource = getTransferRequestSource();
+	if (transferRequestSource == TransferRequestMoveValidation::TRS_transfer_server)
+	{
+		result += " requestSource=TransferServer";
+	}
+	else if (transferRequestSource == TransferRequestMoveValidation::TRS_console_god_command)
+	{
+		result += " requestSource=GameServer_console_command";
+	}
+	else if (transferRequestSource == TransferRequestMoveValidation::TRS_ingame_freects_command_validate)
+	{
+		result += " requestSource=GameServer_freects_command_validate";
+	}
+	else if (transferRequestSource == TransferRequestMoveValidation::TRS_ingame_freects_command_transfer)
+	{
+		result += " requestSource=GameServer_freects_command_transfer";
+	}
+	else if (transferRequestSource == TransferRequestMoveValidation::TRS_ingame_cts_command_validate)
+	{
+		result += " requestSource=GameServer_cts_command_validate";
+	}
+	else if (transferRequestSource == TransferRequestMoveValidation::TRS_ingame_cts_command_transfer)
+	{
+		result += " requestSource=GameServer_cts_command_transfer";
+	}
+	else
+	{
+		result += " requestSource=";
+
+		memset(buf, 0, sizeof(buf));
+		snprintf(buf, sizeof(buf) - 1, "%d", static_cast<int>(transferRequestSource));
+		result += buf;
+	}
+
+	result += " isValidName=";
+	if(getIsValidName())
+	{
+		result += "true";
+	}
+	else
+	{
+		result += "false";
+	}
+
+	result += " isMoveRequest=";
+	if(getIsMoveRequest())
+	{
+		result += "true";
+	}
+	else
+	{
+		result += "false";
+	}
+
+	result += " withItems=";
+	if(getWithItems())
+	{
+		result += "true";
+	}
+	else
+	{
+		result += "false";
+	}
+
+	result += " allowOverride=";
+	if(getAllowOverride())
+	{
+		result += "true";
+	}
+	else
+	{
+		result += "false";
+	}
+
+	result += "    {";
+
+	result += "SOURCE: ";
+
+	memset(buf, 0, sizeof(buf));
+	snprintf(buf, sizeof(buf) - 1, "%d", getSourceStationId());
+	result += buf;
+	result += ", ";
+
+	result += getSourceGalaxy();
+	result += ", ";
+
+	result += getSourceCharacterName();
+
+	result += " (";
+	result += getCharacterId().getValueString();
+	result += ") ";
+
+
+	result += "}    ---->    {";
+
+	result += "DEST: ";
+
+	memset(buf, 0, sizeof(buf));
+	snprintf(buf, sizeof(buf) - 1, "%d", getDestinationStationId());
+	result += buf;
+	result += ", ";
+
+	result += getDestinationGalaxy();
+	result += ", ";
+
+	result += getDestinationCharacterName();
+
+	result += " (";
+	result += getDestinationCharacterId().getValueString();
+	result += ") ";
+
+	result += "}    ";
+
+	result += " customerLocalizedLanguage=";
+	result += getCustomerLocalizedLanguage();
+
+	result += " scene=";
+	result += getScene();
+	memset(buf, 0, sizeof(buf));
+	const Vector & v = getStartingCoordinates();
+	snprintf(buf, sizeof(buf) - 1, " (%.2f %.2f %.2f)", v.x, v.y, v.z);
+    result += buf;
+
+	result += " containerId=";
+	result += getContainerId().getValueString();
+
+	result += " objectTemplateName=";
+	result += getObjectTemplateName();
+
+	result += " objectTemplateCrc=";
+	snprintf(buf, sizeof(buf) - 1, "%lu", getObjectTemplateCrc());
+	result += buf;
+
+	result += " scaleFactor=";
+	memset(buf, 0, sizeof(buf));
+	snprintf(buf, sizeof(buf) - 1, "%.2f", getScaleFactor());
+	result += buf;
+
+	result += " customizationData.length=";
+	memset(buf, 0, sizeof(buf));
+	snprintf(buf, sizeof(buf) - 1, "%d", getCustomizationData().length());
+	result += buf;
+
+	result += " scriptDictionaryData.length=";
+	memset(buf, 0, sizeof(buf));
+	snprintf(buf, sizeof(buf) - 1, "%d", getScriptDictionaryData().size()); 
+	result += buf;
+
+	result += " hairObjectTemplateName=";
+	result += getHairTemplateName();
+
+	result += " hairAppearanceData.length=";
+	memset(buf, 0, sizeof(buf));
+	snprintf(buf, sizeof(buf) -1, "%d", getHairAppearanceData().length());
+	result += buf;
+
+	result += " profession=";
+	result += getProfession();
+	
+	result += " skillTemplate=";
+	result += getSkillTemplate();
+
+	result += " getWorkingSkill=";
+	result += getWorkingSkill();
+	
+	result += " resultDescription=";
+	result += Unicode::wideToNarrow(getResultDescription());
+	
+	return result;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getCustomizationData() const
+{
+	return m_customizationData;
+}
+
+//-----------------------------------------------------------------------
+
+const std::vector<unsigned char> & TransferCharacterData::getScriptDictionaryData() const
+{
+	return m_scriptDictionaryData;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getObjectTemplateName() const
+{
+	return m_objectTemplateName;
+}
+
+//-----------------------------------------------------------------------
+
+uint32 TransferCharacterData::getObjectTemplateCrc() const
+{
+	return m_objectTemplateCrc;
+}
+
+//-----------------------------------------------------------------------
+
+float TransferCharacterData::getScaleFactor() const
+{
+	return m_scaleFactor;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getHairTemplateName() const
+{
+	return m_hairTemplateName;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getHairAppearanceData() const
+{
+	return m_hairAppearanceData;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferCharacterData::getProfession() const
+{
+	return m_profession;
+}
+
+//-----------------------------------------------------------------------
+
+const Unicode::String & TransferCharacterData::getBiography() const
+{
+	return m_biography;
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId & TransferCharacterData::getDestinationCharacterId() const
+{
+	return m_destinationCharacterId;
+}
+
+//-----------------------------------------------------------------------
+
+bool TransferCharacterData::getIsValidName() const
+{
+	return m_isValidName;
+}
+
+//-----------------------------------------------------------------------
+
+bool TransferCharacterData::getIsMoveRequest() const
+{
+	return m_isMoveRequest;
+}
+
+//-----------------------------------------------------------------------
+
+bool TransferCharacterData::getWithItems() const
+{
+	 return m_withItems;
+}
+
+//-----------------------------------------------------------------------
+
+const Unicode::String & TransferCharacterData::getResultDescription() const
+{
+	return m_resultDescription;
+}
+
+const unsigned int TransferCharacterData::getCSToolId() const
+{
+	return m_csToolId;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setCharacterId(const NetworkId & characterId)
+{
+	m_characterId = characterId;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setContainerId(const NetworkId & containerId)
+{
+	m_containerId = containerId;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setCustomerLocalizedLanguage(const std::string & locale)
+{
+	m_customerLocalizedLanguage = locale;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setDestinationCharacterId(const NetworkId & destinationCharacterId)
+{
+	m_destinationCharacterId = destinationCharacterId;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setDestinationCharacterName(const std::string & destinationCharacterName)
+{
+	m_destinationCharacterName = destinationCharacterName;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setDestinationGalaxy(const std::string & destinationGalaxy)
+{
+	m_destinationGalaxy = destinationGalaxy;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setDestinationStationId(const unsigned int destinationStationId)
+{
+	m_destinationStationId = destinationStationId;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setScene(const std::string & scene)
+{
+	m_scene = scene;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setSourceCharacterName(const std::string & sourceCharacterName)
+{
+	m_sourceCharacterName = sourceCharacterName;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setSourceGalaxy(const std::string & sourceGalaxy)
+{
+	m_sourceGalaxy = sourceGalaxy;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setSourceStationId(const unsigned int sourceStationId)
+{
+	m_sourceStationId = sourceStationId;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setTrack(const unsigned int track)
+{
+	m_track = track;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setTransactionId(const unsigned int transactionId)
+{
+	m_transactionId = transactionId;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setStartingCoordinates(const Vector & startingCoordinates)
+{
+	m_startingCoordinates = startingCoordinates;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setCustomizationData(const std::string & customizationData)
+{
+	m_customizationData = customizationData;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setScriptDictionaryData(const std::vector<unsigned char> & scriptDictionaryData)
+{
+	m_scriptDictionaryData = scriptDictionaryData;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setObjectTemplateName(const std::string & objectTemplateName)
+{
+	m_objectTemplateName = objectTemplateName;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setObjectTemplateCrc(uint32 objectTemplateCrc)
+{
+	m_objectTemplateCrc = objectTemplateCrc;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setScaleFactor(const float scaleFactor)
+{
+	m_scaleFactor = scaleFactor;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setHairTemplateName(const std::string & hairTemplateName)
+{
+	m_hairTemplateName = hairTemplateName;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setHairAppearanceData(const std::string & hairAppearanceData)
+{
+	m_hairAppearanceData = hairAppearanceData;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setProfession(const std::string & profession)
+{
+	m_profession = profession;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setBiography(const Unicode::String & biography)
+{
+	m_biography = biography;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setIsMoveRequest(const bool isMoveRequest)
+{
+	m_isMoveRequest = isMoveRequest;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setWithItems(const bool withItems)
+{
+	m_withItems = withItems;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setIsValidName(const bool isNameValid)
+{
+	m_isValidName = isNameValid;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setResultDescription(const Unicode::String & description)
+{
+	m_resultDescription = description;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setAllowOverride(const bool allowOverride)
+{
+	m_allowOverride = allowOverride;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setSkillTemplate(const std::string & skillTemplate)
+{
+	m_skillTemplate = skillTemplate;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setWorkingSkill(const std::string & workingSkill)
+{
+	m_workingSkill = workingSkill;
+}
+
+//-----------------------------------------------------------------------
+
+void TransferCharacterData::setCSToolId(const unsigned int toolId)
+{
+	m_csToolId = toolId;
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterData.h b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterData.h
new file mode 100644
index 00000000..528f873d
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterData.h
@@ -0,0 +1,151 @@
+// ======================================================================
+//
+// TransferCharacterData.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_TransferCharacterData_H
+#define INCLUDED_TransferCharacterData_H
+
+// ======================================================================
+
+#include "serverNetworkMessages/TransferRequestMoveValidation.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector.h"
+#include <string>
+
+// ======================================================================
+
+class TransferCharacterData;
+
+namespace Archive
+{
+	class ReadIterator;
+	void get(ReadIterator & source, TransferCharacterData & target);
+}
+
+/**
+ * Data structures for passing around the list of avatars for an account.
+ */
+class TransferCharacterData
+{
+public:
+	TransferCharacterData(const TransferCharacterData & rhs);
+	TransferCharacterData(TransferRequestMoveValidation::TransferRequestSource transferRequestSource);
+
+	~TransferCharacterData();
+
+	const NetworkId &                   getCharacterId                () const;
+	const NetworkId &                   getContainerId                () const;
+	const std::string &                 getCustomerLocalizedLanguage  () const;
+	const NetworkId &                   getDestinationCharacterId     () const;
+	const std::string &                 getDestinationCharacterName   () const;
+	const std::string &                 getDestinationGalaxy          () const;
+	unsigned int                        getDestinationStationId       () const;
+	const std::string &                 getScene                      () const;
+	const std::string &                 getSourceCharacterName        () const;
+	const std::string &                 getSourceGalaxy               () const;
+	unsigned int                        getSourceStationId            () const;
+	unsigned int                        getTrack                      () const;
+	unsigned int                        getTransactionId              () const;
+	const Vector &                      getStartingCoordinates        () const;
+	std::string                         toString                      () const;
+	const std::string &                 getCustomizationData          () const;
+	const std::vector<unsigned char> &  getScriptDictionaryData       () const;
+	const std::string &                 getObjectTemplateName         () const;
+	uint32                              getObjectTemplateCrc          () const;
+	float                               getScaleFactor                () const;
+	const std::string &                 getHairTemplateName           () const;
+	const std::string &                 getHairAppearanceData         () const;
+	const std::string &                 getProfession                 () const;
+	const Unicode::String &             getBiography                  () const;
+	bool                                getIsValidName                () const;
+	bool                                getIsMoveRequest              () const;
+	bool                                getWithItems                  () const;
+	const Unicode::String &             getResultDescription          () const;
+	bool                                getAllowOverride              () const;
+	const std::string &                 getSkillTemplate              () const;
+	const std::string &                 getWorkingSkill               () const;
+	TransferRequestMoveValidation::TransferRequestSource getTransferRequestSource() const;
+
+	const unsigned int                  getCSToolId                   () const;
+
+	void                                setCharacterId                (const NetworkId & characterId);
+	void                                setContainerId                (const NetworkId & containerId);
+	void                                setCustomerLocalizedLanguage  (const std::string & locale);
+	void                                setDestinationCharacterId     (const NetworkId & destinationCharacterId);
+	void                                setDestinationCharacterName   (const std::string & destinationCharacterName);
+	void                                setDestinationGalaxy          (const std::string & destinationGalaxy);
+	void                                setDestinationStationId       (const unsigned int destinationStationId);
+	void                                setScene                      (const std::string & scene);
+	void                                setSourceCharacterName        (const std::string & sourceCharacterName);
+	void                                setSourceGalaxy               (const std::string & sourceGalaxy);
+	void                                setSourceStationId            (const unsigned int sourceStationId);
+	void                                setTrack                      (const unsigned int track);
+	void                                setTransactionId              (const unsigned int transactionId);
+	void                                setStartingCoordinates        (const Vector & startingCoordinates);
+	void                                setCustomizationData          (const std::string & customizationData);
+	void                                setScriptDictionaryData       (const std::vector<unsigned char> & scriptDictionaryData);
+	void                                setObjectTemplateName         (const std::string & objectTemplateName);
+	void                                setObjectTemplateCrc          (uint32 objectTemplateCrc);
+	void                                setScaleFactor                (const float scaleFactor);
+	void                                setHairTemplateName           (const std::string & hairTemplateName);
+	void                                setHairAppearanceData         (const std::string & hairAppearanceData);
+	void                                setProfession                 (const std::string & profession);
+	void                                setBiography                  (const Unicode::String & biography);
+	void                                setIsValidName                (const bool isNameValid);
+	void                                setIsMoveRequest              (const bool isMoveRequest);
+	void                                setWithItems                  (const bool withItems);
+	void                                setResultDescription          (const Unicode::String & resultDescription);
+	void                                setAllowOverride              (const bool allowOverride);
+	void                                setSkillTemplate              (const std::string & skillTemplate);
+	void                                setWorkingSkill               (const std::string & workingSkill);
+
+	void                                setCSToolId                   (const unsigned int toolId);
+
+private:
+	TransferCharacterData();
+
+	friend class Archive::AutoVariable<TransferCharacterData>;
+	friend struct std::pair<std::string, TransferCharacterData>;
+	friend void Archive::get(Archive::ReadIterator & source, TransferCharacterData & target);
+
+	unsigned int                m_track;
+	std::string                 m_customerLocalizedLanguage;
+	std::string                 m_sourceGalaxy;
+	std::string                 m_destinationGalaxy;
+	std::string                 m_sourceCharacterName;
+	std::string                 m_destinationCharacterName;
+	unsigned int                m_sourceStationId;
+	unsigned int                m_destinationStationId;
+	unsigned int                m_transactionId;
+	NetworkId                   m_characterId;
+	NetworkId                   m_destinationCharacterId;
+	NetworkId                   m_containerId;
+	std::string                 m_scene;
+	Vector                      m_startingCoordinates;
+	std::string                 m_customizationData;
+	std::vector<unsigned char>  m_scriptDictionaryData;
+	std::string                 m_objectTemplateName;
+	uint32                      m_objectTemplateCrc;
+	float                       m_scaleFactor;
+	std::string                 m_hairTemplateName;
+	std::string                 m_hairAppearanceData;
+	std::string                 m_profession;
+	Unicode::String             m_biography;
+	bool                        m_isValidName;
+	bool                        m_isMoveRequest;
+	bool                        m_withItems;
+	Unicode::String             m_resultDescription;
+	bool                        m_allowOverride;
+	std::string                 m_skillTemplate;
+	std::string                 m_workingSkill;
+	TransferRequestMoveValidation::TransferRequestSource m_transferRequestSource;
+
+	unsigned int                m_csToolId;
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterDataArchive.cpp b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterDataArchive.cpp
new file mode 100644
index 00000000..922947c5
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterDataArchive.cpp
@@ -0,0 +1,87 @@
+// ======================================================================
+//
+// TransferCharacterDataArchive.cpp
+// copyright (c) 2001-2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/TransferCharacterDataArchive.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "serverNetworkMessages/TransferCharacterData.h"
+#include "Archive/Archive.h"
+
+namespace Archive
+{
+	void get(ReadIterator & source, TransferCharacterData & target)
+	{
+		get(source, target.m_customerLocalizedLanguage);
+		get(source, target.m_destinationCharacterName);
+		get(source, target.m_destinationGalaxy);
+		get(source, target.m_destinationStationId);
+		get(source, target.m_sourceCharacterName);
+		get(source, target.m_sourceGalaxy);
+		get(source, target.m_sourceStationId);
+		get(source, target.m_track);
+		get(source, target.m_transactionId);
+		get(source, target.m_characterId);
+		get(source, target.m_containerId);
+		get(source, target.m_scene);
+		get(source, target.m_startingCoordinates);
+		get(source, target.m_customizationData);
+		get(source, target.m_scriptDictionaryData);
+		get(source, target.m_objectTemplateName);
+		get(source, target.m_objectTemplateCrc);
+		get(source, target.m_scaleFactor);
+		get(source, target.m_hairTemplateName);
+		get(source, target.m_hairAppearanceData);
+		get(source, target.m_profession);
+		get(source, target.m_biography);
+		get(source, target.m_destinationCharacterId);
+		get(source, target.m_isValidName);
+		get(source, target.m_isMoveRequest);
+		get(source, target.m_withItems);
+		get(source, target.m_resultDescription);
+		get(source, target.m_allowOverride);
+		get(source, target.m_csToolId);
+
+		int8 temp;
+		get(source, temp);
+		target.m_transferRequestSource = static_cast<TransferRequestMoveValidation::TransferRequestSource>(temp);
+	}
+
+	void put(ByteStream & target, const TransferCharacterData & source)
+	{
+		put(target, source.getCustomerLocalizedLanguage());
+		put(target, source.getDestinationCharacterName());
+		put(target, source.getDestinationGalaxy());
+		put(target, source.getDestinationStationId());
+		put(target, source.getSourceCharacterName());
+		put(target, source.getSourceGalaxy());
+		put(target, source.getSourceStationId());
+		put(target, source.getTrack());
+		put(target, source.getTransactionId());
+		put(target, source.getCharacterId());
+		put(target, source.getContainerId());
+		put(target, source.getScene());
+		put(target, source.getStartingCoordinates());
+		put(target, source.getCustomizationData());
+		put(target, source.getScriptDictionaryData());
+		put(target, source.getObjectTemplateName());
+		put(target, source.getObjectTemplateCrc());
+		put(target, source.getScaleFactor());
+		put(target, source.getHairTemplateName());
+		put(target, source.getHairAppearanceData());
+		put(target, source.getProfession());
+		put(target, source.getBiography());
+		put(target, source.getDestinationCharacterId());
+		put(target, source.getIsValidName());
+		put(target, source.getIsMoveRequest());
+		put(target, source.getWithItems());
+		put(target, source.getResultDescription());
+		put(target, source.getAllowOverride());
+		put(target, source.getCSToolId());
+		put(target, static_cast<int8>(source.getTransferRequestSource()));
+	}
+}
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterDataArchive.h b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterDataArchive.h
new file mode 100644
index 00000000..2ec5e94e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferCharacterDataArchive.h
@@ -0,0 +1,31 @@
+// ======================================================================
+//
+// TransferCharacterDataArchive.h
+// copyright (c) 2001-2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _TransferCharacterDataArchive_H
+#define _TransferCharacterDataArchive_H
+
+//-----------------------------------------------------------------------
+
+class TransferCharacterData;
+
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+}
+
+//-----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, TransferCharacterData & target);
+	void put (ByteStream & target, const TransferCharacterData & source);
+}
+
+//-----------------------------------------------------------------------
+
+#endif//_TransferCharacterDataArchive_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyCharacterList.cpp b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyCharacterList.cpp
new file mode 100644
index 00000000..6fb8b6f6
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyCharacterList.cpp
@@ -0,0 +1,64 @@
+// TransferReplyCharacterList.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/TransferReplyCharacterList.h"
+
+//-----------------------------------------------------------------------
+
+TransferReplyCharacterList::TransferReplyCharacterList(unsigned int track, unsigned int stationId, const AvatarList & avatarList) :
+GameNetworkMessage("TransferReplyCharacterList"),
+m_avatarList(avatarList),
+m_stationId(stationId),
+m_track(track)
+{
+	addVariable(m_avatarList);
+	addVariable(m_stationId);
+	addVariable(m_track);
+}
+
+//-----------------------------------------------------------------------
+
+TransferReplyCharacterList::TransferReplyCharacterList(Archive::ReadIterator & source) :
+GameNetworkMessage("TransferReplyCharacterList"),
+m_avatarList(),
+m_stationId(),
+m_track()
+{
+	addVariable(m_avatarList);
+	addVariable(m_stationId);
+	addVariable(m_track);
+	AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TransferReplyCharacterList::~TransferReplyCharacterList()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const AvatarList & TransferReplyCharacterList::getAvatarList() const
+{
+	return m_avatarList.get();
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferReplyCharacterList::getStationId() const
+{
+	return m_stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferReplyCharacterList::getTrack() const
+{
+	return m_track.get();
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyCharacterList.h b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyCharacterList.h
new file mode 100644
index 00000000..a82da138
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyCharacterList.h
@@ -0,0 +1,38 @@
+// TransferReplyCharacterList.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_TransferReplyCharacterList_H
+#define	_INCLUDED_TransferReplyCharacterList_H
+
+//-----------------------------------------------------------------------
+#include "serverNetworkMessages/AvatarList.h"
+#include "serverNetworkMessages/AvatarListArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class TransferReplyCharacterList : public GameNetworkMessage
+{
+public:
+	explicit TransferReplyCharacterList(unsigned int track, unsigned int fromStationId, const AvatarList & avatarList);
+	explicit TransferReplyCharacterList(Archive::ReadIterator & source);
+	~TransferReplyCharacterList();
+
+	const AvatarList &   getAvatarList     () const;
+	unsigned int         getStationId      () const;
+	unsigned int         getTrack          () const;
+
+private:
+	TransferReplyCharacterList & operator = (const TransferReplyCharacterList & rhs);
+	TransferReplyCharacterList(const TransferReplyCharacterList & source);
+
+	Archive::AutoVariable<AvatarList>    m_avatarList;
+	Archive::AutoVariable<unsigned int>  m_stationId;
+	Archive::AutoVariable<unsigned int>  m_track;
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_TransferReplyCharacterList_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyMoveValidation.cpp b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyMoveValidation.cpp
new file mode 100644
index 00000000..59a38f4e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyMoveValidation.cpp
@@ -0,0 +1,162 @@
+// TransferReplyMoveValidation.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/TransferReplyMoveValidation.h"
+
+//-----------------------------------------------------------------------
+
+TransferReplyMoveValidation::TransferReplyMoveValidation(TransferRequestMoveValidation::TransferRequestSource transferRequestSource, unsigned int track, unsigned int sourceStationId, unsigned int destinationStationId, const std::string & sourceGalaxy, const std::string & destinationGalaxy, const std::string & sourceCharacter, const NetworkId & sourceCharacterId, uint32 sourceCharacterTemplateId, const std::string & destinationCharacter, const std::string & customerLocalizedLanguage, TransferReplyMoveValidationResult result) :
+GameNetworkMessage("TransferReplyMoveValidation"),
+m_customerLocalizedLanguage(customerLocalizedLanguage),
+m_destinationCharacter(destinationCharacter),
+m_destinationGalaxy(destinationGalaxy),
+m_destinationStationId(destinationStationId),
+m_sourceCharacter(sourceCharacter),
+m_sourceCharacterId(sourceCharacterId),
+m_sourceCharacterTemplateId(sourceCharacterTemplateId),
+m_sourceGalaxy(sourceGalaxy),
+m_sourceStationId(sourceStationId),
+m_track(track),
+m_result(static_cast<int8>(result)),
+m_transferRequestSource(static_cast<int8>(transferRequestSource))
+{
+	addVariable(m_customerLocalizedLanguage);
+	addVariable(m_destinationCharacter);
+	addVariable(m_destinationGalaxy);
+	addVariable(m_destinationStationId);
+	addVariable(m_sourceCharacter);
+	addVariable(m_sourceCharacterId);
+	addVariable(m_sourceCharacterTemplateId);
+	addVariable(m_sourceGalaxy);
+	addVariable(m_sourceStationId);
+	addVariable(m_track);
+	addVariable(m_result);
+	addVariable(m_transferRequestSource);
+}
+
+//-----------------------------------------------------------------------
+
+TransferReplyMoveValidation::TransferReplyMoveValidation(Archive::ReadIterator & source) :
+GameNetworkMessage("TransferReplyMoveValidation"),
+m_customerLocalizedLanguage(),
+m_destinationCharacter(),
+m_destinationGalaxy(),
+m_destinationStationId(),
+m_sourceCharacter(),
+m_sourceCharacterId(),
+m_sourceCharacterTemplateId(),
+m_sourceGalaxy(),
+m_sourceStationId(),
+m_track(),
+m_result(),
+m_transferRequestSource()
+{
+	addVariable(m_customerLocalizedLanguage);
+	addVariable(m_destinationCharacter);
+	addVariable(m_destinationGalaxy);
+	addVariable(m_destinationStationId);
+	addVariable(m_sourceCharacter);
+	addVariable(m_sourceCharacterId);
+	addVariable(m_sourceCharacterTemplateId);
+	addVariable(m_sourceGalaxy);
+	addVariable(m_sourceStationId);
+	addVariable(m_track);
+	addVariable(m_result);
+	addVariable(m_transferRequestSource);
+	AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TransferReplyMoveValidation::~TransferReplyMoveValidation()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferReplyMoveValidation::getCustomerLocalizedLanguage() const
+{
+	return m_customerLocalizedLanguage.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferReplyMoveValidation::getDestinationCharacter() const
+{
+	return m_destinationCharacter.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferReplyMoveValidation::getDestinationGalaxy() const
+{
+	return m_destinationGalaxy.get();
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferReplyMoveValidation::getDestinationStationId() const
+{
+	return m_destinationStationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferReplyMoveValidation::getSourceCharacter() const
+{
+	return m_sourceCharacter.get();
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId & TransferReplyMoveValidation::getSourceCharacterId() const
+{
+	return m_sourceCharacterId.get();
+}
+
+//-----------------------------------------------------------------------
+
+uint32 TransferReplyMoveValidation::getSourceCharacterTemplateId() const
+{
+	return m_sourceCharacterTemplateId.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferReplyMoveValidation::getSourceGalaxy() const
+{
+	return m_sourceGalaxy.get();
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferReplyMoveValidation::getSourceStationId() const
+{
+	return m_sourceStationId.get();
+}
+
+//-----------------------------------------------------------------------
+unsigned int TransferReplyMoveValidation::getTrack() const
+{
+	return m_track.get();
+}
+
+//-----------------------------------------------------------------------
+
+TransferReplyMoveValidation::TransferReplyMoveValidationResult TransferReplyMoveValidation::getResult() const
+{
+	return static_cast<TransferReplyMoveValidationResult>(m_result.get());
+}
+
+//-----------------------------------------------------------------------
+
+TransferRequestMoveValidation::TransferRequestSource TransferReplyMoveValidation::getTransferRequestSource() const
+{
+	return static_cast<TransferRequestMoveValidation::TransferRequestSource>(m_transferRequestSource.get());
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyMoveValidation.h b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyMoveValidation.h
new file mode 100644
index 00000000..4c45390a
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferReplyMoveValidation.h
@@ -0,0 +1,59 @@
+// TransferReplyMoveValidation.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_TransferReplyMoveValidation_H
+#define	_INCLUDED_TransferReplyMoveValidation_H
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/TransferRequestMoveValidation.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class TransferReplyMoveValidation : public GameNetworkMessage
+{
+public:
+	enum TransferReplyMoveValidationResult {TRMVR_can_create_regular_character, TRMVR_cannot_create_regular_character, TRMVR_destination_galaxy_invalid, TRMVR_destination_galaxy_not_connected, TRMVR_destination_galaxy_in_loading};
+
+public:
+	TransferReplyMoveValidation(TransferRequestMoveValidation::TransferRequestSource transferRequestSource, unsigned int track, unsigned int sourceStationId, unsigned int destinationStationId, const std::string & sourceGalaxy, const std::string & destinationGalaxy, const std::string & sourceCharacter, const NetworkId & sourceCharacterId, uint32 sourceCharacterTemplateId, const std::string & destinationCharacter, const std::string & customerLocalizedLanguage, TransferReplyMoveValidationResult result);
+	explicit TransferReplyMoveValidation(Archive::ReadIterator & source);
+	~TransferReplyMoveValidation();
+
+	const std::string &  getCustomerLocalizedLanguage  () const;
+	const std::string &  getDestinationCharacter       () const;
+	const std::string &  getDestinationGalaxy          () const;
+	unsigned int         getDestinationStationId       () const;
+	const std::string &  getSourceCharacter            () const;
+	const NetworkId &    getSourceCharacterId          () const;
+	uint32               getSourceCharacterTemplateId  () const;
+	const std::string &  getSourceGalaxy               () const;
+	unsigned int         getSourceStationId            () const;
+	unsigned int         getTrack                      () const;
+	TransferReplyMoveValidationResult getResult        () const;
+	TransferRequestMoveValidation::TransferRequestSource getTransferRequestSource() const;
+
+private:
+	TransferReplyMoveValidation & operator = (const TransferReplyMoveValidation & rhs);
+	TransferReplyMoveValidation(const TransferReplyMoveValidation & source);
+
+	Archive::AutoVariable<std::string>   m_customerLocalizedLanguage;
+	Archive::AutoVariable<std::string>   m_destinationCharacter;
+	Archive::AutoVariable<std::string>   m_destinationGalaxy;
+	Archive::AutoVariable<unsigned int>  m_destinationStationId;
+	Archive::AutoVariable<std::string>   m_sourceCharacter;
+	Archive::AutoVariable<NetworkId>     m_sourceCharacterId;
+	Archive::AutoVariable<uint32>        m_sourceCharacterTemplateId;
+	Archive::AutoVariable<std::string>   m_sourceGalaxy;
+	Archive::AutoVariable<unsigned int>  m_sourceStationId;
+	Archive::AutoVariable<unsigned int>  m_track;
+	Archive::AutoVariable<int8>          m_result;
+	Archive::AutoVariable<int8>          m_transferRequestSource;
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_TransferReplyMoveValidation_H
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferRequestMoveValidation.cpp b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferRequestMoveValidation.cpp
new file mode 100644
index 00000000..ad4f3b25
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferRequestMoveValidation.cpp
@@ -0,0 +1,152 @@
+// TransferRequestMoveValidation.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"
+#include "serverNetworkMessages/TransferRequestMoveValidation.h"
+
+//-----------------------------------------------------------------------
+
+TransferRequestMoveValidation::TransferRequestMoveValidation(TransferRequestSource transferRequestSource, unsigned int track, unsigned int sourceStationId, unsigned int destinationStationId, const std::string & sourceGalaxy, const std::string & destinationGalaxy, const std::string & sourceCharacter, const NetworkId & sourceCharacterId, uint32 sourceCharacterTemplateId, const std::string & destinationCharacter, const std::string & customerLocalizedLanguage) :
+GameNetworkMessage("TransferRequestMoveValidation"),
+m_customerLocalizedLanguage(customerLocalizedLanguage),
+m_destinationCharacter(destinationCharacter),
+m_destinationGalaxy(destinationGalaxy),
+m_destinationStationId(destinationStationId),
+m_sourceCharacter(sourceCharacter),
+m_sourceCharacterId(sourceCharacterId),
+m_sourceCharacterTemplateId(sourceCharacterTemplateId),
+m_sourceGalaxy(sourceGalaxy),
+m_sourceStationId(sourceStationId),
+m_track(track),
+m_transferRequestSource(static_cast<int8>(transferRequestSource))
+{
+	addVariable(m_customerLocalizedLanguage);
+	addVariable(m_destinationCharacter);
+	addVariable(m_destinationGalaxy);
+	addVariable(m_destinationStationId);
+	addVariable(m_sourceCharacter);
+	addVariable(m_sourceCharacterId);
+	addVariable(m_sourceCharacterTemplateId);
+	addVariable(m_sourceGalaxy);
+	addVariable(m_sourceStationId);
+	addVariable(m_track);
+	addVariable(m_transferRequestSource);
+}
+
+//-----------------------------------------------------------------------
+
+TransferRequestMoveValidation::TransferRequestMoveValidation(Archive::ReadIterator & source) :
+GameNetworkMessage("TransferRequestMoveValidation"),
+m_customerLocalizedLanguage(),
+m_destinationCharacter(),
+m_destinationGalaxy(),
+m_destinationStationId(),
+m_sourceCharacter(),
+m_sourceCharacterId(),
+m_sourceCharacterTemplateId(),
+m_sourceGalaxy(),
+m_sourceStationId(),
+m_track(),
+m_transferRequestSource()
+{
+	addVariable(m_customerLocalizedLanguage);
+	addVariable(m_destinationCharacter);
+	addVariable(m_destinationGalaxy);
+	addVariable(m_destinationStationId);
+	addVariable(m_sourceCharacter);
+	addVariable(m_sourceCharacterId);
+	addVariable(m_sourceCharacterTemplateId);
+	addVariable(m_sourceGalaxy);
+	addVariable(m_sourceStationId);
+	addVariable(m_track);
+	addVariable(m_transferRequestSource);
+	AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+TransferRequestMoveValidation::~TransferRequestMoveValidation()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferRequestMoveValidation::getCustomerLocalizedLanguage() const
+{
+	return m_customerLocalizedLanguage.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferRequestMoveValidation::getDestinationCharacter() const
+{
+	return m_destinationCharacter.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferRequestMoveValidation::getDestinationGalaxy() const
+{
+	return m_destinationGalaxy.get();
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferRequestMoveValidation::getDestinationStationId() const
+{
+	return m_destinationStationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferRequestMoveValidation::getSourceCharacter() const
+{
+	return m_sourceCharacter.get();
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId & TransferRequestMoveValidation::getSourceCharacterId() const
+{
+	return m_sourceCharacterId.get();
+}
+
+//-----------------------------------------------------------------------
+
+uint32 TransferRequestMoveValidation::getSourceCharacterTemplateId() const
+{
+	return m_sourceCharacterTemplateId.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & TransferRequestMoveValidation::getSourceGalaxy() const
+{
+	return m_sourceGalaxy.get();
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferRequestMoveValidation::getSourceStationId() const
+{
+	return m_sourceStationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+unsigned int TransferRequestMoveValidation::getTrack() const
+{
+	return m_track.get();
+}
+
+//-----------------------------------------------------------------------
+
+TransferRequestMoveValidation::TransferRequestSource TransferRequestMoveValidation::getTransferRequestSource() const
+{
+	return static_cast<TransferRequestSource>(m_transferRequestSource.get());
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferRequestMoveValidation.h b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferRequestMoveValidation.h
new file mode 100644
index 00000000..6f6a0d1e
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/shared/transferServer/TransferRequestMoveValidation.h
@@ -0,0 +1,57 @@
+// TransferRequestMoveValidation.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_TransferRequestMoveValidation_H
+#define	_INCLUDED_TransferRequestMoveValidation_H
+
+//-----------------------------------------------------------------------
+#include "serverNetworkMessages/AvatarList.h"
+#include "serverNetworkMessages/AvatarListArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class TransferRequestMoveValidation : public GameNetworkMessage
+{
+public:
+	enum TransferRequestSource {TRS_transfer_server, TRS_console_god_command, TRS_ingame_freects_command_validate, TRS_ingame_freects_command_transfer, TRS_ingame_cts_command_validate, TRS_ingame_cts_command_transfer};
+
+public:
+	TransferRequestMoveValidation(TransferRequestSource transferRequestSource, unsigned int track, unsigned int sourceStationId, unsigned int destinationStationId, const std::string & sourceGalaxy, const std::string & destinationGalaxy, const std::string & sourceCharacter, const NetworkId & sourceCharacterId, uint32 sourceCharacterTemplateId, const std::string & destinationCharacter, const std::string & customerLocalizedLanguage);
+	explicit TransferRequestMoveValidation(Archive::ReadIterator & source);
+	~TransferRequestMoveValidation();
+
+	const std::string &  getCustomerLocalizedLanguage  () const;
+	const std::string &  getDestinationCharacter       () const;
+	const std::string &  getDestinationGalaxy          () const;
+	unsigned int         getDestinationStationId       () const;
+	const std::string &  getSourceCharacter            () const;
+	const NetworkId &    getSourceCharacterId          () const;
+	uint32               getSourceCharacterTemplateId  () const;
+	const std::string &  getSourceGalaxy               () const;
+	unsigned int         getSourceStationId            () const;
+	unsigned int         getTrack                      () const;
+	TransferRequestSource getTransferRequestSource     () const;
+
+private:
+	TransferRequestMoveValidation & operator = (const TransferRequestMoveValidation & rhs);
+	TransferRequestMoveValidation(const TransferRequestMoveValidation & source);
+
+	Archive::AutoVariable<std::string>   m_customerLocalizedLanguage;
+	Archive::AutoVariable<std::string>   m_destinationCharacter;
+	Archive::AutoVariable<std::string>   m_destinationGalaxy;
+	Archive::AutoVariable<unsigned int>  m_destinationStationId;
+	Archive::AutoVariable<std::string>   m_sourceCharacter;
+	Archive::AutoVariable<NetworkId>     m_sourceCharacterId;
+	Archive::AutoVariable<uint32>        m_sourceCharacterTemplateId;
+	Archive::AutoVariable<std::string>   m_sourceGalaxy;
+	Archive::AutoVariable<unsigned int>  m_sourceStationId;
+	Archive::AutoVariable<unsigned int>  m_track;
+	Archive::AutoVariable<int8>          m_transferRequestSource;
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_TransferRequestMoveValidation_H
diff --git a/engine/server/library/serverNetworkMessages/src/win32/FirstServerNetworkMessages.cpp b/engine/server/library/serverNetworkMessages/src/win32/FirstServerNetworkMessages.cpp
new file mode 100644
index 00000000..16562107
--- /dev/null
+++ b/engine/server/library/serverNetworkMessages/src/win32/FirstServerNetworkMessages.cpp
@@ -0,0 +1,3 @@
+
+
+#include "serverNetworkMessages/FirstServerNetworkMessages.h"