diff --git a/engine/shared/library/sharedNetworkMessages/CMakeLists.txt b/engine/shared/library/sharedNetworkMessages/CMakeLists.txt
new file mode 100644
index 00000000..782885a5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(sharedNetworkMessages)
+
+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/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AIDebuggingMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AIDebuggingMessages.h
new file mode 100644
index 00000000..1dc3857f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AIDebuggingMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AIDebuggingMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AcceptAuctionMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AcceptAuctionMessage.h
new file mode 100644
index 00000000..4c1f6d56
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AcceptAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AcceptAuctionMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AcceptAuctionResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AcceptAuctionResponseMessage.h
new file mode 100644
index 00000000..26906deb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AcceptAuctionResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AcceptAuctionResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AddMapLocationMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AddMapLocationMessage.h
new file mode 100644
index 00000000..65828b16
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AddMapLocationMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AddMapLocationMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AddMapLocationResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AddMapLocationResponseMessage.h
new file mode 100644
index 00000000..a762b744
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AddMapLocationResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AddMapLocationResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AlterWaitTimerNotificationMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AlterWaitTimerNotificationMessage.h
new file mode 100644
index 00000000..6ee431bd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AlterWaitTimerNotificationMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AlterWaitTimerNotificationMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AppendCommentMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AppendCommentMessage.h
new file mode 100644
index 00000000..f0ba5a5f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AppendCommentMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/AppendCommentMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AppendCommentResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AppendCommentResponseMessage.h
new file mode 100644
index 00000000..ce636f43
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AppendCommentResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/AppendCommentResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AttributeListMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AttributeListMessage.h
new file mode 100644
index 00000000..64159c57
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AttributeListMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AttributeListMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionData.h
new file mode 100644
index 00000000..8a8ffc08
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionData.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AuctionData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionErrorCodes.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionErrorCodes.h
new file mode 100644
index 00000000..a9a7f42f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionErrorCodes.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AuctionErrorCodes.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionQueryHeadersMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionQueryHeadersMessage.h
new file mode 100644
index 00000000..8b949879
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionQueryHeadersMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AuctionQueryHeadersMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionQueryHeadersResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionQueryHeadersResponseMessage.h
new file mode 100644
index 00000000..cf2d4d0d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionQueryHeadersResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AuctionQueryHeadersResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionQueryMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionQueryMessage.h
new file mode 100644
index 00000000..9f86e98f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionQueryMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AuctionQueryMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionQueryResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionQueryResponseMessage.h
new file mode 100644
index 00000000..17b34ff4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/AuctionQueryResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/AuctionQueryResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BarrierMetrics.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BarrierMetrics.h
new file mode 100644
index 00000000..edcddf5d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BarrierMetrics.h
@@ -0,0 +1 @@
+#include "../../src/shared/planetWatch/BarrierMetrics.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BarrierMetricsData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BarrierMetricsData.h
new file mode 100644
index 00000000..ba9f01ef
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BarrierMetricsData.h
@@ -0,0 +1 @@
+#include "../../src/shared/planetWatch/BarrierMetricsData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BaselinesMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BaselinesMessage.h
new file mode 100644
index 00000000..58323281
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BaselinesMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/BaselinesMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BatchBaselinesMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BatchBaselinesMessage.h
new file mode 100644
index 00000000..abb6ba08
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BatchBaselinesMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/BatchBaselinesMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BidAuctionMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BidAuctionMessage.h
new file mode 100644
index 00000000..2f80bbbe
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BidAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/BidAuctionMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BidAuctionResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BidAuctionResponseMessage.h
new file mode 100644
index 00000000..f04efd2e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BidAuctionResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/BidAuctionResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BuffBuilderChangeMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BuffBuilderChangeMessage.h
new file mode 100644
index 00000000..991fddb8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BuffBuilderChangeMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/BuffBuilderChangeMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BuffBuilderStartMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BuffBuilderStartMessage.h
new file mode 100644
index 00000000..4af749b3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/BuffBuilderStartMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/BuffBuilderStartMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CancelLiveAuctionMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CancelLiveAuctionMessage.h
new file mode 100644
index 00000000..7cd9ab4f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CancelLiveAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/CancelLiveAuctionMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CancelLiveAuctionResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CancelLiveAuctionResponseMessage.h
new file mode 100644
index 00000000..96f44c49
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CancelLiveAuctionResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/CancelLiveAuctionResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CancelTicketMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CancelTicketMessage.h
new file mode 100644
index 00000000..7dc8df60
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CancelTicketMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/CancelTicketMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CancelTicketResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CancelTicketResponseMessage.h
new file mode 100644
index 00000000..91c3eaca
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CancelTicketResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/CancelTicketResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CharacterSheetResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CharacterSheetResponseMessage.h
new file mode 100644
index 00000000..3acdf998
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CharacterSheetResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/CharacterSheetResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatAddFriend.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatAddFriend.h
new file mode 100644
index 00000000..271e84b6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatAddFriend.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatAddFriend.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatAddModeratorToRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatAddModeratorToRoom.h
new file mode 100644
index 00000000..22999bcb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatAddModeratorToRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatAddModeratorToRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatAvatarId.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatAvatarId.h
new file mode 100644
index 00000000..4477e7f5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatAvatarId.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatAvatarId.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatAvatarIdArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatAvatarIdArchive.h
new file mode 100644
index 00000000..3b8d7d5b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatAvatarIdArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatAvatarIdArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatBanAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatBanAvatarFromRoom.h
new file mode 100644
index 00000000..e7484ff7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatBanAvatarFromRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatBanAvatarFromRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatChangeFriendStatus.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatChangeFriendStatus.h
new file mode 100644
index 00000000..61d477cf
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatChangeFriendStatus.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatChangeFriendStatus.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatChangeIgnoreStatus.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatChangeIgnoreStatus.h
new file mode 100644
index 00000000..7cc27350
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatChangeIgnoreStatus.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatChangeIgnoreStatus.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatCreateRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatCreateRoom.h
new file mode 100644
index 00000000..d2c43cf2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatCreateRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatCreateRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatDeleteAllPersistentMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatDeleteAllPersistentMessages.h
new file mode 100644
index 00000000..77f6eba9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatDeleteAllPersistentMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatDeleteAllPersistentMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatDeletePersistentMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatDeletePersistentMessage.h
new file mode 100644
index 00000000..287730a7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatDeletePersistentMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatDeletePersistentMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatDestroyRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatDestroyRoom.h
new file mode 100644
index 00000000..4395974c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatDestroyRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatDestroyRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatDestroyRoomByName.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatDestroyRoomByName.h
new file mode 100644
index 00000000..ce4110a9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatDestroyRoomByName.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatDestroyRoomByName.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatEnterRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatEnterRoom.h
new file mode 100644
index 00000000..229bffc0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatEnterRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatEnterRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatEnterRoomById.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatEnterRoomById.h
new file mode 100644
index 00000000..3ef938a3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatEnterRoomById.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatEnterRoomById.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatEnum.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatEnum.h
new file mode 100644
index 00000000..2f87ae35
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatEnum.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatEnum.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatFriendsListUpdate.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatFriendsListUpdate.h
new file mode 100644
index 00000000..478cab32
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatFriendsListUpdate.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatFriendsListUpdate.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatGetFriendsList.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatGetFriendsList.h
new file mode 100644
index 00000000..f996459d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatGetFriendsList.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatGetFriendsList.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatGetIgnoreList.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatGetIgnoreList.h
new file mode 100644
index 00000000..8290350d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatGetIgnoreList.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatGetIgnoreList.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInstantMessageToCharacter.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInstantMessageToCharacter.h
new file mode 100644
index 00000000..9693127d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInstantMessageToCharacter.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatInstantMessageToCharacter.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInstantMessageToClient.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInstantMessageToClient.h
new file mode 100644
index 00000000..22b526db
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInstantMessageToClient.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatInstantMessageToClient.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInviteAvatarToRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInviteAvatarToRoom.h
new file mode 100644
index 00000000..29cbb418
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInviteAvatarToRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatInviteAvatarToRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInviteGroupMembersToRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInviteGroupMembersToRoom.h
new file mode 100644
index 00000000..feded2d4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInviteGroupMembersToRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatInviteGroupMembersToRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInviteGroupToRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInviteGroupToRoom.h
new file mode 100644
index 00000000..62b2afe8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatInviteGroupToRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatInviteGroupToRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatKickAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatKickAvatarFromRoom.h
new file mode 100644
index 00000000..27569f93
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatKickAvatarFromRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatKickAvatarFromRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatMessageFromGame.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatMessageFromGame.h
new file mode 100644
index 00000000..9460e5f0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatMessageFromGame.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatMessageFromGame.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnAddFriend.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnAddFriend.h
new file mode 100644
index 00000000..d785907c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnAddFriend.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnAddFriend.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnAddModeratorToRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnAddModeratorToRoom.h
new file mode 100644
index 00000000..9d1c1f83
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnAddModeratorToRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnAddModeratorToRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnBanAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnBanAvatarFromRoom.h
new file mode 100644
index 00000000..27b4b95a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnBanAvatarFromRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnBanAvatarFromRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnChangeFriendStatus.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnChangeFriendStatus.h
new file mode 100644
index 00000000..993478d1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnChangeFriendStatus.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnChangeFriendStatus.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnChangeIgnoreStatus.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnChangeIgnoreStatus.h
new file mode 100644
index 00000000..047cda01
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnChangeIgnoreStatus.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnChangeIgnoreStatus.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnConnectAvatar.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnConnectAvatar.h
new file mode 100644
index 00000000..12e0273d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnConnectAvatar.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnConnectAvatar.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnCreateRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnCreateRoom.h
new file mode 100644
index 00000000..2af06993
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnCreateRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnCreateRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnDeleteAllPersistentMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnDeleteAllPersistentMessages.h
new file mode 100644
index 00000000..65f66c1c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnDeleteAllPersistentMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnDeleteAllPersistentMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnDestroyRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnDestroyRoom.h
new file mode 100644
index 00000000..9a3ed8a1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnDestroyRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnDestroyRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnEnteredRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnEnteredRoom.h
new file mode 100644
index 00000000..1447d548
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnEnteredRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnEnteredRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnGetFriendsList.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnGetFriendsList.h
new file mode 100644
index 00000000..bb6c1218
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnGetFriendsList.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnGetFriendsList.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnGetIgnoreList.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnGetIgnoreList.h
new file mode 100644
index 00000000..dae6169c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnGetIgnoreList.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnGetIgnoreList.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnInviteGroupToRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnInviteGroupToRoom.h
new file mode 100644
index 00000000..a49a5245
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnInviteGroupToRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnInviteGroupToRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnInviteToRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnInviteToRoom.h
new file mode 100644
index 00000000..65b406ef
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnInviteToRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnInviteToRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnKickAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnKickAvatarFromRoom.h
new file mode 100644
index 00000000..a908b1b9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnKickAvatarFromRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnKickAvatarFromRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnLeaveRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnLeaveRoom.h
new file mode 100644
index 00000000..a072d638
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnLeaveRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnLeaveRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnReceiveRoomInvitation.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnReceiveRoomInvitation.h
new file mode 100644
index 00000000..e5d1c32f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnReceiveRoomInvitation.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/chat/ChatOnReceiveRoomInvitation.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnRemoveModeratorFromRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnRemoveModeratorFromRoom.h
new file mode 100644
index 00000000..14afd720
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnRemoveModeratorFromRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnRemoveModeratorFromRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnRequestLog.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnRequestLog.h
new file mode 100644
index 00000000..6151d783
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnRequestLog.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnRequestLog.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnSendInstantMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnSendInstantMessage.h
new file mode 100644
index 00000000..8ae9e89b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnSendInstantMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/chat/ChatOnSendInstantMessage.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnSendPersistentMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnSendPersistentMessage.h
new file mode 100644
index 00000000..16eb9084
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnSendPersistentMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnSendPersistentMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnSendRoomInvitation.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnSendRoomInvitation.h
new file mode 100644
index 00000000..36be2ff8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnSendRoomInvitation.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnSendRoomInvitation.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnSendRoomMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnSendRoomMessage.h
new file mode 100644
index 00000000..0c4dc198
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnSendRoomMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnSendRoomMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnUnbanAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnUnbanAvatarFromRoom.h
new file mode 100644
index 00000000..6f03577e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnUnbanAvatarFromRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnUnbanAvatarFromRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnUninviteFromRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnUninviteFromRoom.h
new file mode 100644
index 00000000..30a9d50e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatOnUninviteFromRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatOnUninviteFromRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPersistentMessageToClient.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPersistentMessageToClient.h
new file mode 100644
index 00000000..6878ff07
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPersistentMessageToClient.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatPersistentMessageToClient.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPersistentMessageToClientData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPersistentMessageToClientData.h
new file mode 100644
index 00000000..9ea7ea3d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPersistentMessageToClientData.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatPersistentMessageToClientData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPersistentMessageToClientDataArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPersistentMessageToClientDataArchive.h
new file mode 100644
index 00000000..96f1abf6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPersistentMessageToClientDataArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatPersistentMessageToClientDataArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPersistentMessageToServer.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPersistentMessageToServer.h
new file mode 100644
index 00000000..b5e58db5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPersistentMessageToServer.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatPersistentMessageToServer.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPutAvatarInRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPutAvatarInRoom.h
new file mode 100644
index 00000000..93b76f49
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatPutAvatarInRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatPutAvatarInRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatQueryRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatQueryRoom.h
new file mode 100644
index 00000000..3819c9b6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatQueryRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatQueryRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatQueryRoomResults.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatQueryRoomResults.h
new file mode 100644
index 00000000..9ca37460
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatQueryRoomResults.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatQueryRoomResults.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRemoveAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRemoveAvatarFromRoom.h
new file mode 100644
index 00000000..a93fa807
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRemoveAvatarFromRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatRemoveAvatarFromRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRemoveFriend.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRemoveFriend.h
new file mode 100644
index 00000000..1ec26dc6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRemoveFriend.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatRemoveFriend.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRemoveModeratorFromRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRemoveModeratorFromRoom.h
new file mode 100644
index 00000000..5bb37802
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRemoveModeratorFromRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatRemoveModeratorFromRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRequestLog.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRequestLog.h
new file mode 100644
index 00000000..f02577d7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRequestLog.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatRequestLog.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRequestPersistentMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRequestPersistentMessage.h
new file mode 100644
index 00000000..b92d5728
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRequestPersistentMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatRequestPersistentMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRequestRoomList.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRequestRoomList.h
new file mode 100644
index 00000000..13a47dff
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRequestRoomList.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatRequestRoomList.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRoomData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRoomData.h
new file mode 100644
index 00000000..4d65a223
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRoomData.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatRoomData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRoomDataArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRoomDataArchive.h
new file mode 100644
index 00000000..9626e910
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRoomDataArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatRoomDataArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRoomList.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRoomList.h
new file mode 100644
index 00000000..ab0e73fa
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRoomList.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatRoomList.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRoomMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRoomMessage.h
new file mode 100644
index 00000000..9ed1e9ab
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatRoomMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatRoomMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatSendToRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatSendToRoom.h
new file mode 100644
index 00000000..2b45eb86
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatSendToRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatSendToRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatServerStatus.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatServerStatus.h
new file mode 100644
index 00000000..84c5e5a2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatServerStatus.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatServerStatus.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatSystemMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatSystemMessage.h
new file mode 100644
index 00000000..442324ea
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatSystemMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatSystemMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatUnbanAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatUnbanAvatarFromRoom.h
new file mode 100644
index 00000000..b4204fc5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatUnbanAvatarFromRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatUnbanAvatarFromRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatUninviteFromRoom.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatUninviteFromRoom.h
new file mode 100644
index 00000000..c09b4528
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ChatUninviteFromRoom.h
@@ -0,0 +1 @@
+#include "../../src/shared/chat/ChatUninviteFromRoom.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientCentralMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientCentralMessages.h
new file mode 100644
index 00000000..fa6e860b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientCentralMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ClientCentralMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientEffectMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientEffectMessages.h
new file mode 100644
index 00000000..2ec102bf
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientEffectMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ClientEffectMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientLoginMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientLoginMessages.h
new file mode 100644
index 00000000..caf974e0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientLoginMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientLoginServer/ClientLoginMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientMfdStatusUpdateMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientMfdStatusUpdateMessage.h
new file mode 100644
index 00000000..f53f3d6a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientMfdStatusUpdateMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ClientMfdStatusUpdateMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientNotificationBoxMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientNotificationBoxMessage.h
new file mode 100644
index 00000000..9a2ddb62
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientNotificationBoxMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/ClientNotificationBoxMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientOpenContainerMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientOpenContainerMessage.h
new file mode 100644
index 00000000..7c64b13c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientOpenContainerMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ClientOpenContainerMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientPermissionsMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientPermissionsMessage.h
new file mode 100644
index 00000000..d31c2f7c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClientPermissionsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ClientPermissionsMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CloseHolocronMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CloseHolocronMessage.h
new file mode 100644
index 00000000..25dd04fb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CloseHolocronMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/CloseHolocronMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataGetElementMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataGetElementMessage.h
new file mode 100644
index 00000000..61c72c40
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataGetElementMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/ClusterWideDataGetElementMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataGetElementResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataGetElementResponseMessage.h
new file mode 100644
index 00000000..622d960e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataGetElementResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/ClusterWideDataGetElementResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataReleaseLockMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataReleaseLockMessage.h
new file mode 100644
index 00000000..155028c8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataReleaseLockMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/ClusterWideDataReleaseLockMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataRemoveElementMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataRemoveElementMessage.h
new file mode 100644
index 00000000..9fbbcc00
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataRemoveElementMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/ClusterWideDataRemoveElementMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataUpdateDictionaryMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataUpdateDictionaryMessage.h
new file mode 100644
index 00000000..b0a9ddbf
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ClusterWideDataUpdateDictionaryMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/ClusterWideDataUpdateDictionaryMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CommandChannelMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CommandChannelMessages.h
new file mode 100644
index 00000000..bfb17a1e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CommandChannelMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/CommandChannelMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ConnectPlayerMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ConnectPlayerMessage.h
new file mode 100644
index 00000000..46f593d8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ConnectPlayerMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/ConnectPlayerMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ConnectPlayerResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ConnectPlayerResponseMessage.h
new file mode 100644
index 00000000..cff9a9cb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ConnectPlayerResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/ConnectPlayerResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ConsentResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ConsentResponseMessage.h
new file mode 100644
index 00000000..1fb8b4c6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ConsentResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ConsentResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ConsoleChannelMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ConsoleChannelMessages.h
new file mode 100644
index 00000000..ae14c448
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ConsoleChannelMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ConsoleChannelMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ControllerMessageFactory.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ControllerMessageFactory.h
new file mode 100644
index 00000000..c08ae352
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ControllerMessageFactory.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ControllerMessageFactory.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ControllerMessageMacros.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ControllerMessageMacros.h
new file mode 100644
index 00000000..3d6fb5c7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ControllerMessageMacros.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/core/ControllerMessageMacros.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateAuctionMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateAuctionMessage.h
new file mode 100644
index 00000000..bc71029c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/CreateAuctionMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateAuctionResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateAuctionResponseMessage.h
new file mode 100644
index 00000000..691545e7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateAuctionResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/CreateAuctionResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateClientPathMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateClientPathMessage.h
new file mode 100644
index 00000000..da5d76e3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateClientPathMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/CreateClientPathMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateImmediateAuctionMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateImmediateAuctionMessage.h
new file mode 100644
index 00000000..1441759e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateImmediateAuctionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/CreateImmediateAuctionMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateMissileMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateMissileMessage.h
new file mode 100644
index 00000000..812ac344
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateMissileMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/clientGameServer/CreateMissileMessage.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateNebulaLightningMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateNebulaLightningMessage.h
new file mode 100644
index 00000000..9baa30d1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateNebulaLightningMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/CreateNebulaLightningMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateProjectileMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateProjectileMessage.h
new file mode 100644
index 00000000..978a5010
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateProjectileMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/clientGameServer/CreateProjectileMessage.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateTicketMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateTicketMessage.h
new file mode 100644
index 00000000..2bd2a13e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateTicketMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/CreateTicketMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateTicketResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateTicketResponseMessage.h
new file mode 100644
index 00000000..73e465aa
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CreateTicketResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/CreateTicketResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceCategory.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceCategory.h
new file mode 100644
index 00000000..8a255039
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceCategory.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/CustomerServiceCategory.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceCategoryArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceCategoryArchive.h
new file mode 100644
index 00000000..f58f180c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceCategoryArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/CustomerServiceCategoryArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceComment.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceComment.h
new file mode 100644
index 00000000..4902258c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceComment.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/CustomerServiceComment.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceCommentArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceCommentArchive.h
new file mode 100644
index 00000000..83e240cd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceCommentArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/CustomerServiceCommentArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceSearchResult.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceSearchResult.h
new file mode 100644
index 00000000..f2f81868
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceSearchResult.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/CustomerServiceSearchResult.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceSearchResultArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceSearchResultArchive.h
new file mode 100644
index 00000000..86e1c729
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceSearchResultArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/CustomerServiceSearchResultArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceTicket.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceTicket.h
new file mode 100644
index 00000000..554685d0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceTicket.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/CustomerServiceTicket.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceTicketArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceTicketArchive.h
new file mode 100644
index 00000000..deeb1b8d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/CustomerServiceTicketArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/CustomerServiceTicketArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DeleteCharacterMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DeleteCharacterMessage.h
new file mode 100644
index 00000000..6b180203
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DeleteCharacterMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/DeleteCharacterMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DeleteCharacterReplyMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DeleteCharacterReplyMessage.h
new file mode 100644
index 00000000..5a4254a7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DeleteCharacterReplyMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/DeleteCharacterReplyMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DeltasMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DeltasMessage.h
new file mode 100644
index 00000000..33eee49a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DeltasMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/DeltasMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DestroyClientPathMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DestroyClientPathMessage.h
new file mode 100644
index 00000000..10dcf735
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DestroyClientPathMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/DestroyClientPathMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DestroyShipComponentMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DestroyShipComponentMessage.h
new file mode 100644
index 00000000..7f4e5c44
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DestroyShipComponentMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/DestroyShipComponentMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DestroyShipMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DestroyShipMessage.h
new file mode 100644
index 00000000..ada184df
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DestroyShipMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/DestroyShipMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DisconnectPlayerMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DisconnectPlayerMessage.h
new file mode 100644
index 00000000..b0e8e822
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DisconnectPlayerMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/DisconnectPlayerMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DisconnectPlayerResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DisconnectPlayerResponseMessage.h
new file mode 100644
index 00000000..195aa235
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DisconnectPlayerResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/DisconnectPlayerResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DroidCommandProgrammingMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DroidCommandProgrammingMessage.h
new file mode 100644
index 00000000..e39d6a32
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/DroidCommandProgrammingMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/DroidCommandProgrammingMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EditAppearanceMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EditAppearanceMessage.h
new file mode 100644
index 00000000..725db3f7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EditAppearanceMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/EditAppearanceMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EditStatsMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EditStatsMessage.h
new file mode 100644
index 00000000..e8b00c1f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EditStatsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/EditStatsMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EnterStructurePlacementModeMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EnterStructurePlacementModeMessage.h
new file mode 100644
index 00000000..419f27f1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EnterStructurePlacementModeMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/EnterStructurePlacementModeMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EnterTicketPurchaseModeMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EnterTicketPurchaseModeMessage.h
new file mode 100644
index 00000000..d5fd1f5e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EnterTicketPurchaseModeMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/EnterTicketPurchaseModeMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EnvironmentalHitData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EnvironmentalHitData.h
new file mode 100644
index 00000000..d3e12ac9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/EnvironmentalHitData.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/EnvironmentalHitData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ErrorMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ErrorMessage.h
new file mode 100644
index 00000000..60102cf7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ErrorMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/ErrorMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ExpertiseRequestMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ExpertiseRequestMessage.h
new file mode 100644
index 00000000..7aae3b7a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ExpertiseRequestMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ExpertiseRequestMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/FactionRequestMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/FactionRequestMessage.h
new file mode 100644
index 00000000..57ba687e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/FactionRequestMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/FactionRequestMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/FactionResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/FactionResponseMessage.h
new file mode 100644
index 00000000..b0233584
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/FactionResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/FactionResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/FirstSharedNetworkMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/FirstSharedNetworkMessages.h
new file mode 100644
index 00000000..cb172f8f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/FirstSharedNetworkMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/FirstSharedNetworkMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/FrameEndMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/FrameEndMessage.h
new file mode 100644
index 00000000..5eb86340
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/FrameEndMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/common/FrameEndMessage.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GalaxyLoopTimesResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GalaxyLoopTimesResponse.h
new file mode 100644
index 00000000..721d7fa5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GalaxyLoopTimesResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/GalaxyLoopTimesResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GameNetworkMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GameNetworkMessage.h
new file mode 100644
index 00000000..7d09f727
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GameNetworkMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/GameNetworkMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GameServerStatus.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GameServerStatus.h
new file mode 100644
index 00000000..7ba6a610
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GameServerStatus.h
@@ -0,0 +1 @@
+#include "../../src/shared/planetWatch/GameServerStatus.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GenericValueTypeMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GenericValueTypeMessage.h
new file mode 100644
index 00000000..63c583df
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GenericValueTypeMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/GenericValueTypeMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetArticleMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetArticleMessage.h
new file mode 100644
index 00000000..a40e0299
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetArticleMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/GetArticleMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetArticleResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetArticleResponseMessage.h
new file mode 100644
index 00000000..a417f027
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetArticleResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/GetArticleResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetAuctionDetails.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetAuctionDetails.h
new file mode 100644
index 00000000..423a8f2e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetAuctionDetails.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/GetAuctionDetails.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetAuctionDetailsResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetAuctionDetailsResponse.h
new file mode 100644
index 00000000..f954e86a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetAuctionDetailsResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/GetAuctionDetailsResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetCommentsMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetCommentsMessage.h
new file mode 100644
index 00000000..fdda704f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetCommentsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/GetCommentsMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetCommentsResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetCommentsResponseMessage.h
new file mode 100644
index 00000000..53b37662
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetCommentsResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/GetCommentsResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetMapLocationsMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetMapLocationsMessage.h
new file mode 100644
index 00000000..98e96c0f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetMapLocationsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/GetMapLocationsMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetMapLocationsResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetMapLocationsResponseMessage.h
new file mode 100644
index 00000000..ed1d2618
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetMapLocationsResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/GetMapLocationsResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetTicketsMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetTicketsMessage.h
new file mode 100644
index 00000000..e6984928
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetTicketsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/GetTicketsMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetTicketsResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetTicketsResponseMessage.h
new file mode 100644
index 00000000..0e4080fa
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GetTicketsResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/GetTicketsResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GrantCommand.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GrantCommand.h
new file mode 100644
index 00000000..e92f9f74
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GrantCommand.h
@@ -0,0 +1 @@
+#include "../../src/shared/GrantCommand.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GrantSkill.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GrantSkill.h
new file mode 100644
index 00000000..68582a87
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GrantSkill.h
@@ -0,0 +1 @@
+#include "../../src/shared/GrantSkill.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GuildRequestMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GuildRequestMessage.h
new file mode 100644
index 00000000..32a2cce3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GuildRequestMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/GuildRequestMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GuildResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GuildResponseMessage.h
new file mode 100644
index 00000000..2e036e22
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/GuildResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/GuildResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/HeartBeat.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/HeartBeat.h
new file mode 100644
index 00000000..48603666
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/HeartBeat.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/HeartBeat.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/HyperspaceMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/HyperspaceMessage.h
new file mode 100644
index 00000000..373429f8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/HyperspaceMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/clientGameServer/HyperspaceMessage.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ImageDesignChangeMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ImageDesignChangeMessage.h
new file mode 100644
index 00000000..765cc842
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ImageDesignChangeMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ImageDesignChangeMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ImageDesignStartMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ImageDesignStartMessage.h
new file mode 100644
index 00000000..c1d7b1f3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ImageDesignStartMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ImageDesignStartMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorCommitMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorCommitMessage.h
new file mode 100644
index 00000000..ef04414d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorCommitMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/IncubatorCommitMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorStartMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorStartMessage.h
new file mode 100644
index 00000000..00f63b4d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IncubatorStartMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/IncubatorStartMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IsVendorOwnerMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IsVendorOwnerMessage.h
new file mode 100644
index 00000000..75f17400
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IsVendorOwnerMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/IsVendorOwnerMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IsVendorOwnerResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IsVendorOwnerResponseMessage.h
new file mode 100644
index 00000000..d5095607
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/IsVendorOwnerResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/IsVendorOwnerResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LogMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LogMessage.h
new file mode 100644
index 00000000..e5e8bbe3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LogMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/LogMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LoginClusterStatus.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LoginClusterStatus.h
new file mode 100644
index 00000000..4d3077b2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LoginClusterStatus.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientLoginServer/LoginClusterStatus.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LoginClusterStatusEx.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LoginClusterStatusEx.h
new file mode 100644
index 00000000..8941dce9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LoginClusterStatusEx.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientLoginServer/LoginClusterStatusEx.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LoginEnumCluster.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LoginEnumCluster.h
new file mode 100644
index 00000000..472507d2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LoginEnumCluster.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientLoginServer/LoginEnumCluster.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LogoutMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LogoutMessage.h
new file mode 100644
index 00000000..5137b296
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/LogoutMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/clientGameServer/LogoutMessage.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MapLocation.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MapLocation.h
new file mode 100644
index 00000000..a4c103cf
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MapLocation.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MapLocation.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MapLocationArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MapLocationArchive.h
new file mode 100644
index 00000000..26b03605
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MapLocationArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MapLocationArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueChangeRoleIconChoice.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueChangeRoleIconChoice.h
new file mode 100644
index 00000000..88eda51a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueChangeRoleIconChoice.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueChangeRoleIconChoice.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCombatCommand.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCombatCommand.h
new file mode 100644
index 00000000..23679c54
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCombatCommand.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCombatCommand.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCombatSpam.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCombatSpam.h
new file mode 100644
index 00000000..9be9abe2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCombatSpam.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCombatSpam.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCombatSpamArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCombatSpamArchive.h
new file mode 100644
index 00000000..a18f3ba1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCombatSpamArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCombatSpamArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCommandQueueEnqueue.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCommandQueueEnqueue.h
new file mode 100644
index 00000000..6da0e4b8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCommandQueueEnqueue.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCommandQueueEnqueue.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCommandQueueRemove.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCommandQueueRemove.h
new file mode 100644
index 00000000..84feae41
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCommandQueueRemove.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/clientGameServer/MessageQueueCommandQueueRemove.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCommandTimer.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCommandTimer.h
new file mode 100644
index 00000000..f8e12670
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCommandTimer.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/MessageQueueCommandTimer.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftCustomization.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftCustomization.h
new file mode 100644
index 00000000..ee66785e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftCustomization.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/clientGameServer/MessageQueueCraftCustomization.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftEmptySlot.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftEmptySlot.h
new file mode 100644
index 00000000..2e1cd070
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftEmptySlot.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCraftEmptySlot.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftExperiment.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftExperiment.h
new file mode 100644
index 00000000..cb07f0fa
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftExperiment.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCraftExperiment.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftFillSlot.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftFillSlot.h
new file mode 100644
index 00000000..d5886252
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftFillSlot.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCraftFillSlot.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftIngredients.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftIngredients.h
new file mode 100644
index 00000000..2a39427b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftIngredients.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCraftIngredients.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftRequestSession.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftRequestSession.h
new file mode 100644
index 00000000..ca29eac0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftRequestSession.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCraftRequestSession.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftSelectSchematic.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftSelectSchematic.h
new file mode 100644
index 00000000..2f7702f4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCraftSelectSchematic.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCraftSelectSchematic.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCreateSaga.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCreateSaga.h
new file mode 100644
index 00000000..bc739f21
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCreateSaga.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCreateSaga.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCyberneticsChangeRequest.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCyberneticsChangeRequest.h
new file mode 100644
index 00000000..8226d0a3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCyberneticsChangeRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCyberneticsChangeRequest.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCyberneticsOpen.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCyberneticsOpen.h
new file mode 100644
index 00000000..0783a7d5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueCyberneticsOpen.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueCyberneticsOpen.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDataTransform.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDataTransform.h
new file mode 100644
index 00000000..e2a40a43
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDataTransform.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueDataTransform.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDataTransformWithParent.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDataTransformWithParent.h
new file mode 100644
index 00000000..8cf8f612
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDataTransformWithParent.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueDataTransformWithParent.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSchematics.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSchematics.h
new file mode 100644
index 00000000..9e88f57a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSchematics.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueDraftSchematics.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSchematicsData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSchematicsData.h
new file mode 100644
index 00000000..840ea3b5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSchematicsData.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueDraftSchematicsData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlots.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlots.h
new file mode 100644
index 00000000..83de769d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlots.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueDraftSlots.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsData.h
new file mode 100644
index 00000000..98732d82
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsData.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueDraftSlotsData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsDataArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsDataArchive.h
new file mode 100644
index 00000000..1279f43b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsDataArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueDraftSlotsDataArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsDataOption.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsDataOption.h
new file mode 100644
index 00000000..230096e8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsDataOption.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueDraftSlotsDataOption.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsDataOptionArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsDataOptionArchive.h
new file mode 100644
index 00000000..3e8f2e57
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsDataOptionArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueDraftSlotsDataOptionArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsQueryResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsQueryResponse.h
new file mode 100644
index 00000000..4ff38040
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueDraftSlotsQueryResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGeneric.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGeneric.h
new file mode 100644
index 00000000..d0bacb00
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGeneric.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueGeneric.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericIntResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericIntResponse.h
new file mode 100644
index 00000000..8b97da4c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericIntResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueGenericIntResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericIntResponseArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericIntResponseArchive.h
new file mode 100644
index 00000000..298693a1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericIntResponseArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueGenericIntResponseArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericResponse.h
new file mode 100644
index 00000000..62074e16
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueGenericResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericResponseArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericResponseArchive.h
new file mode 100644
index 00000000..11f6aea0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericResponseArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueGenericResponseArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericString.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericString.h
new file mode 100644
index 00000000..adfd4373
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericString.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueGenericString.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericValueType.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericValueType.h
new file mode 100644
index 00000000..11fdc8f7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueGenericValueType.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/MessageQueueGenericValueType.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueHarvesterResourceData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueHarvesterResourceData.h
new file mode 100644
index 00000000..72f1dc81
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueHarvesterResourceData.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueHarvesterResourceData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionCreateRequest.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionCreateRequest.h
new file mode 100644
index 00000000..22a83758
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionCreateRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionCreateRequest.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionCreateRequestData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionCreateRequestData.h
new file mode 100644
index 00000000..887eb2ce
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionCreateRequestData.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionCreateRequestData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionCreateRequestDataArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionCreateRequestDataArchive.h
new file mode 100644
index 00000000..ca3c4024
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionCreateRequestDataArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionCreateRequestDataArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionDetailsRequest.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionDetailsRequest.h
new file mode 100644
index 00000000..d77cd1d5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionDetailsRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionDetailsRequest.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionDetailsResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionDetailsResponse.h
new file mode 100644
index 00000000..8973837f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionDetailsResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionDetailsResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionDetailsResponseData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionDetailsResponseData.h
new file mode 100644
index 00000000..14eeb277
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionDetailsResponseData.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionDetailsResponseData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionDetailsResponseDataArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionDetailsResponseDataArchive.h
new file mode 100644
index 00000000..a33a4eb5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionDetailsResponseDataArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionDetailsResponseDataArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionGenericRequest.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionGenericRequest.h
new file mode 100644
index 00000000..df8814d9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionGenericRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionGenericRequest.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionGenericRequestArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionGenericRequestArchive.h
new file mode 100644
index 00000000..2d586026
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionGenericRequestArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionGenericRequestArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionGenericResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionGenericResponse.h
new file mode 100644
index 00000000..7cc9c158
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionGenericResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionGenericResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionGenericResponseArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionGenericResponseArchive.h
new file mode 100644
index 00000000..9105d102
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionGenericResponseArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionGenericResponseArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListRequest.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListRequest.h
new file mode 100644
index 00000000..8943ed99
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionListRequest.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListResponse.h
new file mode 100644
index 00000000..84c552fd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionListResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListResponseArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListResponseArchive.h
new file mode 100644
index 00000000..d464497f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListResponseArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionListResponseArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListResponseData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListResponseData.h
new file mode 100644
index 00000000..db38527d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListResponseData.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionListResponseData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListResponseDataArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListResponseDataArchive.h
new file mode 100644
index 00000000..3cc46cf9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueMissionListResponseDataArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueMissionListResponseDataArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueNetworkId.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueNetworkId.h
new file mode 100644
index 00000000..9ae22066
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueNetworkId.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueNetworkId.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueNetworkIdAndTransform.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueNetworkIdAndTransform.h
new file mode 100644
index 00000000..349507bd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueNetworkIdAndTransform.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/MessageQueueNetworkIdAndTransform.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueNetworkIdPair.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueNetworkIdPair.h
new file mode 100644
index 00000000..e5120ccc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueNetworkIdPair.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueNetworkIdPair.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueNpcConversationMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueNpcConversationMessage.h
new file mode 100644
index 00000000..4f145b49
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueNpcConversationMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueNpcConversationMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueObjectMenuRequest.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueObjectMenuRequest.h
new file mode 100644
index 00000000..1e3b86a1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueObjectMenuRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueObjectMenuRequest.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueOpponentInfo.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueOpponentInfo.h
new file mode 100644
index 00000000..044884b3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueOpponentInfo.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueOpponentInfo.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueuePosture.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueuePosture.h
new file mode 100644
index 00000000..81799f73
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueuePosture.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueuePosture.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueuePushCreature.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueuePushCreature.h
new file mode 100644
index 00000000..b7a3d3fb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueuePushCreature.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueuePushCreature.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueQuestTaskCounterMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueQuestTaskCounterMessage.h
new file mode 100644
index 00000000..6015903b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueQuestTaskCounterMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueQuestTaskCounterMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueQuestTaskLocationMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueQuestTaskLocationMessage.h
new file mode 100644
index 00000000..7b837f41
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueQuestTaskLocationMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueQuestTaskLocationMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueQuestTaskTimerMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueQuestTaskTimerMessage.h
new file mode 100644
index 00000000..0c0cbe2f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueQuestTaskTimerMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueQuestTaskTimerMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueResourceEmptyHopper.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueResourceEmptyHopper.h
new file mode 100644
index 00000000..36b3b7d3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueResourceEmptyHopper.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueResourceEmptyHopper.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueResourceEmptyHopperArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueResourceEmptyHopperArchive.h
new file mode 100644
index 00000000..79511704
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueResourceEmptyHopperArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueResourceWeights.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueResourceWeights.h
new file mode 100644
index 00000000..66b42fe7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueResourceWeights.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueResourceWeights.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSecureTrade.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSecureTrade.h
new file mode 100644
index 00000000..3c6452cd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSecureTrade.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueSecureTrade.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSelectCurrentWorkingSkill.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSelectCurrentWorkingSkill.h
new file mode 100644
index 00000000..98f3bcae
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSelectCurrentWorkingSkill.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSelectProfessionTemplate.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSelectProfessionTemplate.h
new file mode 100644
index 00000000..ea477194
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSelectProfessionTemplate.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueSelectProfessionTemplate.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShipHit.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShipHit.h
new file mode 100644
index 00000000..3f22321b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShipHit.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueShipHit.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShowCombatText.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShowCombatText.h
new file mode 100644
index 00000000..24750954
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShowCombatText.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueShowCombatText.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShowCombatTextArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShowCombatTextArchive.h
new file mode 100644
index 00000000..023663ef
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShowCombatTextArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueShowCombatTextArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShowFlyText.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShowFlyText.h
new file mode 100644
index 00000000..f2fa2d9a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShowFlyText.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueShowFlyText.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShowFlyTextArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShowFlyTextArchive.h
new file mode 100644
index 00000000..80d079dd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueShowFlyTextArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueShowFlyTextArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSitOnObject.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSitOnObject.h
new file mode 100644
index 00000000..44d8b756
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSitOnObject.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueSitOnObject.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSitOnObjectArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSitOnObjectArchive.h
new file mode 100644
index 00000000..be7a9e8d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSitOnObjectArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueSitOnObjectArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSlowDownEffect.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSlowDownEffect.h
new file mode 100644
index 00000000..8a69d1e6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSlowDownEffect.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/clientGameServer/MessageQueueSlowDownEffect.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSocial.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSocial.h
new file mode 100644
index 00000000..15dba5fa
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSocial.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueSocial.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSocialArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSocialArchive.h
new file mode 100644
index 00000000..4aec9e38
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSocialArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueSocialArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSpaceMiningSellResource.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSpaceMiningSellResource.h
new file mode 100644
index 00000000..bafdf11c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSpaceMiningSellResource.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueSpaceMiningSellResource.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSpatialChat.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSpatialChat.h
new file mode 100644
index 00000000..c2037340
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSpatialChat.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueSpatialChat.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSpatialChatArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSpatialChatArchive.h
new file mode 100644
index 00000000..7c7c7fa7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueSpatialChatArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueSpatialChatArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueStartNpcConversation.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueStartNpcConversation.h
new file mode 100644
index 00000000..768be407
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueStartNpcConversation.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueStartNpcConversation.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueStopNpcConversation.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueStopNpcConversation.h
new file mode 100644
index 00000000..47ddac8d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueStopNpcConversation.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueStopNpcConversation.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueString.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueString.h
new file mode 100644
index 00000000..3b16d7a2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueString.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueString.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueStringList.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueStringList.h
new file mode 100644
index 00000000..6f92bedf
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueStringList.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueStringList.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueTeleportAck.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueTeleportAck.h
new file mode 100644
index 00000000..737158e7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueTeleportAck.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageQueueTeleportAck.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueUpdateShipOnCollision.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueUpdateShipOnCollision.h
new file mode 100644
index 00000000..6dd28211
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageQueueUpdateShipOnCollision.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/MessageQueueUpdateShipOnCollision.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageRegionListCircleResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageRegionListCircleResponse.h
new file mode 100644
index 00000000..c87fe44e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageRegionListCircleResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageRegionListCircleResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageRegionListRectResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageRegionListRectResponse.h
new file mode 100644
index 00000000..d4f7feba
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageRegionListRectResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageRegionListRectResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageRegionListRequest.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageRegionListRequest.h
new file mode 100644
index 00000000..0cf27608
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageRegionListRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageRegionListRectRequest.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageRegionListResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageRegionListResponse.h
new file mode 100644
index 00000000..d1a8c086
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/MessageRegionListResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/MessageRegionListResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NameErrors.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NameErrors.h
new file mode 100644
index 00000000..aa9f73f3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NameErrors.h
@@ -0,0 +1 @@
+#include "../../src/shared/NameErrors.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NebulaLightningData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NebulaLightningData.h
new file mode 100644
index 00000000..cf8ca458
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NebulaLightningData.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/NebulaLightningData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NebulaLightningHitData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NebulaLightningHitData.h
new file mode 100644
index 00000000..076da195
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NebulaLightningHitData.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/NebulaLightningHitData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NetworkMessageFactory.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NetworkMessageFactory.h
new file mode 100644
index 00000000..c40d8023
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NetworkMessageFactory.h
@@ -0,0 +1 @@
+#include "../../src/shared/NetworkMessageFactory.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NetworkStringIds.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NetworkStringIds.h
new file mode 100644
index 00000000..09cf8781
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NetworkStringIds.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/NetworkStringIds.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewTicketActivityMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewTicketActivityMessage.h
new file mode 100644
index 00000000..e293e779
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewTicketActivityMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/NewTicketActivityMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewTicketActivityResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewTicketActivityResponseMessage.h
new file mode 100644
index 00000000..fb2893a7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewTicketActivityResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/NewTicketActivityResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialEnableHudElement.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialEnableHudElement.h
new file mode 100644
index 00000000..92af6060
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialEnableHudElement.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/NewbieTutorialEnableHudElement.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialEnableInterfaceElement.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialEnableInterfaceElement.h
new file mode 100644
index 00000000..6f074229
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialEnableInterfaceElement.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/NewbieTutorialEnableInterfaceElement.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialHighlightUIElement.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialHighlightUIElement.h
new file mode 100644
index 00000000..1b9bc04c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialHighlightUIElement.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/NewbieTutorialHighlightUIElement.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialRequest.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialRequest.h
new file mode 100644
index 00000000..0e43673f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/NewbieTutorialRequest.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialResponse.h
new file mode 100644
index 00000000..d97a2d23
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/NewbieTutorialResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialSetToolbarElement.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialSetToolbarElement.h
new file mode 100644
index 00000000..c8f8b5fc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/NewbieTutorialSetToolbarElement.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/NewbieTutorialSetToolbarElement.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ObjectChannelMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ObjectChannelMessages.h
new file mode 100644
index 00000000..cebd947c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ObjectChannelMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ObjectChannelMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ObjectMenuRequestData.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ObjectMenuRequestData.h
new file mode 100644
index 00000000..124deb16
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ObjectMenuRequestData.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ObjectMenuRequestData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ObjectMenuRequestDataArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ObjectMenuRequestDataArchive.h
new file mode 100644
index 00000000..b46fb3cc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ObjectMenuRequestDataArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ObjectMenuRequestDataArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ObjectMenuSelectMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ObjectMenuSelectMessage.h
new file mode 100644
index 00000000..5b783afc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ObjectMenuSelectMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ObjectMenuSelectMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/OpenHolocronToPageMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/OpenHolocronToPageMessage.h
new file mode 100644
index 00000000..c8393662
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/OpenHolocronToPageMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/OpenHolocronToPageMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ParametersMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ParametersMessage.h
new file mode 100644
index 00000000..89fce53a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ParametersMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ParametersMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlanetNodeStatusMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlanetNodeStatusMessage.h
new file mode 100644
index 00000000..c15c7570
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlanetNodeStatusMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/planetWatch/PlanetNodeStatusMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlanetObjectStatusMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlanetObjectStatusMessage.h
new file mode 100644
index 00000000..30dce391
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlanetObjectStatusMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/planetWatch/PlanetObjectStatusMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlanetTravelPointListRequest.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlanetTravelPointListRequest.h
new file mode 100644
index 00000000..0782d0b7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlanetTravelPointListRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/PlanetTravelPointListRequest.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlanetTravelPointListResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlanetTravelPointListResponse.h
new file mode 100644
index 00000000..315e1ce1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlanetTravelPointListResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/PlanetTravelPointListResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlayCutSceneMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlayCutSceneMessage.h
new file mode 100644
index 00000000..01b086f7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlayCutSceneMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/PlayCutSceneMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlayMusicMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlayMusicMessage.h
new file mode 100644
index 00000000..5a6d2add
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlayMusicMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/PlayMusicMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlayerMoneyRequest.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlayerMoneyRequest.h
new file mode 100644
index 00000000..958a24ea
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlayerMoneyRequest.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/PlayerMoneyRequest.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlayerMoneyResponse.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlayerMoneyResponse.h
new file mode 100644
index 00000000..4c41fa69
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PlayerMoneyResponse.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/PlayerMoneyResponse.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PopulateMissionBrowserMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PopulateMissionBrowserMessage.h
new file mode 100644
index 00000000..ee093022
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/PopulateMissionBrowserMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/PopulateMissionBrowserMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RequestCategoriesMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RequestCategoriesMessage.h
new file mode 100644
index 00000000..cb9aff26
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RequestCategoriesMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/RequestCategoriesMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RequestCategoriesResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RequestCategoriesResponseMessage.h
new file mode 100644
index 00000000..1f00880e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RequestCategoriesResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/RequestCategoriesResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RequestGalaxyLoopTimes.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RequestGalaxyLoopTimes.h
new file mode 100644
index 00000000..c1bee5ef
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RequestGalaxyLoopTimes.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/RequestGalaxyLoopTimes.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ResourceHarvesterActivatePageMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ResourceHarvesterActivatePageMessage.h
new file mode 100644
index 00000000..dbbb68e4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ResourceHarvesterActivatePageMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ResourceHarvesterActivatePageMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RetrieveAuctionItemMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RetrieveAuctionItemMessage.h
new file mode 100644
index 00000000..cdb28e97
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RetrieveAuctionItemMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/RetrieveAuctionItemMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RetrieveAuctionItemResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RetrieveAuctionItemResponseMessage.h
new file mode 100644
index 00000000..f19ebb34
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RetrieveAuctionItemResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/RetrieveAuctionItemResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RevokeCommand.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RevokeCommand.h
new file mode 100644
index 00000000..91c0dd7c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RevokeCommand.h
@@ -0,0 +1 @@
+#include "../../src/shared/RevokeCommand.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RevokeSkill.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RevokeSkill.h
new file mode 100644
index 00000000..aa315758
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/RevokeSkill.h
@@ -0,0 +1 @@
+#include "../../src/shared/RevokeSkill.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SceneChannelMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SceneChannelMessages.h
new file mode 100644
index 00000000..dfac33b0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SceneChannelMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/SceneChannelMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SearchKnowledgeBaseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SearchKnowledgeBaseMessage.h
new file mode 100644
index 00000000..3928e761
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SearchKnowledgeBaseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/SearchKnowledgeBaseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SearchKnowledgeBaseResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SearchKnowledgeBaseResponseMessage.h
new file mode 100644
index 00000000..46807537
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SearchKnowledgeBaseResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/SearchKnowledgeBaseResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SecureTradeMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SecureTradeMessages.h
new file mode 100644
index 00000000..f524014a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SecureTradeMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/SecureTradeMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerInfo.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerInfo.h
new file mode 100644
index 00000000..f3f02030
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerInfo.h
@@ -0,0 +1 @@
+#include "../../src/shared/planetWatch/ServerInfo.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerInfoArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerInfoArchive.h
new file mode 100644
index 00000000..fd49053c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerInfoArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/planetWatch/ServerInfoArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerTimeMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerTimeMessage.h
new file mode 100644
index 00000000..9f7a6b96
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerTimeMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ServerTimeMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerUserInterfaceMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerUserInterfaceMessages.h
new file mode 100644
index 00000000..52037fb5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerUserInterfaceMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ServerUserInterfaceMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerWeatherMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerWeatherMessage.h
new file mode 100644
index 00000000..34760c05
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ServerWeatherMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ServerWeatherMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SetTransformMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SetTransformMessage.h
new file mode 100644
index 00000000..05846f9d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SetTransformMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/common/SetTransformMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SetupSharedNetworkMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SetupSharedNetworkMessages.h
new file mode 100644
index 00000000..498f3be6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SetupSharedNetworkMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/core/SetupSharedNetworkMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ShipDamageMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ShipDamageMessage.h
new file mode 100644
index 00000000..7d6271c8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ShipDamageMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ShipDamageMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ShipDamageMessageArchive.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ShipDamageMessageArchive.h
new file mode 100644
index 00000000..96091c5a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ShipDamageMessageArchive.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ShipDamageMessageArchive.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ShipUpdateTransformCollisionMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ShipUpdateTransformCollisionMessage.h
new file mode 100644
index 00000000..a0b941e2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ShipUpdateTransformCollisionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/ShipUpdateTransformCollisionMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ShipUpdateTransformMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ShipUpdateTransformMessage.h
new file mode 100644
index 00000000..aafebb2d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/ShipUpdateTransformMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/clientGameServer/ShipUpdateTransformMessage.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SlowDownEffectMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SlowDownEffectMessage.h
new file mode 100644
index 00000000..40634320
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SlowDownEffectMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/SlowDownEffectMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/StatMigrationTargetsMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/StatMigrationTargetsMessage.h
new file mode 100644
index 00000000..12b8496c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/StatMigrationTargetsMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/StatMigrationTargetsMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/StomachRequestMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/StomachRequestMessage.h
new file mode 100644
index 00000000..668c723c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/StomachRequestMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/StomachRequestMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SuiCreatePageMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SuiCreatePageMessage.h
new file mode 100644
index 00000000..159cc894
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SuiCreatePageMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/SuiCreatePageMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SuiEventNotification.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SuiEventNotification.h
new file mode 100644
index 00000000..9bda9ff7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SuiEventNotification.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/SuiEventNotification.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SuiUpdatePageMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SuiUpdatePageMessage.h
new file mode 100644
index 00000000..bd81d851
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/SuiUpdatePageMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/SuiUpdatePageMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateCellPermissionMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateCellPermissionMessage.h
new file mode 100644
index 00000000..c38fff3c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateCellPermissionMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/UpdateCellPermissionMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateContainmentMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateContainmentMessage.h
new file mode 100644
index 00000000..d306b699
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateContainmentMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/clientGameServer/UpdateContainmentMessage.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateMissileMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateMissileMessage.h
new file mode 100644
index 00000000..0ddccfa5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateMissileMessage.h
@@ -0,0 +1,2 @@
+#include "../../src/shared/clientGameServer/UpdateMissileMessage.h"
+
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdatePostureMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdatePostureMessage.h
new file mode 100644
index 00000000..9152d5e3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdatePostureMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/UpdatePostureMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdatePvpStatusMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdatePvpStatusMessage.h
new file mode 100644
index 00000000..0f06d559
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdatePvpStatusMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/UpdatePvpStatusMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateTransformMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateTransformMessage.h
new file mode 100644
index 00000000..55f15f59
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateTransformMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/UpdateTransformMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateTransformWithParentMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateTransformWithParentMessage.h
new file mode 100644
index 00000000..aa516706
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/UpdateTransformWithParentMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/UpdateTransformWithParentMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VerifyPlayerNameMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VerifyPlayerNameMessage.h
new file mode 100644
index 00000000..23106339
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VerifyPlayerNameMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/VerifyPlayerNameMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VerifyPlayerNameResponseMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VerifyPlayerNameResponseMessage.h
new file mode 100644
index 00000000..a6b69467
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VerifyPlayerNameResponseMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/customerService/VerifyPlayerNameResponseMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VoiceChatChannelInfo.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VoiceChatChannelInfo.h
new file mode 100644
index 00000000..6fb17006
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VoiceChatChannelInfo.h
@@ -0,0 +1 @@
+#include "../../src/shared/voicechat/VoiceChatChannelInfo.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VoiceChatMiscMessages.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VoiceChatMiscMessages.h
new file mode 100644
index 00000000..f5c260ea
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VoiceChatMiscMessages.h
@@ -0,0 +1 @@
+#include "../../src/shared/voicechat/VoiceChatMiscMessages.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VoiceChatOnGetAccount.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VoiceChatOnGetAccount.h
new file mode 100644
index 00000000..1e58a339
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/VoiceChatOnGetAccount.h
@@ -0,0 +1 @@
+#include "../../src/shared/voicechat/VoiceChatOnGetAccount.h"
diff --git a/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/WhoListMessage.h b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/WhoListMessage.h
new file mode 100644
index 00000000..403de7fc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/include/public/sharedNetworkMessages/WhoListMessage.h
@@ -0,0 +1 @@
+#include "../../src/shared/clientGameServer/WhoListMessage.h"
diff --git a/engine/shared/library/sharedNetworkMessages/src/CMakeLists.txt b/engine/shared/library/sharedNetworkMessages/src/CMakeLists.txt
new file mode 100644
index 00000000..9edd7073
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/CMakeLists.txt
@@ -0,0 +1,712 @@
+
+set(SHARED_SOURCES
+	shared/GrantCommand.cpp
+	shared/GrantCommand.h
+	shared/GrantSkill.cpp
+	shared/GrantSkill.h
+	shared/LogMessage.cpp
+	shared/LogMessage.h
+	shared/NameErrors.cpp
+	shared/NameErrors.h
+	shared/NetworkMessageFactory.cpp
+	shared/NetworkMessageFactory.h
+	shared/RevokeCommand.cpp
+	shared/RevokeCommand.h
+	shared/RevokeSkill.cpp
+	shared/RevokeSkill.h
+
+	shared/chat/ChatAddFriend.cpp
+	shared/chat/ChatAddFriend.h
+	shared/chat/ChatAddModeratorToRoom.cpp
+	shared/chat/ChatAddModeratorToRoom.h
+	shared/chat/ChatAvatarIdArchive.cpp
+	shared/chat/ChatAvatarIdArchive.h
+	shared/chat/ChatAvatarId.cpp
+	shared/chat/ChatAvatarId.h
+	shared/chat/ChatBanAvatarFromRoom.cpp
+	shared/chat/ChatBanAvatarFromRoom.h
+	shared/chat/ChatChangeFriendStatus.cpp
+	shared/chat/ChatChangeFriendStatus.h
+	shared/chat/ChatChangeIgnoreStatus.cpp
+	shared/chat/ChatChangeIgnoreStatus.h
+	shared/chat/ChatCreateRoom.cpp
+	shared/chat/ChatCreateRoom.h
+	shared/chat/ChatDeleteAllPersistentMessages.cpp
+	shared/chat/ChatDeleteAllPersistentMessages.h
+	shared/chat/ChatDeletePersistentMessage.cpp
+	shared/chat/ChatDeletePersistentMessage.h
+	shared/chat/ChatDestroyRoomByName.cpp
+	shared/chat/ChatDestroyRoomByName.h
+	shared/chat/ChatDestroyRoom.cpp
+	shared/chat/ChatDestroyRoom.h
+	shared/chat/ChatEnterRoomById.cpp
+	shared/chat/ChatEnterRoomById.h
+	shared/chat/ChatEnterRoom.cpp
+	shared/chat/ChatEnterRoom.h
+	shared/chat/ChatEnum.h
+	shared/chat/ChatFriendsListUpdate.cpp
+	shared/chat/ChatFriendsListUpdate.h
+	shared/chat/ChatGetFriendsList.cpp
+	shared/chat/ChatGetFriendsList.h
+	shared/chat/ChatGetIgnoreList.cpp
+	shared/chat/ChatGetIgnoreList.h
+	shared/chat/ChatInstantMessageToCharacter.cpp
+	shared/chat/ChatInstantMessageToCharacter.h
+	shared/chat/ChatInstantMessageToClient.cpp
+	shared/chat/ChatInstantMessageToClient.h
+	shared/chat/ChatInviteAvatarToRoom.cpp
+	shared/chat/ChatInviteAvatarToRoom.h
+	shared/chat/ChatInviteGroupMembersToRoom.cpp
+	shared/chat/ChatInviteGroupMembersToRoom.h
+	shared/chat/ChatInviteGroupToRoom.cpp
+	shared/chat/ChatInviteGroupToRoom.h
+	shared/chat/ChatKickAvatarFromRoom.cpp
+	shared/chat/ChatKickAvatarFromRoom.h
+	shared/chat/ChatMessageFromGame.cpp
+	shared/chat/ChatMessageFromGame.h
+	shared/chat/ChatOnAddFriend.cpp
+	shared/chat/ChatOnAddFriend.h
+	shared/chat/ChatOnAddModeratorToRoom.cpp
+	shared/chat/ChatOnAddModeratorToRoom.h
+	shared/chat/ChatOnBanAvatarFromRoom.cpp
+	shared/chat/ChatOnBanAvatarFromRoom.h
+	shared/chat/ChatOnChangeFriendStatus.cpp
+	shared/chat/ChatOnChangeFriendStatus.h
+	shared/chat/ChatOnChangeIgnoreStatus.cpp
+	shared/chat/ChatOnChangeIgnoreStatus.h
+	shared/chat/ChatOnConnectAvatar.cpp
+	shared/chat/ChatOnConnectAvatar.h
+	shared/chat/ChatOnCreateRoom.cpp
+	shared/chat/ChatOnCreateRoom.h
+	shared/chat/ChatOnDeleteAllPersistentMessages.cpp
+	shared/chat/ChatOnDeleteAllPersistentMessages.h
+	shared/chat/ChatOnDestroyRoom.cpp
+	shared/chat/ChatOnDestroyRoom.h
+	shared/chat/ChatOnEnteredRoom.cpp
+	shared/chat/ChatOnEnteredRoom.h
+	shared/chat/ChatOnGetFriendsList.cpp
+	shared/chat/ChatOnGetFriendsList.h
+	shared/chat/ChatOnGetIgnoreList.cpp
+	shared/chat/ChatOnGetIgnoreList.h
+	shared/chat/ChatOnInviteGroupToRoom.cpp
+	shared/chat/ChatOnInviteGroupToRoom.h
+	shared/chat/ChatOnInviteToRoom.cpp
+	shared/chat/ChatOnInviteToRoom.h
+	shared/chat/ChatOnKickAvatarFromRoom.cpp
+	shared/chat/ChatOnKickAvatarFromRoom.h
+	shared/chat/ChatOnLeaveRoom.cpp
+	shared/chat/ChatOnLeaveRoom.h
+	shared/chat/ChatOnReceiveRoomInvitation.cpp
+	shared/chat/ChatOnReceiveRoomInvitation.h
+	shared/chat/ChatOnRemoveModeratorFromRoom.cpp
+	shared/chat/ChatOnRemoveModeratorFromRoom.h
+	shared/chat/ChatOnRequestLog.cpp
+	shared/chat/ChatOnRequestLog.h
+	shared/chat/ChatOnSendInstantMessage.cpp
+	shared/chat/ChatOnSendInstantMessage.h
+	shared/chat/ChatOnSendPersistentMessage.cpp
+	shared/chat/ChatOnSendPersistentMessage.h
+	shared/chat/ChatOnSendRoomInvitation.cpp
+	shared/chat/ChatOnSendRoomInvitation.h
+	shared/chat/ChatOnSendRoomMessage.cpp
+	shared/chat/ChatOnSendRoomMessage.h
+	shared/chat/ChatOnUnbanAvatarFromRoom.cpp
+	shared/chat/ChatOnUnbanAvatarFromRoom.h
+	shared/chat/ChatOnUninviteFromRoom.cpp
+	shared/chat/ChatOnUninviteFromRoom.h
+	shared/chat/ChatPersistentMessageToClient.cpp
+	shared/chat/ChatPersistentMessageToClientDataArchive.cpp
+	shared/chat/ChatPersistentMessageToClientDataArchive.h
+	shared/chat/ChatPersistentMessageToClientData.cpp
+	shared/chat/ChatPersistentMessageToClientData.h
+	shared/chat/ChatPersistentMessageToClient.h
+	shared/chat/ChatPersistentMessageToServer.cpp
+	shared/chat/ChatPersistentMessageToServer.h
+	shared/chat/ChatPutAvatarInRoom.cpp
+	shared/chat/ChatPutAvatarInRoom.h
+	shared/chat/ChatQueryRoom.cpp
+	shared/chat/ChatQueryRoom.h
+	shared/chat/ChatQueryRoomResults.cpp
+	shared/chat/ChatQueryRoomResults.h
+	shared/chat/ChatRemoveAvatarFromRoom.cpp
+	shared/chat/ChatRemoveAvatarFromRoom.h
+	shared/chat/ChatRemoveFriend.cpp
+	shared/chat/ChatRemoveFriend.h
+	shared/chat/ChatRemoveModeratorFromRoom.cpp
+	shared/chat/ChatRemoveModeratorFromRoom.h
+	shared/chat/ChatRequestLog.cpp
+	shared/chat/ChatRequestLog.h
+	shared/chat/ChatRequestPersistentMessage.cpp
+	shared/chat/ChatRequestPersistentMessage.h
+	shared/chat/ChatRequestRoomList.cpp
+	shared/chat/ChatRequestRoomList.h
+	shared/chat/ChatRoomDataArchive.cpp
+	shared/chat/ChatRoomDataArchive.h
+	shared/chat/ChatRoomData.cpp
+	shared/chat/ChatRoomData.h
+	shared/chat/ChatRoomList.cpp
+	shared/chat/ChatRoomList.h
+	shared/chat/ChatRoomMessage.cpp
+	shared/chat/ChatRoomMessage.h
+	shared/chat/ChatSendToRoom.cpp
+	shared/chat/ChatSendToRoom.h
+	shared/chat/ChatServerStatus.cpp
+	shared/chat/ChatServerStatus.h
+	shared/chat/ChatSystemMessage.cpp
+	shared/chat/ChatSystemMessage.h
+	shared/chat/ChatUnbanAvatarFromRoom.cpp
+	shared/chat/ChatUnbanAvatarFromRoom.h
+	shared/chat/ChatUninviteFromRoom.cpp
+	shared/chat/ChatUninviteFromRoom.h
+
+	shared/clientGameServer/AIDebuggingMessages.cpp
+	shared/clientGameServer/AIDebuggingMessages.h
+	shared/clientGameServer/AcceptAuctionMessage.cpp
+	shared/clientGameServer/AcceptAuctionMessage.h
+	shared/clientGameServer/AcceptAuctionResponseMessage.cpp
+	shared/clientGameServer/AcceptAuctionResponseMessage.h
+	shared/clientGameServer/AddMapLocationMessage.cpp
+	shared/clientGameServer/AddMapLocationMessage.h
+	shared/clientGameServer/AddMapLocationResponseMessage.cpp
+	shared/clientGameServer/AddMapLocationResponseMessage.h
+	shared/clientGameServer/AttributeListMessage.cpp
+	shared/clientGameServer/AttributeListMessage.h
+	shared/clientGameServer/AuctionData.h
+	shared/clientGameServer/AuctionErrorCodes.h
+	shared/clientGameServer/AuctionQueryHeadersMessage.cpp
+	shared/clientGameServer/AuctionQueryHeadersMessage.h
+	shared/clientGameServer/AuctionQueryHeadersResponseMessage.cpp
+	shared/clientGameServer/AuctionQueryHeadersResponseMessage.h
+	shared/clientGameServer/AuctionQueryMessage.cpp
+	shared/clientGameServer/AuctionQueryMessage.h
+	shared/clientGameServer/AuctionQueryResponseMessage.cpp
+	shared/clientGameServer/AuctionQueryResponseMessage.h
+	shared/clientGameServer/BidAuctionMessage.cpp
+	shared/clientGameServer/BidAuctionMessage.h
+	shared/clientGameServer/BidAuctionResponseMessage.cpp
+	shared/clientGameServer/BidAuctionResponseMessage.h
+	shared/clientGameServer/BuffBuilderChangeMessage.cpp
+	shared/clientGameServer/BuffBuilderChangeMessage.h
+	shared/clientGameServer/BuffBuilderStartMessage.cpp
+	shared/clientGameServer/BuffBuilderStartMessage.h
+	shared/clientGameServer/CancelLiveAuctionMessage.cpp
+	shared/clientGameServer/CancelLiveAuctionMessage.h
+	shared/clientGameServer/CancelLiveAuctionResponseMessage.cpp
+	shared/clientGameServer/CancelLiveAuctionResponseMessage.h
+	shared/clientGameServer/CharacterSheetResponseMessage.cpp
+	shared/clientGameServer/CharacterSheetResponseMessage.h
+	shared/clientGameServer/ClientCentralMessages.cpp
+	shared/clientGameServer/ClientCentralMessages.h
+	shared/clientGameServer/ClientEffectMessages.cpp
+	shared/clientGameServer/ClientEffectMessages.h
+	shared/clientGameServer/ClientMfdStatusUpdateMessage.cpp
+	shared/clientGameServer/ClientMfdStatusUpdateMessage.h
+	shared/clientGameServer/ClientOpenContainerMessage.cpp
+	shared/clientGameServer/ClientOpenContainerMessage.h
+	shared/clientGameServer/ClientPermissionsMessage.cpp
+	shared/clientGameServer/ClientPermissionsMessage.h
+	shared/clientGameServer/CloseHolocronMessage.cpp
+	shared/clientGameServer/CloseHolocronMessage.h
+	shared/clientGameServer/CommandChannelMessages.cpp
+	shared/clientGameServer/CommandChannelMessages.h
+	shared/clientGameServer/ConsentResponseMessage.cpp
+	shared/clientGameServer/ConsentResponseMessage.h
+	shared/clientGameServer/ConsoleChannelMessages.cpp
+	shared/clientGameServer/ConsoleChannelMessages.h
+	shared/clientGameServer/ControllerMessageFactory.cpp
+	shared/clientGameServer/ControllerMessageFactory.h
+	shared/clientGameServer/CreateAuctionMessage.cpp
+	shared/clientGameServer/CreateAuctionMessage.h
+	shared/clientGameServer/CreateAuctionResponseMessage.cpp
+	shared/clientGameServer/CreateAuctionResponseMessage.h
+	shared/clientGameServer/CreateClientPathMessage.cpp
+	shared/clientGameServer/CreateClientPathMessage.h
+	shared/clientGameServer/CreateImmediateAuctionMessage.cpp
+	shared/clientGameServer/CreateImmediateAuctionMessage.h
+	shared/clientGameServer/CreateMissileMessage.cpp
+	shared/clientGameServer/CreateMissileMessage.h
+	shared/clientGameServer/CreateNebulaLightningMessage.cpp
+	shared/clientGameServer/CreateNebulaLightningMessage.h
+	shared/clientGameServer/CreateProjectileMessage.cpp
+	shared/clientGameServer/CreateProjectileMessage.h
+	shared/clientGameServer/DeleteCharacterMessage.cpp
+	shared/clientGameServer/DeleteCharacterMessage.h
+	shared/clientGameServer/DeleteCharacterReplyMessage.cpp
+	shared/clientGameServer/DeleteCharacterReplyMessage.h
+	shared/clientGameServer/DestroyClientPathMessage.cpp
+	shared/clientGameServer/DestroyClientPathMessage.h
+	shared/clientGameServer/DestroyShipComponentMessage.cpp
+	shared/clientGameServer/DestroyShipComponentMessage.h
+	shared/clientGameServer/DestroyShipMessage.cpp
+	shared/clientGameServer/DestroyShipMessage.h
+	shared/clientGameServer/DroidCommandProgrammingMessage.cpp
+	shared/clientGameServer/DroidCommandProgrammingMessage.h
+	shared/clientGameServer/EditAppearanceMessage.cpp
+	shared/clientGameServer/EditAppearanceMessage.h
+	shared/clientGameServer/EditStatsMessage.cpp
+	shared/clientGameServer/EditStatsMessage.h
+	shared/clientGameServer/EnterStructurePlacementModeMessage.cpp
+	shared/clientGameServer/EnterStructurePlacementModeMessage.h
+	shared/clientGameServer/EnterTicketPurchaseModeMessage.cpp
+	shared/clientGameServer/EnterTicketPurchaseModeMessage.h
+	shared/clientGameServer/ExpertiseRequestMessage.cpp
+	shared/clientGameServer/ExpertiseRequestMessage.h
+	shared/clientGameServer/EnvironmentalHitData.cpp
+	shared/clientGameServer/EnvironmentalHitData.h
+	shared/clientGameServer/FactionRequestMessage.cpp
+	shared/clientGameServer/FactionRequestMessage.h
+	shared/clientGameServer/FactionResponseMessage.cpp
+	shared/clientGameServer/FactionResponseMessage.h
+	shared/clientGameServer/GalaxyLoopTimesResponse.cpp
+	shared/clientGameServer/GalaxyLoopTimesResponse.h
+	shared/clientGameServer/GetAuctionDetails.cpp
+	shared/clientGameServer/GetAuctionDetails.h
+	shared/clientGameServer/GetAuctionDetailsResponse.cpp
+	shared/clientGameServer/GetAuctionDetailsResponse.h
+	shared/clientGameServer/GetMapLocationsMessage.cpp
+	shared/clientGameServer/GetMapLocationsMessage.h
+	shared/clientGameServer/GetMapLocationsResponseMessage.cpp
+	shared/clientGameServer/GetMapLocationsResponseMessage.h
+	shared/clientGameServer/GuildRequestMessage.cpp
+	shared/clientGameServer/GuildRequestMessage.h
+	shared/clientGameServer/GuildResponseMessage.cpp
+	shared/clientGameServer/GuildResponseMessage.h
+	shared/clientGameServer/HeartBeat.cpp
+	shared/clientGameServer/HeartBeat.h
+	shared/clientGameServer/HyperspaceMessage.cpp
+	shared/clientGameServer/HyperspaceMessage.h
+	shared/clientGameServer/ImageDesignChangeMessage.cpp
+	shared/clientGameServer/ImageDesignChangeMessage.h
+	shared/clientGameServer/ImageDesignStartMessage.cpp
+	shared/clientGameServer/ImageDesignStartMessage.h
+	shared/clientGameServer/IncubatorCommitMessage.cpp
+	shared/clientGameServer/IncubatorCommitMessage.h
+	shared/clientGameServer/IncubatorStartMessage.cpp
+	shared/clientGameServer/IncubatorStartMessage.h
+	shared/clientGameServer/IsVendorOwnerMessage.cpp
+	shared/clientGameServer/IsVendorOwnerMessage.h
+	shared/clientGameServer/IsVendorOwnerResponseMessage.cpp
+	shared/clientGameServer/IsVendorOwnerResponseMessage.h
+	shared/clientGameServer/LogoutMessage.cpp
+	shared/clientGameServer/LogoutMessage.h
+	shared/clientGameServer/MapLocation.cpp
+	shared/clientGameServer/MapLocation.h
+	shared/clientGameServer/MapLocationArchive.cpp
+	shared/clientGameServer/MapLocationArchive.h
+	shared/clientGameServer/MessageQueueChangeRoleIconChoice.cpp
+	shared/clientGameServer/MessageQueueChangeRoleIconChoice.h
+	shared/clientGameServer/MessageQueueCombatCommand.cpp
+	shared/clientGameServer/MessageQueueCombatCommand.h
+	shared/clientGameServer/MessageQueueCombatSpam.cpp
+	shared/clientGameServer/MessageQueueCombatSpam.h
+	shared/clientGameServer/MessageQueueCombatSpamArchive.cpp
+	shared/clientGameServer/MessageQueueCombatSpamArchive.h
+	shared/clientGameServer/MessageQueueCommandQueueEnqueue.cpp
+	shared/clientGameServer/MessageQueueCommandQueueEnqueue.h
+	shared/clientGameServer/MessageQueueCommandQueueRemove.cpp
+	shared/clientGameServer/MessageQueueCommandQueueRemove.h
+	shared/clientGameServer/MessageQueueCraftCustomization.cpp
+	shared/clientGameServer/MessageQueueCraftCustomization.h
+	shared/clientGameServer/MessageQueueCraftEmptySlot.cpp
+	shared/clientGameServer/MessageQueueCraftEmptySlot.h
+	shared/clientGameServer/MessageQueueCraftExperiment.cpp
+	shared/clientGameServer/MessageQueueCraftExperiment.h
+	shared/clientGameServer/MessageQueueCraftFillSlot.cpp
+	shared/clientGameServer/MessageQueueCraftFillSlot.h
+	shared/clientGameServer/MessageQueueCraftIngredients.cpp
+	shared/clientGameServer/MessageQueueCraftIngredients.h
+	shared/clientGameServer/MessageQueueCraftRequestSession.cpp
+	shared/clientGameServer/MessageQueueCraftRequestSession.h
+	shared/clientGameServer/MessageQueueCraftSelectSchematic.cpp
+	shared/clientGameServer/MessageQueueCraftSelectSchematic.h
+	shared/clientGameServer/MessageQueueCreateSaga.cpp
+	shared/clientGameServer/MessageQueueCreateSaga.h
+	shared/clientGameServer/MessageQueueCyberneticsOpen.cpp
+	shared/clientGameServer/MessageQueueCyberneticsOpen.h
+	shared/clientGameServer/MessageQueueCyberneticsChangeRequest.cpp
+	shared/clientGameServer/MessageQueueCyberneticsChangeRequest.h
+	shared/clientGameServer/MessageQueueDataTransform.cpp
+	shared/clientGameServer/MessageQueueDataTransform.h
+	shared/clientGameServer/MessageQueueDataTransformWithParent.cpp
+	shared/clientGameServer/MessageQueueDataTransformWithParent.h
+	shared/clientGameServer/MessageQueueDraftSchematics.cpp
+	shared/clientGameServer/MessageQueueDraftSchematics.h
+	shared/clientGameServer/MessageQueueDraftSchematicsData.cpp
+	shared/clientGameServer/MessageQueueDraftSchematicsData.h
+	shared/clientGameServer/MessageQueueDraftSlots.cpp
+	shared/clientGameServer/MessageQueueDraftSlots.h
+	shared/clientGameServer/MessageQueueDraftSlotsData.cpp
+	shared/clientGameServer/MessageQueueDraftSlotsData.h
+	shared/clientGameServer/MessageQueueDraftSlotsDataArchive.cpp
+	shared/clientGameServer/MessageQueueDraftSlotsDataArchive.h
+	shared/clientGameServer/MessageQueueDraftSlotsDataOption.cpp
+	shared/clientGameServer/MessageQueueDraftSlotsDataOption.h
+	shared/clientGameServer/MessageQueueDraftSlotsDataOptionArchive.cpp
+	shared/clientGameServer/MessageQueueDraftSlotsDataOptionArchive.h
+	shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.cpp
+	shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.h
+	shared/clientGameServer/MessageQueueGeneric.cpp
+	shared/clientGameServer/MessageQueueGeneric.h
+	shared/clientGameServer/MessageQueueGenericIntResponse.cpp
+	shared/clientGameServer/MessageQueueGenericIntResponse.h
+	shared/clientGameServer/MessageQueueGenericIntResponseArchive.cpp
+	shared/clientGameServer/MessageQueueGenericIntResponseArchive.h
+	shared/clientGameServer/MessageQueueGenericResponse.cpp
+	shared/clientGameServer/MessageQueueGenericResponse.h
+	shared/clientGameServer/MessageQueueGenericResponseArchive.cpp
+	shared/clientGameServer/MessageQueueGenericResponseArchive.h
+	shared/clientGameServer/MessageQueueGenericString.cpp
+	shared/clientGameServer/MessageQueueGenericString.h
+	shared/clientGameServer/MessageQueueHarvesterResourceData.cpp
+	shared/clientGameServer/MessageQueueHarvesterResourceData.h
+	shared/clientGameServer/MessageQueueMissionCreateRequest.cpp
+	shared/clientGameServer/MessageQueueMissionCreateRequest.h
+	shared/clientGameServer/MessageQueueMissionCreateRequestData.cpp
+	shared/clientGameServer/MessageQueueMissionCreateRequestData.h
+	shared/clientGameServer/MessageQueueMissionCreateRequestDataArchive.cpp
+	shared/clientGameServer/MessageQueueMissionCreateRequestDataArchive.h
+	shared/clientGameServer/MessageQueueMissionDetailsRequest.cpp
+	shared/clientGameServer/MessageQueueMissionDetailsRequest.h
+	shared/clientGameServer/MessageQueueMissionDetailsResponse.cpp
+	shared/clientGameServer/MessageQueueMissionDetailsResponse.h
+	shared/clientGameServer/MessageQueueMissionDetailsResponseData.cpp
+	shared/clientGameServer/MessageQueueMissionDetailsResponseData.h
+	shared/clientGameServer/MessageQueueMissionDetailsResponseDataArchive.cpp
+	shared/clientGameServer/MessageQueueMissionDetailsResponseDataArchive.h
+	shared/clientGameServer/MessageQueueMissionGenericRequest.cpp
+	shared/clientGameServer/MessageQueueMissionGenericRequest.h
+	shared/clientGameServer/MessageQueueMissionGenericRequestArchive.cpp
+	shared/clientGameServer/MessageQueueMissionGenericRequestArchive.h
+	shared/clientGameServer/MessageQueueMissionGenericResponse.cpp
+	shared/clientGameServer/MessageQueueMissionGenericResponse.h
+	shared/clientGameServer/MessageQueueMissionGenericResponseArchive.cpp
+	shared/clientGameServer/MessageQueueMissionGenericResponseArchive.h
+	shared/clientGameServer/MessageQueueMissionListRequest.cpp
+	shared/clientGameServer/MessageQueueMissionListRequest.h
+	shared/clientGameServer/MessageQueueMissionListResponse.cpp
+	shared/clientGameServer/MessageQueueMissionListResponse.h
+	shared/clientGameServer/MessageQueueMissionListResponseArchive.cpp
+	shared/clientGameServer/MessageQueueMissionListResponseArchive.h
+	shared/clientGameServer/MessageQueueMissionListResponseData.cpp
+	shared/clientGameServer/MessageQueueMissionListResponseData.h
+	shared/clientGameServer/MessageQueueMissionListResponseDataArchive.cpp
+	shared/clientGameServer/MessageQueueMissionListResponseDataArchive.h
+	shared/clientGameServer/MessageQueueNetworkId.cpp
+	shared/clientGameServer/MessageQueueNetworkId.h
+	shared/clientGameServer/MessageQueueNetworkIdPair.cpp
+	shared/clientGameServer/MessageQueueNetworkIdPair.h
+	shared/clientGameServer/MessageQueueNpcConversationMessage.cpp
+	shared/clientGameServer/MessageQueueNpcConversationMessage.h
+	shared/clientGameServer/MessageQueueObjectMenuRequest.cpp
+	shared/clientGameServer/MessageQueueObjectMenuRequest.h
+	shared/clientGameServer/MessageQueueOpponentInfo.cpp
+	shared/clientGameServer/MessageQueueOpponentInfo.h
+	shared/clientGameServer/MessageQueuePosture.cpp
+	shared/clientGameServer/MessageQueuePosture.h
+	shared/clientGameServer/MessageQueueQuestTaskCounterMessage.cpp
+	shared/clientGameServer/MessageQueueQuestTaskCounterMessage.h
+	shared/clientGameServer/MessageQueueQuestTaskLocationMessage.cpp
+	shared/clientGameServer/MessageQueueQuestTaskLocationMessage.h
+	shared/clientGameServer/MessageQueueQuestTaskTimerMessage.cpp
+	shared/clientGameServer/MessageQueueQuestTaskTimerMessage.h
+	shared/clientGameServer/MessageQueuePushCreature.cpp
+	shared/clientGameServer/MessageQueuePushCreature.h
+	shared/clientGameServer/MessageQueueResourceEmptyHopper.cpp
+	shared/clientGameServer/MessageQueueResourceEmptyHopper.h
+	shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.cpp
+	shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.h
+	shared/clientGameServer/MessageQueueResourceWeights.cpp
+	shared/clientGameServer/MessageQueueResourceWeights.h
+	shared/clientGameServer/MessageQueueSecureTrade.cpp
+	shared/clientGameServer/MessageQueueSecureTrade.h
+	shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.cpp
+	shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.h
+	shared/clientGameServer/MessageQueueSelectProfessionTemplate.cpp
+	shared/clientGameServer/MessageQueueSelectProfessionTemplate.h
+	shared/clientGameServer/MessageQueueShipHit.cpp 
+	shared/clientGameServer/MessageQueueShipHit.h
+	shared/clientGameServer/MessageQueueShowCombatText.cpp
+	shared/clientGameServer/MessageQueueShowCombatText.h
+	shared/clientGameServer/MessageQueueShowCombatTextArchive.cpp
+	shared/clientGameServer/MessageQueueShowCombatTextArchive.h
+	shared/clientGameServer/MessageQueueShowFlyText.cpp
+	shared/clientGameServer/MessageQueueShowFlyText.h
+	shared/clientGameServer/MessageQueueShowFlyTextArchive.cpp
+	shared/clientGameServer/MessageQueueShowFlyTextArchive.h
+	shared/clientGameServer/MessageQueueSitOnObject.cpp
+	shared/clientGameServer/MessageQueueSitOnObject.h
+	shared/clientGameServer/MessageQueueSitOnObjectArchive.cpp
+	shared/clientGameServer/MessageQueueSitOnObjectArchive.h
+	shared/clientGameServer/MessageQueueSlowDownEffect.cpp
+	shared/clientGameServer/MessageQueueSlowDownEffect.h
+	shared/clientGameServer/MessageQueueSocial.cpp
+	shared/clientGameServer/MessageQueueSocial.h
+	shared/clientGameServer/MessageQueueSocialArchive.cpp
+	shared/clientGameServer/MessageQueueSocialArchive.h
+	shared/clientGameServer/MessageQueueSpaceMiningSellResource.cpp
+	shared/clientGameServer/MessageQueueSpaceMiningSellResource.h
+	shared/clientGameServer/MessageQueueSpatialChat.cpp
+	shared/clientGameServer/MessageQueueSpatialChat.h
+	shared/clientGameServer/MessageQueueSpatialChatArchive.cpp
+	shared/clientGameServer/MessageQueueSpatialChatArchive.h
+	shared/clientGameServer/MessageQueueStartNpcConversation.cpp
+	shared/clientGameServer/MessageQueueStartNpcConversation.h
+	shared/clientGameServer/MessageQueueStopNpcConversation.cpp
+	shared/clientGameServer/MessageQueueStopNpcConversation.h
+	shared/clientGameServer/MessageQueueString.cpp
+	shared/clientGameServer/MessageQueueString.h
+	shared/clientGameServer/MessageQueueStringList.cpp
+	shared/clientGameServer/MessageQueueStringList.h
+	shared/clientGameServer/MessageQueueTeleportAck.cpp
+	shared/clientGameServer/MessageQueueTeleportAck.h
+	shared/clientGameServer/MessageRegionListCircleResponse.cpp
+	shared/clientGameServer/MessageRegionListCircleResponse.h
+	shared/clientGameServer/MessageRegionListRectResponse.cpp
+	shared/clientGameServer/MessageRegionListRectResponse.h
+	shared/clientGameServer/MessageRegionListRequest.cpp
+	shared/clientGameServer/MessageRegionListRequest.h
+	shared/clientGameServer/MessageRegionListResponse.cpp
+	shared/clientGameServer/MessageRegionListResponse.h
+	shared/clientGameServer/NebulaLightningData.cpp
+	shared/clientGameServer/NebulaLightningData.h
+	shared/clientGameServer/NebulaLightningHitData.cpp
+	shared/clientGameServer/NebulaLightningHitData.h
+	shared/clientGameServer/NewbieTutorialEnableHudElement.cpp
+	shared/clientGameServer/NewbieTutorialEnableHudElement.h
+	shared/clientGameServer/NewbieTutorialEnableInterfaceElement.cpp
+	shared/clientGameServer/NewbieTutorialEnableInterfaceElement.h
+	shared/clientGameServer/NewbieTutorialHighlightUIElement.cpp
+	shared/clientGameServer/NewbieTutorialHighlightUIElement.h
+	shared/clientGameServer/NewbieTutorialRequest.cpp
+	shared/clientGameServer/NewbieTutorialRequest.h
+	shared/clientGameServer/NewbieTutorialResponse.cpp
+	shared/clientGameServer/NewbieTutorialResponse.h
+	shared/clientGameServer/NewbieTutorialSetToolbarElement.cpp
+	shared/clientGameServer/NewbieTutorialSetToolbarElement.h
+	shared/clientGameServer/ObjectChannelMessages.cpp
+	shared/clientGameServer/ObjectChannelMessages.h
+	shared/clientGameServer/ObjectMenuRequestData.cpp
+	shared/clientGameServer/ObjectMenuRequestData.h
+	shared/clientGameServer/ObjectMenuRequestDataArchive.h
+	shared/clientGameServer/ObjectMenuSelectMessage.cpp
+	shared/clientGameServer/ObjectMenuSelectMessage.h
+	shared/clientGameServer/OpenHolocronToPageMessage.cpp
+	shared/clientGameServer/OpenHolocronToPageMessage.h
+	shared/clientGameServer/ParametersMessage.cpp
+	shared/clientGameServer/ParametersMessage.h
+	shared/clientGameServer/PlanetTravelPointListRequest.cpp
+	shared/clientGameServer/PlanetTravelPointListRequest.h
+	shared/clientGameServer/PlanetTravelPointListResponse.cpp
+	shared/clientGameServer/PlanetTravelPointListResponse.h
+	shared/clientGameServer/PlayMusicMessage.cpp
+	shared/clientGameServer/PlayMusicMessage.h
+	shared/clientGameServer/PlayCutSceneMessage.cpp
+	shared/clientGameServer/PlayCutSceneMessage.h
+	shared/clientGameServer/PlayerMoneyRequest.cpp
+	shared/clientGameServer/PlayerMoneyRequest.h
+	shared/clientGameServer/PlayerMoneyResponse.cpp
+	shared/clientGameServer/PlayerMoneyResponse.h
+	shared/clientGameServer/PopulateMissionBrowserMessage.cpp
+	shared/clientGameServer/PopulateMissionBrowserMessage.h
+	shared/clientGameServer/RequestGalaxyLoopTimes.cpp
+	shared/clientGameServer/RequestGalaxyLoopTimes.h
+	shared/clientGameServer/ResourceHarvesterActivatePageMessage.cpp
+	shared/clientGameServer/ResourceHarvesterActivatePageMessage.h
+	shared/clientGameServer/RetrieveAuctionItemMessage.cpp
+	shared/clientGameServer/RetrieveAuctionItemMessage.h
+	shared/clientGameServer/RetrieveAuctionItemResponseMessage.cpp
+	shared/clientGameServer/RetrieveAuctionItemResponseMessage.h
+	shared/clientGameServer/SceneChannelMessages.cpp
+	shared/clientGameServer/SceneChannelMessages.h
+	shared/clientGameServer/SecureTradeMessages.cpp
+	shared/clientGameServer/SecureTradeMessages.h
+	shared/clientGameServer/ServerTimeMessage.cpp
+	shared/clientGameServer/ServerTimeMessage.h
+	shared/clientGameServer/ServerUserInterfaceMessages.cpp
+	shared/clientGameServer/ServerUserInterfaceMessages.h
+	shared/clientGameServer/SlowDownEffectMessage.cpp
+	shared/clientGameServer/SlowDownEffectMessage.h
+	shared/clientGameServer/SuiCreatePageMessage.cpp
+	shared/clientGameServer/SuiCreatePageMessage.h
+	shared/clientGameServer/SuiUpdatePageMessage.cpp
+	shared/clientGameServer/SuiUpdatePageMessage.h
+	shared/clientGameServer/SuiEventNotification.cpp
+	shared/clientGameServer/SuiEventNotification.h
+	shared/clientGameServer/ServerWeatherMessage.cpp
+	shared/clientGameServer/ServerWeatherMessage.h
+	shared/clientGameServer/ShipDamageMessage.cpp
+	shared/clientGameServer/ShipDamageMessage.h
+	shared/clientGameServer/ShipDamageMessageArchive.cpp
+	shared/clientGameServer/ShipDamageMessageArchive.h
+	shared/clientGameServer/ShipUpdateTransformCollisionMessage.cpp
+	shared/clientGameServer/ShipUpdateTransformCollisionMessage.h
+	shared/clientGameServer/ShipUpdateTransformMessage.cpp
+	shared/clientGameServer/ShipUpdateTransformMessage.h
+	shared/clientGameServer/StatMigrationTargetsMessage.cpp
+	shared/clientGameServer/StatMigrationTargetsMessage.h
+	shared/clientGameServer/StomachRequestMessage.cpp
+	shared/clientGameServer/StomachRequestMessage.h
+	shared/clientGameServer/UpdateCellPermissionMessage.cpp
+	shared/clientGameServer/UpdateCellPermissionMessage.h
+	shared/clientGameServer/UpdateContainmentMessage.cpp
+	shared/clientGameServer/UpdateContainmentMessage.h
+	shared/clientGameServer/UpdateMissileMessage.cpp
+	shared/clientGameServer/UpdateMissileMessage.h
+	shared/clientGameServer/UpdatePostureMessage.cpp
+	shared/clientGameServer/UpdatePostureMessage.h
+	shared/clientGameServer/UpdatePvpStatusMessage.cpp
+	shared/clientGameServer/UpdatePvpStatusMessage.h
+	shared/clientGameServer/UpdateTransformMessage.cpp
+	shared/clientGameServer/UpdateTransformMessage.h
+	shared/clientGameServer/UpdateTransformWithParentMessage.cpp
+	shared/clientGameServer/UpdateTransformWithParentMessage.h
+	shared/clientGameServer/WhoListMessage.cpp
+	shared/clientGameServer/WhoListMessage.h
+
+	shared/clientLoginServer/ClientLoginMessages.cpp
+	shared/clientLoginServer/ClientLoginMessages.h
+	shared/clientLoginServer/LoginClusterStatus.cpp
+	shared/clientLoginServer/LoginClusterStatus.h
+	shared/clientLoginServer/LoginClusterStatusEx.cpp
+	shared/clientLoginServer/LoginClusterStatusEx.h
+	shared/clientLoginServer/LoginEnumCluster.cpp
+	shared/clientLoginServer/LoginEnumCluster.h
+
+	shared/common/BaselinesMessage.cpp
+	shared/common/BaselinesMessage.h
+	shared/common/BatchBaselinesMessage.cpp
+	shared/common/BatchBaselinesMessage.h
+	shared/common/ClientNotificationBoxMessage.cpp
+	shared/common/ClientNotificationBoxMessage.h
+	shared/common/ClusterWideDataGetElementMessage.cpp
+	shared/common/ClusterWideDataGetElementMessage.h
+	shared/common/ClusterWideDataGetElementResponseMessage.cpp
+	shared/common/ClusterWideDataGetElementResponseMessage.h
+	shared/common/ClusterWideDataReleaseLockMessage.cpp
+	shared/common/ClusterWideDataReleaseLockMessage.h
+	shared/common/ClusterWideDataRemoveElementMessage.cpp
+	shared/common/ClusterWideDataRemoveElementMessage.h
+	shared/common/ClusterWideDataUpdateDictionaryMessage.cpp
+	shared/common/ClusterWideDataUpdateDictionaryMessage.h
+	shared/common/DeltasMessage.cpp
+	shared/common/DeltasMessage.h
+	shared/common/ErrorMessage.cpp
+	shared/common/ErrorMessage.h
+	shared/common/FrameEndMessage.cpp
+	shared/common/FrameEndMessage.h
+	shared/common/GameNetworkMessage.cpp
+	shared/common/GameNetworkMessage.h
+	shared/common/GenericValueTypeMessage.h
+	shared/common/MessageQueueGenericValueType.h
+	shared/common/MessageQueueNetworkIdAndTransform.cpp
+	shared/common/MessageQueueNetworkIdAndTransform.h
+	shared/common/MessageQueueUpdateShipOnCollision.cpp
+	shared/common/MessageQueueUpdateShipOnCollision.h
+	shared/common/SetTransformMessage.cpp
+	shared/common/SetTransformMessage.h
+
+	shared/core/ControllerMessageMacros.h
+	shared/core/FirstSharedNetworkMessages.h
+	shared/core/NetworkStringIds.h
+	shared/core/SetupSharedNetworkMessages.cpp
+	shared/core/SetupSharedNetworkMessages.h
+
+	shared/customerService/AppendCommentMessage.cpp
+	shared/customerService/AppendCommentMessage.h
+	shared/customerService/AppendCommentResponseMessage.cpp
+	shared/customerService/AppendCommentResponseMessage.h
+	shared/customerService/CancelTicketMessage.cpp
+	shared/customerService/CancelTicketMessage.h
+	shared/customerService/CancelTicketResponseMessage.cpp
+	shared/customerService/CancelTicketResponseMessage.h
+	shared/customerService/ConnectPlayerMessage.cpp
+	shared/customerService/ConnectPlayerMessage.h
+	shared/customerService/ConnectPlayerResponseMessage.cpp
+	shared/customerService/ConnectPlayerResponseMessage.h
+	shared/customerService/CreateTicketMessage.cpp
+	shared/customerService/CreateTicketMessage.h
+	shared/customerService/CreateTicketResponseMessage.cpp
+	shared/customerService/CreateTicketResponseMessage.h
+	shared/customerService/CustomerServiceCategoryArchive.cpp
+	shared/customerService/CustomerServiceCategoryArchive.h
+	shared/customerService/CustomerServiceCategory.cpp
+	shared/customerService/CustomerServiceCategory.h
+	shared/customerService/CustomerServiceCommentArchive.cpp
+	shared/customerService/CustomerServiceCommentArchive.h
+	shared/customerService/CustomerServiceComment.cpp
+	shared/customerService/CustomerServiceComment.h
+	shared/customerService/CustomerServiceSearchResultArchive.cpp
+	shared/customerService/CustomerServiceSearchResultArchive.h
+	shared/customerService/CustomerServiceSearchResult.cpp
+	shared/customerService/CustomerServiceSearchResult.h
+	shared/customerService/CustomerServiceTicketArchive.cpp
+	shared/customerService/CustomerServiceTicketArchive.h
+	shared/customerService/CustomerServiceTicket.cpp
+	shared/customerService/CustomerServiceTicket.h
+	shared/customerService/DisconnectPlayerMessage.cpp
+	shared/customerService/DisconnectPlayerMessage.h
+	shared/customerService/DisconnectPlayerResponseMessage.cpp
+	shared/customerService/DisconnectPlayerResponseMessage.h
+	shared/customerService/GetArticleMessage.cpp
+	shared/customerService/GetArticleMessage.h
+	shared/customerService/GetArticleResponseMessage.cpp
+	shared/customerService/GetArticleResponseMessage.h
+	shared/customerService/GetCommentsMessage.cpp
+	shared/customerService/GetCommentsMessage.h
+	shared/customerService/GetCommentsResponseMessage.cpp
+	shared/customerService/GetCommentsResponseMessage.h
+	shared/customerService/GetTicketsMessage.cpp
+	shared/customerService/GetTicketsMessage.h
+	shared/customerService/GetTicketsResponseMessage.cpp
+	shared/customerService/GetTicketsResponseMessage.h
+	shared/customerService/NewTicketActivityMessage.cpp
+	shared/customerService/NewTicketActivityMessage.h
+	shared/customerService/NewTicketActivityResponseMessage.cpp
+	shared/customerService/NewTicketActivityResponseMessage.h
+	shared/customerService/RequestCategoriesMessage.cpp
+	shared/customerService/RequestCategoriesMessage.h
+	shared/customerService/RequestCategoriesResponseMessage.cpp
+	shared/customerService/RequestCategoriesResponseMessage.h
+	shared/customerService/SearchKnowledgeBaseMessage.cpp
+	shared/customerService/SearchKnowledgeBaseMessage.h
+	shared/customerService/SearchKnowledgeBaseResponseMessage.cpp
+	shared/customerService/SearchKnowledgeBaseResponseMessage.h
+	shared/customerService/VerifyPlayerNameResponseMessage.cpp
+	shared/customerService/VerifyPlayerNameResponseMessage.h
+	shared/customerService/VerifyPlayerNameMessage.cpp
+	shared/customerService/VerifyPlayerNameMessage.h
+
+	shared/planetWatch/GameServerStatus.cpp
+	shared/planetWatch/GameServerStatus.h
+	shared/planetWatch/PlanetNodeStatusMessage.cpp
+	shared/planetWatch/PlanetNodeStatusMessage.h
+	shared/planetWatch/PlanetObjectStatusMessage.cpp
+	shared/planetWatch/PlanetObjectStatusMessage.h
+	shared/planetWatch/ServerInfoArchive.cpp
+	shared/planetWatch/ServerInfoArchive.h
+	shared/planetWatch/ServerInfo.h
+
+	shared/voicechat/VoiceChatChannelInfo.cpp
+	shared/voicechat/VoiceChatChannelInfo.h
+	shared/voicechat/VoiceChatMiscMessages.cpp
+	shared/voicechat/VoiceChatMiscMessages.h
+	shared/voicechat/VoiceChatOnGetAccount.cpp
+	shared/voicechat/VoiceChatOnGetAccount.h 
+)
+
+if(WIN32)
+	set(PLATFORM_SOURCES
+		win32/FirstSharedNetworkMessages.cpp
+	)
+
+	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32)
+else()
+	set(PLATFORM_SOURCES "")
+endif()
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shared)
+
+add_library(sharedNetworkMessages
+	${SHARED_SOURCES}
+	${PLATFORM_SOURCES}
+)
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/GrantCommand.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/GrantCommand.cpp
new file mode 100644
index 00000000..07343409
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/GrantCommand.cpp
@@ -0,0 +1,36 @@
+// GrantCommand.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "GrantCommand.h"
+
+//-----------------------------------------------------------------------
+
+GrantCommand::GrantCommand(const std::string & c) :
+GameNetworkMessage("GrantCommand"),
+commandName(c)
+{
+	addVariable(commandName);
+}
+
+//-----------------------------------------------------------------------
+
+GrantCommand::GrantCommand(Archive::ReadIterator & source) :
+GameNetworkMessage("GrantCommand"),
+commandName()
+{
+	addVariable(commandName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+GrantCommand::~GrantCommand()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/GrantCommand.h b/engine/shared/library/sharedNetworkMessages/src/shared/GrantCommand.h
new file mode 100644
index 00000000..9a24d53b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/GrantCommand.h
@@ -0,0 +1,39 @@
+// GrantCommand.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_GrantCommand_H
+#define	_INCLUDED_GrantCommand_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class GrantCommand : public GameNetworkMessage
+{
+public:
+	GrantCommand(const std::string & commandName);
+	GrantCommand(Archive::ReadIterator & source);
+	~GrantCommand();
+
+	const std::string & getCommandName() const;
+private:
+	GrantCommand & operator = (const GrantCommand & rhs);
+	GrantCommand(const GrantCommand & source);
+
+private:
+	Archive::AutoVariable<std::string>  commandName;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & GrantCommand::getCommandName() const
+{
+	return commandName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_GrantCommand_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/GrantSkill.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/GrantSkill.cpp
new file mode 100644
index 00000000..bb9c09e6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/GrantSkill.cpp
@@ -0,0 +1,53 @@
+// GrantSkill.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "GrantSkill.h"
+
+//-----------------------------------------------------------------------
+
+GrantSkill::GrantSkill(const std::string & n, const std::string & p, const std::string & c, const std::string & d, const std::vector<std::string> & cp) :
+GameNetworkMessage("GrantSkill"),
+category(c),
+commandsProvided(),
+description(d),
+name(n),
+discipline(p)
+{
+	commandsProvided.set(cp);
+	addVariable(category);
+	addVariable(commandsProvided);
+	addVariable(description);
+	addVariable(name);
+	addVariable(discipline);
+}
+
+//-----------------------------------------------------------------------
+
+GrantSkill::GrantSkill(Archive::ReadIterator & source) :
+GameNetworkMessage("GrantSkill"),
+category(),
+commandsProvided(),
+description(),
+name(),
+discipline()
+{
+	addVariable(category);
+	addVariable(commandsProvided);
+	addVariable(description);
+	addVariable(name);
+	addVariable(discipline);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+GrantSkill::~GrantSkill()
+{
+}
+
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/GrantSkill.h b/engine/shared/library/sharedNetworkMessages/src/shared/GrantSkill.h
new file mode 100644
index 00000000..d7e57f87
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/GrantSkill.h
@@ -0,0 +1,73 @@
+// GrantSkill.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_GrantSkill_H
+#define	_INCLUDED_GrantSkill_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class GrantSkill : public GameNetworkMessage
+{
+public:
+	GrantSkill(const std::string & name, const std::string & discipline, const std::string & category, const std::string & description, const std::vector<std::string> & commandsProvided);
+	GrantSkill(Archive::ReadIterator & source);
+	~GrantSkill();
+
+	const std::string &               getCategory          () const;
+	const std::vector<std::string> &  getCommandsProvided  () const;
+	const std::string &               getDescription       () const;
+	const std::string &               getName              () const;
+	const std::string &               getDiscipline        () const;
+
+private:
+	Archive::AutoVariable<std::string> category;
+	Archive::AutoArray<std::string>    commandsProvided;
+	Archive::AutoVariable<std::string> description;
+	Archive::AutoVariable<std::string> name;
+	Archive::AutoVariable<std::string> discipline;	
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & GrantSkill::getCategory() const
+{
+	return category.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::vector<std::string> & GrantSkill::getCommandsProvided() const
+{
+	return commandsProvided.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & GrantSkill::getDescription() const
+{
+	return description.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & GrantSkill::getName() const
+{
+	return name.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & GrantSkill::getDiscipline() const
+{
+	return discipline.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_GrantSkill_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/LogMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/LogMessage.cpp
new file mode 100644
index 00000000..d8f6d208
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/LogMessage.cpp
@@ -0,0 +1,103 @@
+// ======================================================================
+//
+// LogMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/LogMessage.h"
+
+// ======================================================================
+
+LogMessage::LogMessage() :
+	GameNetworkMessage("LogMessage"),
+	m_timestamp(0),
+	m_procId(),
+	m_channel(),
+	m_text(),
+	m_unicodeAttach()
+{
+	addVariable(m_timestamp);
+	addVariable(m_procId);
+	addVariable(m_channel);
+	addVariable(m_text);
+	addVariable(m_unicodeAttach);
+}
+
+// ----------------------------------------------------------------------
+
+LogMessage::LogMessage(uint64 timestamp, std::string const &procId, std::string const &channel, std::string const &text, Unicode::String const &unicodeAttach) :
+	GameNetworkMessage("LogMessage"),
+	m_timestamp(timestamp),
+	m_procId(procId),
+	m_channel(channel),
+	m_text(text),
+	m_unicodeAttach(unicodeAttach)
+{
+	addVariable(m_timestamp);
+	addVariable(m_procId);
+	addVariable(m_channel);
+	addVariable(m_text);
+	addVariable(m_unicodeAttach);
+}
+
+// ----------------------------------------------------------------------
+
+LogMessage::LogMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("LogMessage"),
+	m_timestamp(0),
+	m_procId(),
+	m_channel(),
+	m_text(),
+	m_unicodeAttach()
+{
+	addVariable(m_timestamp);
+	addVariable(m_procId);
+	addVariable(m_channel);
+	addVariable(m_text);
+	addVariable(m_unicodeAttach);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+LogMessage::LogMessage(LogMessage const &rhs) :
+	GameNetworkMessage("LogMessage"),
+	m_timestamp(rhs.m_timestamp),
+	m_procId(rhs.m_procId),
+	m_channel(rhs.m_channel),
+	m_text(rhs.m_text),
+	m_unicodeAttach(rhs.m_unicodeAttach)
+{
+	addVariable(m_timestamp);
+	addVariable(m_procId);
+	addVariable(m_channel);
+	addVariable(m_text);
+	addVariable(m_unicodeAttach);
+}
+
+// ----------------------------------------------------------------------
+
+LogMessage::~LogMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+LogMessage & LogMessage::operator=(LogMessage const &rhs)
+{
+	if (this != &rhs)
+	{
+		m_timestamp = rhs.m_timestamp;
+		m_procId = rhs.m_procId;
+		m_channel = rhs.m_channel;
+		m_text = rhs.m_text;
+		m_unicodeAttach = rhs.m_unicodeAttach;
+	}
+
+	return *this;
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/LogMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/LogMessage.h
new file mode 100644
index 00000000..b3dbd0bb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/LogMessage.h
@@ -0,0 +1,82 @@
+// ======================================================================
+//
+// LogMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_LogMessage_H
+#define	_INCLUDED_LogMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+// ======================================================================
+
+class LogMessage : public GameNetworkMessage
+{
+public:
+	LogMessage();
+	LogMessage(uint64 timestamp, std::string const &procId, std::string const &channel, std::string const &text, Unicode::String const &unicodeAttach);
+	LogMessage(Archive::ReadIterator &source);
+	LogMessage(LogMessage const &source);
+	~LogMessage();
+
+	uint64                  getTimestamp() const;
+	std::string const &     getProcId() const;
+	std::string const &     getChannel() const;
+	std::string const &     getText() const;
+	Unicode::String const & getUnicodeAttach() const;
+
+	LogMessage &            operator=(LogMessage const &rhs);
+
+private:
+	Archive::AutoVariable<uint64>          m_timestamp;
+	Archive::AutoVariable<std::string>     m_procId;
+	Archive::AutoVariable<std::string>     m_channel;
+	Archive::AutoVariable<std::string>     m_text;
+	Archive::AutoVariable<Unicode::String> m_unicodeAttach;
+};
+
+// ======================================================================
+
+inline uint64 LogMessage::getTimestamp() const
+{
+	return m_timestamp.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &LogMessage::getProcId() const
+{
+	return m_procId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &LogMessage::getChannel() const
+{
+	return m_channel.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &LogMessage::getText() const
+{
+	return m_text.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline Unicode::String const &LogMessage::getUnicodeAttach() const
+{
+	return m_unicodeAttach.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_LogMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/NameErrors.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/NameErrors.cpp
new file mode 100644
index 00000000..7e293910
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/NameErrors.cpp
@@ -0,0 +1,33 @@
+// NameErrors.cpp
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "NameErrors.h"
+
+namespace NameErrors
+{
+	std::string localizationFile("ui");
+
+	StringId nameApproved(localizationFile, "name_approved");
+	StringId nameApprovedModified(localizationFile, "name_approved_modified");
+	StringId nameDeclinedSyntax(localizationFile, "name_declined_syntax");
+	StringId nameDeclinedEmpty(localizationFile, "name_declined_empty");
+	StringId nameDeclinedRaciallyInappropriate(localizationFile, "name_declined_racially_inappropriate");
+	StringId nameDeclinedFictionallyInappropriate(localizationFile, "name_declined_fictionally_inappropriate");
+	StringId nameDeclinedProfane(localizationFile, "name_declined_profane");
+	StringId nameDeclinedInUse(localizationFile, "name_declined_in_use");
+	StringId nameDeclinedReserved(localizationFile, "name_declined_reserved");
+	StringId nameDeclinedNoTemplate(localizationFile, "name_declined_no_template");
+	StringId nameDeclinedNotCreatureTemplate(localizationFile, "name_declined_not_creature_template");
+	StringId nameDeclinedNoNameGenerator(localizationFile, "name_declined_no_name_generator");
+	StringId nameDeclinedCantCreateAvatar(localizationFile, "name_declined_cant_create_avatar");
+	StringId nameDeclinedInternalError(localizationFile, "name_declined_internal_error");
+	StringId nameDeclinedRetry(localizationFile, "name_declined_retry");
+	StringId nameDeclinedTooFast(localizationFile, "name_declined_too_fast");
+	StringId nameDeclinedNotAuthorizedForSpecies(localizationFile,  "name_declined_not_authorized_for_species");
+};
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/NameErrors.h b/engine/shared/library/sharedNetworkMessages/src/shared/NameErrors.h
new file mode 100644
index 00000000..65fde6db
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/NameErrors.h
@@ -0,0 +1,34 @@
+// NameErrors.h
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_NameErrors_H
+#define	_INCLUDED_NameErrors_H
+
+//-----------------------------------------------------------------------
+
+#include "StringId.h"
+
+namespace NameErrors
+{
+	extern StringId nameApproved;//		ui:name_approved
+	extern StringId nameDeclinedSyntax; //	ui:name_declined_syntax
+	extern StringId nameDeclinedEmpty; // ui:name_declined_empty
+	extern StringId nameDeclinedRaciallyInappropriate; // ui:name_declined_racially_inappropriate
+	extern StringId nameDeclinedFictionallyInappropriate; // ui:name_declined_fictionally_inappropriate
+	extern StringId nameDeclinedProfane; // ui:name_declined_profane
+	extern StringId nameDeclinedInUse; // ui:name_declined_in_use
+	extern StringId nameDeclinedReserved; // ui:name_declined_reserved
+	extern StringId nameDeclinedNoTemplate; // ui:name_declined_no_template
+	extern StringId nameDeclinedNotCreatureTemplate; // ui:name_declined_not_creature_template
+	extern StringId nameDeclinedNoNameGenerator; // ui:name_declined_no_name_generator
+	extern StringId nameDeclinedCantCreateAvatar; // ui:name_declined_cant_create_avatar
+	extern StringId nameDeclinedInternalError; // ui:name_declined_internal_error
+	extern StringId nameDeclinedRetry; // ui:name_declined_retry
+	extern StringId nameDeclinedTooFast; // ui:name_declined_too_fast
+	extern StringId nameDeclinedNotAuthorizedForSpecies; // ui:name_declined_not_authorized_for_species
+
+	extern std::string localizationFile;
+};
+
+#endif	// _INCLUDED_NameErrors_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/NetworkMessageFactory.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/NetworkMessageFactory.cpp
new file mode 100644
index 00000000..e46f99bc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/NetworkMessageFactory.cpp
@@ -0,0 +1,177 @@
+// NetworkMessageFactory.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "Archive/ByteStream.h"
+#include "NetworkMessageFactory.h"
+
+class TcpClient;
+
+//-----------------------------------------------------------------------
+
+unsigned long GetNewRuntimeMessageId(const char * messageName)
+{
+	unsigned long result;
+	static std::map<const char *, unsigned long> ids;
+	
+	// find the string in the static map of string/id's.
+	std::map<const char *, unsigned long>::const_iterator f = ids.find(messageName);
+
+	if(f == ids.end())
+	{
+		// it's not there, assign a new id, increment the static nextId
+		static unsigned long nextId = 0;
+		ids[messageName] = nextId;
+		result = nextId;
+		nextId++;
+	}
+	else
+	{
+		// found an existing ID. Often happens during initialization
+		// of statics declared in headers.
+		result = (*f).second;
+	}
+	return result;		
+}
+
+//-----------------------------------------------------------------------
+
+NetworkMessageMaker::NetworkMessageMaker(unsigned long typeId, GameNetworkMessage *(*maker)(Archive::ReadIterator &), const DispatchFunctorBase * dispatcher)
+{
+	NetworkMessageFactory::getInstance().registerMaker(typeId, maker, dispatcher);
+}
+
+//-----------------------------------------------------------------------
+
+NetworkMessageMaker::~NetworkMessageMaker()
+{
+}
+
+//-----------------------------------------------------------------------
+
+NetworkMessageFactory::NetworkMessageFactory()
+{
+}
+
+//-----------------------------------------------------------------------
+
+NetworkMessageFactory::NetworkMessageFactory(const NetworkMessageFactory &)
+{
+
+}
+
+//-----------------------------------------------------------------------
+
+NetworkMessageFactory::~NetworkMessageFactory()
+{
+}
+
+//-----------------------------------------------------------------------
+
+GameConnectionCallback::GameConnectionCallback(UdpConnectionMT * u, TcpClient * t) :
+Connection(u, t)
+{
+}
+
+//-----------------------------------------------------------------------
+
+GameConnectionCallback::~GameConnectionCallback()
+{
+	std::vector<MessageDispatch::TransceiverBase *>::iterator i;
+	for(i = transceivers.begin(); i != transceivers.end(); ++i)
+	{
+		delete (*i);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void GameConnectionCallback::addTransceiver(const unsigned long messageId, MessageDispatch::TransceiverBase * newTransceiver)
+{
+	if(messageId >= transceivers.size())
+		transceivers.resize(messageId +1);
+	transceivers[messageId] = newTransceiver;
+}
+
+//-----------------------------------------------------------------------
+
+MessageDispatch::TransceiverBase * GameConnectionCallback::getTransceiver(const unsigned long messageId)
+{
+	if(messageId >= transceivers.size())
+		return 0;
+
+	return transceivers[messageId];
+}
+
+//-----------------------------------------------------------------------
+
+void GameConnectionCallback::onReceive(const Archive::ByteStream & message)
+{
+	Archive::ReadIterator r(message);
+	NetworkMessageFactory::getInstance().dispatchMessage(this, r);
+}
+
+//-----------------------------------------------------------------------
+
+NetworkMessageFactory & NetworkMessageFactory::operator = (const NetworkMessageFactory & rhs)
+{
+	if(this != &rhs)
+	{
+		// make assignments if right hand side is not this instance
+	}
+	return *this;
+}
+
+//-----------------------------------------------------------------------
+
+void NetworkMessageFactory::dispatchMessage(GameConnectionCallback * connection, Archive::ReadIterator & source)
+{
+	// save a read iterator
+	static Archive::ReadIterator r;
+	r = source;
+
+	// get message type
+	GameNetworkMessage * msg = makeMessage(r);
+	if(msg)
+	{
+		unsigned long t = msg->getType();
+		
+		std::map<unsigned long, const DispatchFunctorBase *>::iterator f = dispatchers.find(t);
+		if(f != dispatchers.end())
+		{
+			(*f).second->dispatch(connection, *msg);
+		}
+	}
+	delete msg;
+}
+
+//-----------------------------------------------------------------------
+
+void NetworkMessageFactory::registerMaker(unsigned long typeId, GameNetworkMessage *(*maker)(Archive::ReadIterator &), const DispatchFunctorBase * dispatcher)
+{
+	messageMakers[typeId] = maker;
+	dispatchers[typeId] = dispatcher;
+}
+
+//-----------------------------------------------------------------------
+
+GameNetworkMessage * NetworkMessageFactory::makeMessage(Archive::ReadIterator & source)
+{
+	Archive::ReadIterator ri = source;
+	GameNetworkMessage * result = 0;
+	GameNetworkMessage msg(ri);
+	unsigned long messageType = msg.getType();
+
+	std::map<unsigned long, GameNetworkMessage *(*)(Archive::ReadIterator &)>::const_iterator f = messageMakers.find(messageType);
+	if(f != messageMakers.end())
+	{
+		ri = source;
+		result = (*f).second(ri);
+	}
+	return result;
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/NetworkMessageFactory.h b/engine/shared/library/sharedNetworkMessages/src/shared/NetworkMessageFactory.h
new file mode 100644
index 00000000..d64f5ae6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/NetworkMessageFactory.h
@@ -0,0 +1,217 @@
+// NetworkMessageFactory.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_NetworkMessageFactory_H
+#define	_INCLUDED_NetworkMessageFactory_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/ByteStream.h"
+#include <map>
+#include "sharedNetwork/Connection.h"
+#include "sharedMessageDispatch/Transceiver.h"
+#include "Singleton/Singleton.h"
+
+class GameNetworkMessage;
+class GameConnectionCallback;
+class TcpClient;
+
+template<typename MessageType> 
+	inline unsigned long GetMessageId() 
+{ 
+	return 0; 
+}
+
+struct DispatchFunctorBase 
+{ 
+	virtual void dispatch(GameConnectionCallback *, GameNetworkMessage &) const = 0; 
+};
+
+//-----------------------------------------------------------------------
+/**
+	This class is responsible for creating GameNetworkMessage objects from
+	Archive::ByteStream objects. It also handles dispatch of the message
+	to target object members that are capable of and subscribed to the 
+	message or connection/message pair.
+
+	GameNetworkMessage construction happens via the makeMessage interface.
+	makeMessage looks for the correpsonding construction function 
+	(define by the MakeMessage(x) macro, yuck). MakeMessage instantiates
+	a static struct with parmaters that identify 1) how to construct 
+	a message, 2) how to identify a message for transceiver lookups and
+	3) how to dispatch a message. This data is storedin the 
+	NetworkMessageFactory singleton for later use by recivers and emitters.
+
+	Dispatching is initiated by a GameConnectionCallback (or a derivative)
+	passing itself and a byte stream to dispatchMessage(). Getting the 
+	transceiver responsible for emitting the message is a constant time
+	operation.
+
+*/
+class NetworkMessageFactory : public Singleton<NetworkMessageFactory>
+{
+public:
+	~NetworkMessageFactory();
+
+	void dispatchMessage(GameConnectionCallback * source, Archive::ReadIterator &);
+
+	GameNetworkMessage * makeMessage(Archive::ReadIterator & bs);
+
+protected:
+	friend struct NetworkMessageMaker;
+	friend class Singleton<NetworkMessageFactory>;
+	NetworkMessageFactory();
+	void registerMaker(unsigned long int, GameNetworkMessage *(*)(Archive::ReadIterator &), const DispatchFunctorBase *);
+
+private:
+	NetworkMessageFactory & operator = (const NetworkMessageFactory & rhs);
+	NetworkMessageFactory(const NetworkMessageFactory & source);
+
+private:
+	std::map<unsigned long int, GameNetworkMessage * (*)(Archive::ReadIterator &)> messageMakers;
+	std::map<unsigned long int, const DispatchFunctorBase *> dispatchers;
+};
+
+//-----------------------------------------------------------------------
+/**
+	The NetworkMessageMaker facilitates static registration of factory
+	functions for GameNetworkMessage objects. Only GameNetworkMessage
+	objects that are included in an application create an instance
+	of the NetworkMessageMaker (no data members).
+
+	On construction, the NetworkMessageMaker registers create and
+	dispatch functions with the NetworkMessageFactory singleton.
+*/
+struct NetworkMessageMaker
+{
+	NetworkMessageMaker(unsigned long, GameNetworkMessage *(*maker)(Archive::ReadIterator &), const DispatchFunctorBase *);
+	~NetworkMessageMaker();
+};
+
+template<typename MessageType>
+struct NetworkMessage
+{
+	NetworkMessage(GameConnectionCallback & c, MessageType & m) : connection(c), message(m){};
+	GameConnectionCallback & connection;
+	MessageType & message;
+	NetworkMessage & operator = (const NetworkMessage &);
+};
+
+//-----------------------------------------------------------------------
+/**
+	Generates a unique unsigned long integer from a character string. The
+	id is unique within the scope of the current application for the 
+	current run ONLY. Ids are generated sequentially, to better support
+	storing maps of ids to other types in vectors rather than maps.
+
+	This is intended to be used during type initialization (usually 
+	during application startup or the first time a new type id is
+	required). It is a logN operation (map lookup). 
+*/
+unsigned long GetNewRuntimeMessageId(const char * messageName);
+
+//-----------------------------------------------------------------------
+/**
+	GameConnectionCallback sits between Network::ConnectionCallback
+	and the game to handle message dispatching.
+
+	It implements onReceiveMessage(Archive::ReadIterator &)
+	and invokes NetworkMessageFactory::dispatchMessage(). This dispatch
+	processes uses the sharedMessageDispatch system's Transceiver
+	to deliver messages to target object member functions. 
+
+	Dispatchers are (currently) organized in a vector. The messageId
+	is determined from the type of message, which is incrementally
+	defined as each new message type comes online. This is unique and
+	consistent only for the current run of the application. These
+	ID's CAN NOT be persisted or used between separate invocations
+	of the application!
+*/
+class GameConnectionCallback : public Connection
+{
+public:
+	GameConnectionCallback(UdpConnectionMT *, TcpClient *);
+	virtual ~GameConnectionCallback();
+
+	template<typename MessageType, typename ObjectType>
+		void listenForMessage(MessageDispatch::Callback & cb, ObjectType & object, void (ObjectType::*callback)(MessageType) )
+	{
+		unsigned long messageId = GetMessageId<MessageType>();
+		MessageDispatch::Transceiver<MessageType> * t = static_cast<MessageDispatch::Transceiver<MessageType> *>(getTransceiver(messageId));
+		if(!t)
+		{
+			t = new MessageDispatch::Transceiver<MessageType>;
+			addTransceiver(messageId, t);
+		}
+		cb.connect(*t, object, callback);
+	}
+
+	void                                addTransceiver  (const unsigned long messageId, MessageDispatch::TransceiverBase * newTransceiver);
+	MessageDispatch::TransceiverBase *  getTransceiver  (const unsigned long messageId);
+	virtual void                        onReceive       (const Archive::ByteStream & message);
+
+private:
+	std::vector<MessageDispatch::TransceiverBase *> transceivers;
+	GameConnectionCallback(const GameConnectionCallback &);
+	GameConnectionCallback & operator = (const GameConnectionCallback &);
+};
+
+//-----------------------------------------------------------------------
+
+/**
+	Yes, this is in fact a macro. It would be a template if I could
+	figure out how to do it :) 
+
+	It defines a clone/factory function, registers the function by way
+	of a static instance of a NetworkMessageMaker, and defines a dispatch
+	routine which is also registered (again via the static 
+	NetworkMessageMaker). When a byte stream is passed to the 
+	NetworkMessageFactory singleton, it reconstructs the appropriate
+	game network message. 
+	
+	A GameConnectionCallback invokes 
+	NetworkMessageFactory::dispatch() with the byte stream. The
+	factory creates a GameNetworkMessage and passes it to it's 
+	corresponding dispatch function. The dispatch function casts
+	it to the right type, finds a transceiver for the type (or
+	creates one if it doesn't yet exist), and emits the message.
+
+	All transceivers listening for a NetworkMessage<GameMessageType> 
+	from the source GameConnectionCallback object or callbacks listening
+	anonymously will receive the message.
+*/
+
+
+template<typename MessageType>
+struct DispatchFunctor : public DispatchFunctorBase
+{
+	void dispatch(GameConnectionCallback * connection, GameNetworkMessage & base) const
+	{
+		MessageType & message = static_cast<MessageType &>(base);
+		NetworkMessage<MessageType> m(*connection, message);
+		unsigned long typeId = GetMessageId<MessageType>();
+		MessageDispatch::Transceiver<NetworkMessage<MessageType> &> * t = static_cast<MessageDispatch::Transceiver<NetworkMessage<MessageType> &> *>(connection->getTransceiver(typeId));
+		if(!t)
+		{
+			t = new MessageDispatch::Transceiver<NetworkMessage<MessageType> &>;
+			connection->addTransceiver(typeId, t);
+		}
+		t->emitMessage(m);
+	}
+};
+
+#define MakeMessage(x) inline GameNetworkMessage * make##x(Archive::ReadIterator & source) { \
+	return new x ( source ) ; \
+	} \
+    template<> inline unsigned long GetMessageId<x>() \
+	{ \
+		static const unsigned long id = GetNewRuntimeMessageId(#x); \
+		return id; \
+	} \
+	static const DispatchFunctor<x> dispatch##x; \
+	static const NetworkMessageMaker maker##x(MessageDispatch::MessageBase::makeMessageTypeFromString(#x), make##x, &dispatch##x); 
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_NetworkMessageFactory_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/RevokeCommand.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/RevokeCommand.cpp
new file mode 100644
index 00000000..08598082
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/RevokeCommand.cpp
@@ -0,0 +1,36 @@
+// RevokeCommand.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "RevokeCommand.h"
+
+//-----------------------------------------------------------------------
+
+RevokeCommand::RevokeCommand(const std::string & c) :
+GameNetworkMessage("RevokeCommand"),
+commandName(c)
+{
+	addVariable(commandName);
+}
+
+//-----------------------------------------------------------------------
+
+RevokeCommand::RevokeCommand(Archive::ReadIterator & source) :
+GameNetworkMessage("RevokeCommand"),
+commandName()
+{
+	addVariable(commandName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RevokeCommand::~RevokeCommand()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/RevokeCommand.h b/engine/shared/library/sharedNetworkMessages/src/shared/RevokeCommand.h
new file mode 100644
index 00000000..1c35795c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/RevokeCommand.h
@@ -0,0 +1,41 @@
+// RevokeCommand.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_RevokeCommand_H
+#define	_INCLUDED_RevokeCommand_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class RevokeCommand : public GameNetworkMessage
+{
+public:
+	RevokeCommand(const std::string & commandName);
+	RevokeCommand(Archive::ReadIterator & source);
+	~RevokeCommand();
+
+	const std::string & getCommandName() const;
+
+private:
+	RevokeCommand & operator = (const RevokeCommand & rhs);
+	RevokeCommand(const RevokeCommand & source);
+
+private:
+	Archive::AutoVariable<std::string> commandName;
+
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & RevokeCommand::getCommandName() const
+{
+	return commandName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_RevokeCommand_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/RevokeSkill.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/RevokeSkill.cpp
new file mode 100644
index 00000000..f8c12a8a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/RevokeSkill.cpp
@@ -0,0 +1,36 @@
+// RevokeSkill.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "RevokeSkill.h"
+
+//-----------------------------------------------------------------------
+
+RevokeSkill::RevokeSkill(const std::string & s) : 
+GameNetworkMessage("RevokeSkill"),
+skillName(s)
+{
+	addVariable(skillName);
+}
+
+//-----------------------------------------------------------------------
+
+RevokeSkill::RevokeSkill(Archive::ReadIterator & source) :
+GameNetworkMessage("RevokeSkill"),
+skillName()
+{
+	addVariable(skillName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RevokeSkill::~RevokeSkill()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/RevokeSkill.h b/engine/shared/library/sharedNetworkMessages/src/shared/RevokeSkill.h
new file mode 100644
index 00000000..3fa08100
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/RevokeSkill.h
@@ -0,0 +1,40 @@
+// RevokeSkill.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_RevokeSkill_H
+#define	_INCLUDED_RevokeSkill_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class RevokeSkill : public GameNetworkMessage
+{
+public:
+	RevokeSkill(const std::string & skillName);
+	RevokeSkill(Archive::ReadIterator & source);
+	~RevokeSkill();
+
+	const std::string & getSkillName() const;
+
+private:
+	RevokeSkill & operator = (const RevokeSkill & rhs);
+	RevokeSkill(const RevokeSkill & source);
+
+private:
+	Archive::AutoVariable<std::string>  skillName;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & RevokeSkill::getSkillName() const
+{
+	return skillName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_RevokeSkill_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAddFriend.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAddFriend.cpp
new file mode 100644
index 00000000..b45f9779
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAddFriend.cpp
@@ -0,0 +1,40 @@
+// ChatAddFriend.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatAddFriend.h"
+
+//-----------------------------------------------------------------------
+
+ChatAddFriend::ChatAddFriend(const unsigned int q, const ChatAvatarId & c) :
+GameNetworkMessage("ChatAddFriend"),
+characterName(c),
+sequence(q)
+{
+	addVariable(characterName);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatAddFriend::ChatAddFriend(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatAddFriend"),
+characterName(),
+sequence()
+{
+	addVariable(characterName);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatAddFriend::~ChatAddFriend()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAddFriend.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAddFriend.h
new file mode 100644
index 00000000..1c55c59e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAddFriend.h
@@ -0,0 +1,50 @@
+// ChatAddFriend.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatAddFriend_H
+#define	_INCLUDED_ChatAddFriend_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatAddFriend : public GameNetworkMessage
+{
+public:
+	ChatAddFriend(const unsigned int sequence, const ChatAvatarId & characterName);
+	ChatAddFriend(Archive::ReadIterator & source);
+	~ChatAddFriend();
+
+	const ChatAvatarId &  getCharacterName  () const;
+	const unsigned int    getSequence       () const;
+
+private:
+	ChatAddFriend & operator = (const ChatAddFriend & rhs);
+	ChatAddFriend(const ChatAddFriend & source);
+
+	Archive::AutoVariable<ChatAvatarId>  characterName;
+	Archive::AutoVariable<unsigned int>  sequence;  
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatAddFriend::getCharacterName () const
+{
+	return characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatAddFriend::getSequence () const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatAddFriend_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAddModeratorToRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAddModeratorToRoom.cpp
new file mode 100644
index 00000000..95fdaa25
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAddModeratorToRoom.cpp
@@ -0,0 +1,45 @@
+// ChatAddModeratorToRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatAddModeratorToRoom.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatAddModeratorToRoom::ChatAddModeratorToRoom(const unsigned int s, const ChatAvatarId & a, const std::string & r) :
+GameNetworkMessage("ChatAddModeratorToRoom"),
+avatarId(a),
+roomName(r),
+sequenceId(s)
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+	addVariable(sequenceId);
+}
+
+//-----------------------------------------------------------------------
+
+ChatAddModeratorToRoom::ChatAddModeratorToRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatAddModeratorToRoom"),
+avatarId(),
+roomName(),
+sequenceId(0)
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+	addVariable(sequenceId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatAddModeratorToRoom::~ChatAddModeratorToRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAddModeratorToRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAddModeratorToRoom.h
new file mode 100644
index 00000000..96a42ace
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAddModeratorToRoom.h
@@ -0,0 +1,58 @@
+// ChatAddModeratorToRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatAddModeratorToRoom_H
+#define	_INCLUDED_ChatAddModeratorToRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+
+//-----------------------------------------------------------------------
+
+class ChatAddModeratorToRoom : public GameNetworkMessage
+{
+public:
+	ChatAddModeratorToRoom(const unsigned int sequenceId, const ChatAvatarId & avatarId, const std::string & roomName);
+	ChatAddModeratorToRoom(Archive::ReadIterator & source);
+	~ChatAddModeratorToRoom();
+
+	const ChatAvatarId &  getAvatarId    () const;
+	const std::string &   getRoomName    () const;
+	const unsigned int    getSequenceId  () const;
+
+private:
+	ChatAddModeratorToRoom & operator = (const ChatAddModeratorToRoom & rhs);
+	ChatAddModeratorToRoom(const ChatAddModeratorToRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  avatarId;
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<unsigned int>  sequenceId;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatAddModeratorToRoom::getAvatarId() const
+{
+	return avatarId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatAddModeratorToRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatAddModeratorToRoom::getSequenceId() const
+{
+	return sequenceId.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatAddModeratorToRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAvatarId.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAvatarId.cpp
new file mode 100644
index 00000000..09f78c5d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAvatarId.cpp
@@ -0,0 +1,157 @@
+//======================================================================
+//
+// ChatAvatarId.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "UnicodeUtils.h"
+
+//======================================================================
+
+ChatAvatarId::ChatAvatarId () :
+gameCode (),
+cluster  (),
+name     ()
+{
+}
+
+//----------------------------------------------------------------------
+
+ChatAvatarId::ChatAvatarId (const std::string & _gameCode, const std::string & _cluster, const std::string & _name) :
+gameCode (_gameCode),
+cluster  (_cluster),
+name     (_name)
+{
+}
+
+//----------------------------------------------------------------------
+
+ChatAvatarId::ChatAvatarId (const std::string & _cluster, const std::string & _name) :
+gameCode (),
+cluster  (_cluster),
+name     (_name)
+{
+}
+
+//----------------------------------------------------------------------
+
+ChatAvatarId::ChatAvatarId (const std::string & _name) :
+gameCode (),
+cluster  (),
+name     (_name)
+{
+	size_t dotpos = _name.rfind ('.');
+
+	if (dotpos != std::string::npos)
+	{
+		name = _name.substr (dotpos + 1);
+
+		if (dotpos > 0)
+		{
+			--dotpos;
+			const size_t dotpos_2 = _name.rfind ('.', dotpos);
+			
+			if (dotpos_2 != std::string::npos)
+			{
+				cluster = _name.substr (dotpos_2 + 1, dotpos - dotpos_2);
+				gameCode = _name.substr (0, dotpos_2);
+			}
+			else
+				cluster = _name.substr (0, dotpos + 1);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+const bool ChatAvatarId::operator== (const ChatAvatarId & rhs) const
+{
+	return !_stricmp (gameCode.c_str (), rhs.gameCode.c_str ()) &&
+		!_stricmp (cluster.c_str (), rhs.cluster.c_str ()) &&
+		!_stricmp (name.c_str (), rhs.name.c_str ());
+}
+
+//----------------------------------------------------------------------
+
+const bool ChatAvatarId::operator!= (const ChatAvatarId & rhs) const
+{
+	return !(rhs == *this);
+}
+
+//-----------------------------------------------------------------------
+
+const bool ChatAvatarId::operator < (const ChatAvatarId & rhs) const
+{
+	if (gameCode < rhs.gameCode)
+		return true;
+	
+	if (gameCode == rhs.gameCode)
+	{
+		if (cluster < rhs.cluster)
+			return true;
+		
+		if (cluster == rhs.cluster)
+			return (name < rhs.name);
+	}
+
+	return false;
+}
+
+//----------------------------------------------------------------------
+
+std::string ChatAvatarId::getNameWithNecessaryPrefix(const std::string & localGameCode, const std::string & localCluster) const
+{
+	std::string nameWithNecessaryPrefix;
+	if (_stricmp(gameCode.c_str(), localGameCode.c_str()))
+	{
+		// avatar is from a different game, so use both the game and cluster name
+		nameWithNecessaryPrefix = gameCode + std::string(".") + cluster + std::string(".") + name;
+	}
+	else if (_stricmp(cluster.c_str(), localCluster.c_str()))
+	{
+		// avatar is from a different cluster, so the cluster name
+		nameWithNecessaryPrefix = cluster + std::string(".") + name;
+	}
+	else
+	{
+		// avatar is from same cluster, so just use the name
+		nameWithNecessaryPrefix = name;
+	}
+
+	return nameWithNecessaryPrefix;
+}
+
+//----------------------------------------------------------------------
+
+std::string ChatAvatarId::getFullName () const
+{
+	return gameCode + '.' + cluster + '.' + name;
+}
+
+//----------------------------------------------------------------------
+
+void ChatAvatarId::clear       ()
+{
+	gameCode.clear ();
+	cluster.clear  ();
+	name.clear     ();
+}
+
+//----------------------------------------------------------------------
+
+Unicode::String ChatAvatarId::getAPIAddress() const
+{
+	return Unicode::narrowToWide( "SOE+" + gameCode + '+' + cluster );
+}
+
+//----------------------------------------------------------------------
+
+Unicode::String ChatAvatarId::getName() const
+{
+	return Unicode::narrowToWide( name );
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAvatarId.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAvatarId.h
new file mode 100644
index 00000000..5f704d26
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAvatarId.h
@@ -0,0 +1,40 @@
+//======================================================================
+//
+// ChatAvatarId.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ChatAvatarId_H
+#define INCLUDED_ChatAvatarId_H
+
+#include <string>
+#include "Unicode.h"
+
+//======================================================================
+
+struct ChatAvatarId
+{
+	std::string gameCode;
+	std::string cluster;
+	std::string name;
+
+	         ChatAvatarId ();
+	explicit ChatAvatarId (const std::string & name);
+	         ChatAvatarId (const std::string & cluster, const std::string & name);
+	         ChatAvatarId (const std::string & gameCode, const std::string & cluster, const std::string & name);
+
+	const bool operator== (const ChatAvatarId & rhs) const;
+	const bool operator!= (const ChatAvatarId & rhs) const;
+	const bool operator < (const ChatAvatarId & rhs) const;
+
+	std::string getNameWithNecessaryPrefix(const std::string & localGameCode, const std::string & localCluster) const;
+	std::string getFullName () const;
+	void        clear       ();
+	Unicode::String  getAPIAddress  () const;
+	Unicode::String  getName        () const;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAvatarIdArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAvatarIdArchive.cpp
new file mode 100644
index 00000000..19430160
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAvatarIdArchive.cpp
@@ -0,0 +1,32 @@
+//======================================================================
+//
+// ChatAvatarIdArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+#include "sharedNetworkMessages/ChatAvatarId.h"
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, ChatAvatarId & target)
+	{
+		get (source, target.gameCode);	
+		get (source, target.cluster);	
+		get (source, target.name);
+	}
+
+	void put (ByteStream & target, const ChatAvatarId & source)
+	{
+		put (target, source.gameCode);
+		put (target, source.cluster);
+		put (target, source.name);
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAvatarIdArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAvatarIdArchive.h
new file mode 100644
index 00000000..cdb1d7ff
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatAvatarIdArchive.h
@@ -0,0 +1,27 @@
+//======================================================================
+//
+// ChatAvatarIdArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ChatAvatarIdArchive_H
+#define INCLUDED_ChatAvatarIdArchive_H
+
+//======================================================================
+
+#include "Archive/ByteStream.h"
+
+struct ChatAvatarId;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, ChatAvatarId & target);
+	void put (ByteStream & target, const ChatAvatarId & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatBanAvatarFromRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatBanAvatarFromRoom.cpp
new file mode 100644
index 00000000..8f0549f7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatBanAvatarFromRoom.cpp
@@ -0,0 +1,43 @@
+// ChatBanAvatarFromRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatBanAvatarFromRoom.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatBanAvatarFromRoom::ChatBanAvatarFromRoom(const unsigned int s, const ChatAvatarId & a, const std::string & r) :
+GameNetworkMessage("ChatBanAvatarFromRoom"),
+avatarId(a),
+roomName(r),
+sequence(s)
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatBanAvatarFromRoom::ChatBanAvatarFromRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatBanAvatarFromRoom"),
+avatarId(),
+roomName()
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatBanAvatarFromRoom::~ChatBanAvatarFromRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatBanAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatBanAvatarFromRoom.h
new file mode 100644
index 00000000..9a7cf6d5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatBanAvatarFromRoom.h
@@ -0,0 +1,57 @@
+// ChatBanAvatarFromRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef	_INCLUDED_ChatBanAvatarFromRoom_H
+#define	_INCLUDED_ChatBanAvatarFromRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+
+//-----------------------------------------------------------------------
+
+class ChatBanAvatarFromRoom : public GameNetworkMessage
+{
+public:
+	ChatBanAvatarFromRoom(const unsigned int sequence, const ChatAvatarId & avatarId, const std::string & roomName);
+	ChatBanAvatarFromRoom(Archive::ReadIterator & source);
+	~ChatBanAvatarFromRoom();
+
+	const ChatAvatarId &  getAvatarId  () const;
+	const std::string &   getRoomName  () const;
+	const unsigned int    getSequence  () const;
+
+private:
+	ChatBanAvatarFromRoom & operator = (const ChatBanAvatarFromRoom & rhs);
+	ChatBanAvatarFromRoom(const ChatBanAvatarFromRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  avatarId; //avatar to ban
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatBanAvatarFromRoom::getAvatarId() const
+{
+	return avatarId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatBanAvatarFromRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatBanAvatarFromRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatBanAvatarFromRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatChangeFriendStatus.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatChangeFriendStatus.cpp
new file mode 100644
index 00000000..7e3c0a24
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatChangeFriendStatus.cpp
@@ -0,0 +1,48 @@
+// ChatChangeFriendStatus.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatChangeFriendStatus.h"
+
+//-----------------------------------------------------------------------
+
+ChatChangeFriendStatus::ChatChangeFriendStatus(unsigned int q, const ChatAvatarId & c, const ChatAvatarId & _friendName, bool a) :
+GameNetworkMessage("ChatChangeFriendStatus"),
+characterName(c),
+friendName(_friendName),
+sequence(q),
+add(a)
+{
+	addVariable(characterName);
+	addVariable(friendName);
+	addVariable(sequence);
+	addVariable(add);
+}
+
+//-----------------------------------------------------------------------
+
+ChatChangeFriendStatus::ChatChangeFriendStatus(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatChangeFriendStatus"),
+characterName(),
+friendName(),
+sequence(0),
+add(0)
+{
+	addVariable(characterName);
+	addVariable(friendName);
+	addVariable(sequence);
+	addVariable(add);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatChangeFriendStatus::~ChatChangeFriendStatus()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatChangeFriendStatus.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatChangeFriendStatus.h
new file mode 100644
index 00000000..5b6a3b5e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatChangeFriendStatus.h
@@ -0,0 +1,66 @@
+// ChatChangeFriendStatus.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatChangeFriendStatus_H
+#define	_INCLUDED_ChatChangeFriendStatus_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatChangeFriendStatus : public GameNetworkMessage
+{
+public:
+	ChatChangeFriendStatus(unsigned int sequence, const ChatAvatarId & characterName, const ChatAvatarId & friendName, bool add);
+	ChatChangeFriendStatus(Archive::ReadIterator & source);
+	~ChatChangeFriendStatus();
+
+	const ChatAvatarId &  getCharacterName  () const;
+	const ChatAvatarId &  getFriendName     () const;
+	unsigned int          getSequence       () const;
+	bool                  getAdd            () const;
+
+private:
+	ChatChangeFriendStatus & operator = (const ChatChangeFriendStatus & rhs);
+	ChatChangeFriendStatus(const ChatChangeFriendStatus & source);
+
+	Archive::AutoVariable<ChatAvatarId>   characterName;
+	Archive::AutoVariable<ChatAvatarId>   friendName;
+	Archive::AutoVariable<unsigned int>   sequence;  
+	Archive::AutoVariable<bool>           add;  
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatChangeFriendStatus::getCharacterName () const
+{
+	return characterName.get();
+}
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatChangeFriendStatus::getFriendName () const
+{
+	return friendName.get();
+}
+//-----------------------------------------------------------------------
+
+inline unsigned int ChatChangeFriendStatus::getSequence () const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ChatChangeFriendStatus::getAdd () const
+{
+	return add.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatChangeFriendStatus_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatChangeIgnoreStatus.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatChangeIgnoreStatus.cpp
new file mode 100644
index 00000000..2b8758f8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatChangeIgnoreStatus.cpp
@@ -0,0 +1,48 @@
+// ChatChangeIgnoreStatus.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatChangeIgnoreStatus.h"
+
+//-----------------------------------------------------------------------
+
+ChatChangeIgnoreStatus::ChatChangeIgnoreStatus(unsigned int q, const ChatAvatarId & c, const ChatAvatarId & _friendName, bool a) :
+GameNetworkMessage("ChatChangeIgnoreStatus"),
+characterName(c),
+friendName(_friendName),
+sequence(q),
+ignore(a)
+{
+	addVariable(characterName);
+	addVariable(friendName);
+	addVariable(sequence);
+	addVariable(ignore);
+}
+
+//-----------------------------------------------------------------------
+
+ChatChangeIgnoreStatus::ChatChangeIgnoreStatus(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatChangeIgnoreStatus"),
+characterName(),
+friendName(),
+sequence(0),
+ignore(0)
+{
+	addVariable(characterName);
+	addVariable(friendName);
+	addVariable(sequence);
+	addVariable(ignore);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatChangeIgnoreStatus::~ChatChangeIgnoreStatus()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatChangeIgnoreStatus.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatChangeIgnoreStatus.h
new file mode 100644
index 00000000..1b831095
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatChangeIgnoreStatus.h
@@ -0,0 +1,66 @@
+// ChatChangeIgnoreStatus.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+#ifndef	_INCLUDED_ChatChangeIgnoreStatus_H
+#define	_INCLUDED_ChatChangeIgnoreStatus_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatChangeIgnoreStatus : public GameNetworkMessage
+{
+public:
+	ChatChangeIgnoreStatus(unsigned int sequence, const ChatAvatarId & characterName, const ChatAvatarId & friendName, bool ignore);
+	ChatChangeIgnoreStatus(Archive::ReadIterator & source);
+	~ChatChangeIgnoreStatus();
+
+	const ChatAvatarId &  getCharacterName  () const;
+	const ChatAvatarId &  getIgnoreName     () const;
+	unsigned int          getSequence       () const;
+	bool                  getIgnore         () const;
+
+private:
+	ChatChangeIgnoreStatus & operator = (const ChatChangeIgnoreStatus & rhs);
+	ChatChangeIgnoreStatus(const ChatChangeIgnoreStatus & source);
+
+	Archive::AutoVariable<ChatAvatarId>   characterName;
+	Archive::AutoVariable<ChatAvatarId>   friendName;
+	Archive::AutoVariable<unsigned int>   sequence;  
+	Archive::AutoVariable<bool>           ignore;  
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatChangeIgnoreStatus::getCharacterName () const
+{
+	return characterName.get();
+}
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatChangeIgnoreStatus::getIgnoreName () const
+{
+	return friendName.get();
+}
+//-----------------------------------------------------------------------
+
+inline unsigned int ChatChangeIgnoreStatus::getSequence () const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ChatChangeIgnoreStatus::getIgnore () const
+{
+	return ignore.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatChangeIgnoreStatus_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatCreateRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatCreateRoom.cpp
new file mode 100644
index 00000000..db64c56e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatCreateRoom.cpp
@@ -0,0 +1,56 @@
+// ChatCreateRoom.cpp
+// Copyright 2000-02, Sony Online Createtainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatCreateRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatCreateRoom::ChatCreateRoom(const unsigned int s, const std::string & o, const std::string & n, const bool m, const bool p, const std::string & t) :
+GameNetworkMessage("ChatCreateRoom"),
+isPublic(p),
+isModerated(m),
+ownerName(o),
+roomName(n),
+roomTitle(t),
+sequence(s)
+{
+	addVariable(isPublic);
+	addVariable(isModerated);
+	addVariable(ownerName);
+	addVariable(roomName);
+	addVariable(roomTitle);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatCreateRoom::ChatCreateRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatCreateRoom"),
+isPublic(),
+isModerated(),
+ownerName(),
+roomName(),
+roomTitle(),
+sequence()
+{
+	addVariable(isPublic);
+	addVariable(isModerated);
+	addVariable(ownerName);
+	addVariable(roomName);
+	addVariable(roomTitle);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatCreateRoom::~ChatCreateRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatCreateRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatCreateRoom.h
new file mode 100644
index 00000000..f45d677e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatCreateRoom.h
@@ -0,0 +1,84 @@
+// ChatCreateRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatCreateRoom_H
+#define	_INCLUDED_ChatCreateRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatCreateRoom : public GameNetworkMessage
+{
+public:
+	ChatCreateRoom(const unsigned int sequence, const std::string & ownerName, const std::string & roomName, const bool isModerated, const bool isPublic, const std::string & roomTitle);
+	ChatCreateRoom(Archive::ReadIterator &);
+	~ChatCreateRoom();
+
+	const bool               getIsModerated  () const;
+	const bool               getIsPublic     () const;
+	const std::string &      getOwnerName    () const;
+	const std::string &      getRoomName     () const;
+	const unsigned int       getSequence     () const;
+	const std::string &  getRoomTitle    () const;
+
+private:
+	ChatCreateRoom & operator = (const ChatCreateRoom & rhs);
+	ChatCreateRoom(const ChatCreateRoom & source);
+
+	Archive::AutoVariable<bool>             isPublic;
+	Archive::AutoVariable<bool>             isModerated;
+	Archive::AutoVariable<std::string>      ownerName;
+	Archive::AutoVariable<std::string>      roomName;
+	Archive::AutoVariable<std::string>      roomTitle;
+	Archive::AutoVariable<unsigned int>     sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const bool ChatCreateRoom::getIsPublic() const
+{
+	return isPublic.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ChatCreateRoom::getIsModerated() const
+{
+	return isModerated.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatCreateRoom::getOwnerName() const
+{
+	return ownerName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatCreateRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatCreateRoom::getRoomTitle() const
+{
+	return roomTitle.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatCreateRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatCreateRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeleteAllPersistentMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeleteAllPersistentMessages.cpp
new file mode 100644
index 00000000..54edf3b3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeleteAllPersistentMessages.cpp
@@ -0,0 +1,53 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+// ChatDeleteAllPersistentMessages.cpp
+// Copyright 2003, Sony Online Entertainment Inc., all rights reserved. 
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatDeleteAllPersistentMessages.h"
+
+//-----------------------------------------------------------------------------
+
+ChatDeleteAllPersistentMessages::ChatDeleteAllPersistentMessages(NetworkId const &sourceNetworkId, NetworkId const &targetNetworkId)
+ : GameNetworkMessage("ChatDeleteAllPersistentMessages")
+ , m_sourceNetworkId(sourceNetworkId)
+ , m_targetNetworkId(targetNetworkId)
+{
+	addVariable(m_sourceNetworkId);
+	addVariable(m_targetNetworkId);
+}
+
+//-----------------------------------------------------------------------------
+ChatDeleteAllPersistentMessages::ChatDeleteAllPersistentMessages(Archive::ReadIterator & source)
+ : GameNetworkMessage("ChatDeleteAllPersistentMessages")
+ , m_sourceNetworkId()
+ , m_targetNetworkId()
+{
+	addVariable(m_sourceNetworkId);
+	addVariable(m_targetNetworkId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------------
+
+ChatDeleteAllPersistentMessages::~ChatDeleteAllPersistentMessages()
+{
+}
+
+//-----------------------------------------------------------------------------
+
+NetworkId const &ChatDeleteAllPersistentMessages::getSourceNetworkId() const
+{
+	return m_sourceNetworkId.get();
+}
+
+//-----------------------------------------------------------------------------
+
+NetworkId const &ChatDeleteAllPersistentMessages::getTargetNetworkId() const
+{
+	return m_targetNetworkId.get();
+}
+
+///////////////////////////////////////////////////////////////////////////////
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeleteAllPersistentMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeleteAllPersistentMessages.h
new file mode 100644
index 00000000..117cccf0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeleteAllPersistentMessages.h
@@ -0,0 +1,41 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+// ChatDeleteAllPersistentMessages.cpp
+// Copyright 2003, Sony Online Entertainment Inc., all rights reserved. 
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef	INCLUDED_ChatDeleteAllPersistentMessages_H
+#define	INCLUDED_ChatDeleteAllPersistentMessages_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+//-----------------------------------------------------------------------------
+
+class ChatDeleteAllPersistentMessages : public GameNetworkMessage
+{
+public:
+	ChatDeleteAllPersistentMessages(NetworkId const &sourceNetworkId, NetworkId const &targetNetworkId);
+	ChatDeleteAllPersistentMessages(Archive::ReadIterator & source);
+	~ChatDeleteAllPersistentMessages();
+
+	NetworkId const &getSourceNetworkId() const;
+	NetworkId const &getTargetNetworkId() const;
+
+private:
+
+	Archive::AutoVariable<NetworkId> m_sourceNetworkId;
+	Archive::AutoVariable<NetworkId> m_targetNetworkId;
+
+	// Disabled
+
+	ChatDeleteAllPersistentMessages();
+	ChatDeleteAllPersistentMessages & operator = (const ChatDeleteAllPersistentMessages & rhs);
+	ChatDeleteAllPersistentMessages(const ChatDeleteAllPersistentMessages & source);
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+#endif	// INCLUDED_ChatDeleteAllPersistentMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeletePersistentMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeletePersistentMessage.cpp
new file mode 100644
index 00000000..cc113396
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeletePersistentMessage.cpp
@@ -0,0 +1,36 @@
+// ChatDeletePersistentMessage.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatDeletePersistentMessage.h"
+
+//-----------------------------------------------------------------------
+
+ChatDeletePersistentMessage::ChatDeletePersistentMessage(const unsigned int i) :
+GameNetworkMessage("ChatDeletePersistentMessage"),
+messageId(i)
+{
+	addVariable(messageId);
+}
+
+//-----------------------------------------------------------------------
+
+ChatDeletePersistentMessage::ChatDeletePersistentMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatDeletePersistentMessage"),
+messageId()
+{
+	addVariable(messageId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatDeletePersistentMessage::~ChatDeletePersistentMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeletePersistentMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeletePersistentMessage.h
new file mode 100644
index 00000000..4a540a3a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDeletePersistentMessage.h
@@ -0,0 +1,39 @@
+// ChatDeletePersistentMessage.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatDeletePersistentMessage_H
+#define	_INCLUDED_ChatDeletePersistentMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatDeletePersistentMessage : public GameNetworkMessage
+{
+public:
+	explicit ChatDeletePersistentMessage(const unsigned int messageId);
+	ChatDeletePersistentMessage(Archive::ReadIterator &);
+	~ChatDeletePersistentMessage();
+
+	const unsigned int  getMessageId  () const;
+
+private:
+	ChatDeletePersistentMessage & operator = (const ChatDeletePersistentMessage & rhs);
+	ChatDeletePersistentMessage(const ChatDeletePersistentMessage & source);
+
+	Archive::AutoVariable<unsigned int>  messageId;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatDeletePersistentMessage::getMessageId() const
+{
+	return messageId.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatDeletePersistentMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDestroyRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDestroyRoom.cpp
new file mode 100644
index 00000000..3aa10d3c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDestroyRoom.cpp
@@ -0,0 +1,40 @@
+// ChatDestroyRoom.cpp
+// Copyright 2000-02, Sony Online Destroytainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatDestroyRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatDestroyRoom::ChatDestroyRoom(const unsigned int s, const unsigned int i) :
+GameNetworkMessage("ChatDestroyRoom"),
+roomId(i),
+sequence(s)
+{
+	addVariable(roomId);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatDestroyRoom::ChatDestroyRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatDestroyRoom"),
+roomId(),
+sequence()
+{
+	addVariable(roomId);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatDestroyRoom::~ChatDestroyRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDestroyRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDestroyRoom.h
new file mode 100644
index 00000000..85a37c0f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDestroyRoom.h
@@ -0,0 +1,44 @@
+// ChatDestroyRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatDestroyRoom_H
+#define	_INCLUDED_ChatDestroyRoom_H
+
+//-----------------------------------------------------------------------
+
+class ChatDestroyRoom : public GameNetworkMessage
+{
+public:
+	ChatDestroyRoom(const unsigned int sequence, const unsigned int roomId);
+	ChatDestroyRoom(Archive::ReadIterator &);
+	~ChatDestroyRoom();
+
+	const unsigned int   getRoomId     () const;
+	const unsigned int   getSequence     () const;
+
+private:
+	ChatDestroyRoom & operator = (const ChatDestroyRoom & rhs);
+	ChatDestroyRoom(const ChatDestroyRoom & source);
+
+	Archive::AutoVariable<unsigned int>  roomId;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatDestroyRoom::getRoomId() const
+{
+	return roomId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatDestroyRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatDestroyRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDestroyRoomByName.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDestroyRoomByName.cpp
new file mode 100644
index 00000000..deb6d941
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDestroyRoomByName.cpp
@@ -0,0 +1,36 @@
+// ChatDestroyRoomByName.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatDestroyRoomByName.h"
+
+//-----------------------------------------------------------------------
+
+ChatDestroyRoomByName::ChatDestroyRoomByName(const std::string & r) :
+GameNetworkMessage("ChatDestroyRoomByName"),
+roomPath(r)
+{
+	addVariable(roomPath);
+}
+
+//-----------------------------------------------------------------------
+
+ChatDestroyRoomByName::ChatDestroyRoomByName(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatDestroyRoomByName"),
+roomPath()
+{
+	addVariable(roomPath);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatDestroyRoomByName::~ChatDestroyRoomByName()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDestroyRoomByName.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDestroyRoomByName.h
new file mode 100644
index 00000000..79596f7a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatDestroyRoomByName.h
@@ -0,0 +1,39 @@
+// ChatDestroyRoomByName.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatDestroyRoomByName_H
+#define	_INCLUDED_ChatDestroyRoomByName_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatDestroyRoomByName : public GameNetworkMessage
+{
+public:
+	explicit ChatDestroyRoomByName(const std::string & roomPath);
+	explicit ChatDestroyRoomByName(Archive::ReadIterator & ri);
+	~ChatDestroyRoomByName();
+
+	const std::string &  getRoomPath  () const;
+
+private:
+	ChatDestroyRoomByName & operator = (const ChatDestroyRoomByName & rhs);
+	ChatDestroyRoomByName(const ChatDestroyRoomByName & source);
+
+	Archive::AutoVariable<std::string>  roomPath;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatDestroyRoomByName::getRoomPath() const
+{
+	return roomPath.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatDestroyRoomByName_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnterRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnterRoom.cpp
new file mode 100644
index 00000000..1973dc1e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnterRoom.cpp
@@ -0,0 +1,40 @@
+// ChatEnterRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatEnterRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatEnterRoom::ChatEnterRoom(const unsigned int s, const std::string & n) :
+GameNetworkMessage("ChatEnterRoom"),
+roomName(n),
+sequence(s)
+{
+	addVariable(sequence);
+	addVariable(roomName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatEnterRoom::ChatEnterRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatEnterRoom"),
+roomName(),
+sequence()
+{
+	addVariable(sequence);
+	addVariable(roomName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatEnterRoom::~ChatEnterRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnterRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnterRoom.h
new file mode 100644
index 00000000..c363da9e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnterRoom.h
@@ -0,0 +1,48 @@
+// ChatEnterRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatEnterRoom_H
+#define	_INCLUDED_ChatEnterRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatEnterRoom : public GameNetworkMessage
+{
+public:
+	ChatEnterRoom(unsigned int sequence, const std::string & roomName);
+	ChatEnterRoom(Archive::ReadIterator &);
+	~ChatEnterRoom();
+
+	const std::string & getRoomName  () const;
+	const unsigned int  getSequence  () const;
+
+private:
+	ChatEnterRoom & operator = (const ChatEnterRoom & rhs);
+	ChatEnterRoom(const ChatEnterRoom & source);
+
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatEnterRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatEnterRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatEnterRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnterRoomById.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnterRoomById.cpp
new file mode 100644
index 00000000..1b9367bc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnterRoomById.cpp
@@ -0,0 +1,44 @@
+// ChatEnterRoomById.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatEnterRoomById.h"
+
+//-----------------------------------------------------------------------
+
+ChatEnterRoomById::ChatEnterRoomById(const unsigned int s, const unsigned int n, const std::string & name) :
+GameNetworkMessage("ChatEnterRoomById"),
+roomId(n),
+roomName(name),
+sequence(s)
+{
+	addVariable(sequence);
+	addVariable(roomId);
+	addVariable(roomName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatEnterRoomById::ChatEnterRoomById(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatEnterRoomById"),
+roomId(),
+roomName(),
+sequence()
+{
+	addVariable(sequence);
+	addVariable(roomId);
+	addVariable(roomName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatEnterRoomById::~ChatEnterRoomById()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnterRoomById.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnterRoomById.h
new file mode 100644
index 00000000..9d913c23
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnterRoomById.h
@@ -0,0 +1,57 @@
+// ChatEnterRoomById.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatEnterRoomById_H
+#define	_INCLUDED_ChatEnterRoomById_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatEnterRoomById : public GameNetworkMessage
+{
+public:
+	ChatEnterRoomById(unsigned int sequence, const unsigned int roomId, const std::string & roomName);
+	ChatEnterRoomById(Archive::ReadIterator &);
+	~ChatEnterRoomById();
+
+	const unsigned int  getRoomId  () const;
+	const std::string & getRoomName() const;
+	const unsigned int  getSequence() const;
+
+private:
+	ChatEnterRoomById & operator = (const ChatEnterRoomById & rhs);
+	ChatEnterRoomById(const ChatEnterRoomById & source);
+
+	Archive::AutoVariable<unsigned int>  roomId;
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatEnterRoomById::getRoomId() const
+{
+	return roomId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatEnterRoomById::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatEnterRoomById::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatEnterRoomById_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnum.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnum.h
new file mode 100644
index 00000000..df96665b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatEnum.h
@@ -0,0 +1,58 @@
+#ifndef CHATENUM_H
+#define CHATENUM_H
+
+enum ERROR_CODES
+{
+	CHATRESULT_SUCCESS = 0,          // 0
+	ERR_TIMEOUT,		             // 1
+	ERR_DUPLICATELOGIN,              // 2
+	ERR_SRCAVATARDOESNTEXIST,        // 3
+	ERR_DESTAVATARDOESNTEXIST,       // 4
+	ERR_ADDRESSDOESNTEXIST,          // 5
+	ERR_ADDRESSNOTROOM,		         // 6
+	ERR_ADDRESSNOTAID,		         // 7
+	ERR_FRIENDNOTFOUND,		         // 8
+	ERR_ROOM_UNKNOWNFAILURE,         // 9
+	ERR_ROOM_SRCNOTINROOM,	         // 10
+	ERR_ROOM_DESTNOTINROOM,	         // 11
+	ERR_ROOM_BANNEDAVATAR,	         // 12
+	ERR_ROOM_PRIVATEROOM,	         // 13
+	ERR_ROOM_MODERATEDROOM,	         // 14
+	ERR_ROOM_NOTINROOM,		         // 15
+	ERR_ROOM_NOPRIVILEGES,	         // 16
+	ERR_DATABASE,			         // 17
+	ERR_CANNOTGETAVATARID,	         // 18
+	ERR_CANNOTGETNODEID,	         // 19
+	ERR_CANNOTGETPMSGID,	         // 20
+	ERR_PMSGNOTFOUND,		         // 21
+	ERR_ROOM_MAXAVATARSREACHED,      // 22
+	ERR_IGNORING,			         // 23
+	ERR_ROOMALREADYEXISTS,	         // 24
+	ERR_NOTHINGTOCONFIRM,            // 25
+	ERR_DUPLICATEFRIEND,             // 26
+	ERR_IGNORENOTFOUND,              // 27
+	ERR_DUPLICATEIGNORE,             // 28
+	ERR_DBFAIL,                      // 29
+	ERR_ROOM_DESTAVATARNOTMODERATOR, // 30
+	ERR_ROOM_DESTAVATARNOTINVITED,   // 31
+	ERR_ROOM_DESTAVATARNOTBANNED,    // 32
+	ERR_ROOM_DUPLICATEBAN,           // 33
+	ERR_ROOM_DUPLICATEMODERATOR,     // 34
+	ERR_ROOM_DUPLICATEINVITE,        // 35
+	ERR_ROOM_ALREADYINROOM,          // 36
+	ERR_ROOM_PARENTNONPERSISTENT,    // 37
+	ERR_ROOM_PARENTBADNODETYPE,      // 38
+	ERR_NOFANCLUBHANDLE,             // 39
+
+	// SWG specific codes for chat
+	// make sure that these never collide with those defined above and in
+	// src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/projects/Chat/ChatAPI/ChatEnum.h
+	SWG_CHAT_ERR_CHAT_SERVER_UNAVAILABLE = 1000000,
+	SWG_CHAT_ERR_WRONG_FACTION,
+	SWG_CHAT_ERR_INVALID_OBJECT,
+	SWG_CHAT_ERR_NO_GAME_SERVER,
+	SWG_CHAT_ERR_NOT_WARDEN,
+	SWG_CHAT_ERR_WRONG_GCW_REGION_DEFENDER_FACTION
+};
+
+#endif // CHATENUM_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatFriendsListUpdate.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatFriendsListUpdate.cpp
new file mode 100644
index 00000000..e74bd7f9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatFriendsListUpdate.cpp
@@ -0,0 +1,40 @@
+// ChatFriendsListUpdate.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatFriendsListUpdate.h"
+
+//-----------------------------------------------------------------------
+
+ChatFriendsListUpdate::ChatFriendsListUpdate(const ChatAvatarId & c, const bool o) :
+GameNetworkMessage("ChatFriendsListUpdate"),
+characterName(c),
+isOnline(o)
+{
+	addVariable(characterName);
+	addVariable(isOnline);
+}
+
+//-----------------------------------------------------------------------
+
+ChatFriendsListUpdate::ChatFriendsListUpdate(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatFriendsListUpdate"),
+characterName(),
+isOnline()
+{
+	addVariable(characterName);
+	addVariable(isOnline);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatFriendsListUpdate::~ChatFriendsListUpdate()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatFriendsListUpdate.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatFriendsListUpdate.h
new file mode 100644
index 00000000..1473ff33
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatFriendsListUpdate.h
@@ -0,0 +1,50 @@
+// ChatFriendsListUpdate.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatFriendsListUpdate_H
+#define	_INCLUDED_ChatFriendsListUpdate_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatFriendsListUpdate : public GameNetworkMessage
+{
+public:
+	ChatFriendsListUpdate(const ChatAvatarId & characterName, const bool isOnline);
+	ChatFriendsListUpdate(Archive::ReadIterator & source);
+	~ChatFriendsListUpdate();
+
+	const ChatAvatarId &  getCharacterName  () const;
+	const bool            getIsOnline       () const;
+
+private:
+	ChatFriendsListUpdate & operator = (const ChatFriendsListUpdate & rhs);
+	ChatFriendsListUpdate(const ChatFriendsListUpdate & source);
+
+	Archive::AutoVariable<ChatAvatarId>  characterName;
+	Archive::AutoVariable<bool>          isOnline;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatFriendsListUpdate::getCharacterName() const
+{
+	return characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ChatFriendsListUpdate::getIsOnline() const
+{
+	return isOnline.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatFriendsListUpdate_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatGetFriendsList.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatGetFriendsList.cpp
new file mode 100644
index 00000000..890da8a0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatGetFriendsList.cpp
@@ -0,0 +1,36 @@
+// ChatGetFriendsList.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatGetFriendsList.h"
+
+//-----------------------------------------------------------------------
+
+ChatGetFriendsList::ChatGetFriendsList(const ChatAvatarId & c) :
+GameNetworkMessage("ChatGetFriendsList"),
+characterName(c)
+{
+	addVariable(characterName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatGetFriendsList::ChatGetFriendsList(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatGetFriendsList"),
+characterName()
+{
+	addVariable(characterName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatGetFriendsList::~ChatGetFriendsList()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatGetFriendsList.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatGetFriendsList.h
new file mode 100644
index 00000000..97bbb99d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatGetFriendsList.h
@@ -0,0 +1,41 @@
+// ChatGetFriendsList.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+#ifndef	_INCLUDED_ChatGetFriendsList_H
+#define	_INCLUDED_ChatGetFriendsList_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include <vector>
+
+//-----------------------------------------------------------------------
+
+class ChatGetFriendsList : public GameNetworkMessage
+{
+public:
+	ChatGetFriendsList(const ChatAvatarId & characterName);
+	ChatGetFriendsList(Archive::ReadIterator & source);
+	~ChatGetFriendsList();
+
+	const ChatAvatarId &               getCharacterName  () const;
+
+private:
+	ChatGetFriendsList & operator = (const ChatGetFriendsList & rhs);
+	ChatGetFriendsList(const ChatGetFriendsList & source);
+
+	Archive::AutoVariable<ChatAvatarId>   characterName;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatGetFriendsList::getCharacterName () const
+{
+	return characterName.get();
+}
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatGetFriendsList_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatGetIgnoreList.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatGetIgnoreList.cpp
new file mode 100644
index 00000000..3d6742f1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatGetIgnoreList.cpp
@@ -0,0 +1,36 @@
+// ChatGetIgnoreList.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatGetIgnoreList.h"
+
+//-----------------------------------------------------------------------
+
+ChatGetIgnoreList::ChatGetIgnoreList(const ChatAvatarId & c) :
+GameNetworkMessage("ChatGetIgnoreList"),
+characterName(c)
+{
+	addVariable(characterName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatGetIgnoreList::ChatGetIgnoreList(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatGetIgnoreList"),
+characterName()
+{
+	addVariable(characterName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatGetIgnoreList::~ChatGetIgnoreList()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatGetIgnoreList.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatGetIgnoreList.h
new file mode 100644
index 00000000..56f23652
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatGetIgnoreList.h
@@ -0,0 +1,41 @@
+// ChatGetIgnoreList.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+#ifndef	_INCLUDED_ChatGetIgnoreList_H
+#define	_INCLUDED_ChatGetIgnoreList_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include <vector>
+
+//-----------------------------------------------------------------------
+
+class ChatGetIgnoreList : public GameNetworkMessage
+{
+public:
+	ChatGetIgnoreList(const ChatAvatarId & characterName);
+	ChatGetIgnoreList(Archive::ReadIterator & source);
+	~ChatGetIgnoreList();
+
+	const ChatAvatarId &               getCharacterName  () const;
+
+private:
+	ChatGetIgnoreList & operator = (const ChatGetIgnoreList & rhs);
+	ChatGetIgnoreList(const ChatGetIgnoreList & source);
+
+	Archive::AutoVariable<ChatAvatarId>   characterName;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatGetIgnoreList::getCharacterName () const
+{
+	return characterName.get();
+}
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatGetIgnoreList_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInstantMessageToCharacter.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInstantMessageToCharacter.cpp
new file mode 100644
index 00000000..2bdc0b6b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInstantMessageToCharacter.cpp
@@ -0,0 +1,48 @@
+// ChatInstantMessageToCharacter.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatInstantMessageToCharacter.h"
+
+//-----------------------------------------------------------------------
+
+ChatInstantMessageToCharacter::ChatInstantMessageToCharacter(const unsigned int s, const ChatAvatarId & c, const Unicode::String & m, const Unicode::String & o) :
+GameNetworkMessage("ChatInstantMessageToCharacter"),
+characterName(c),
+message(m),
+outOfBand(o),
+sequence(s)
+{
+	addVariable(characterName);
+	addVariable(message);
+	addVariable(outOfBand);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatInstantMessageToCharacter::ChatInstantMessageToCharacter(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatInstantMessageToCharacter"),
+characterName(),
+message(),
+outOfBand(),
+sequence()
+{
+	addVariable(characterName);
+	addVariable(message);
+	addVariable(outOfBand);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatInstantMessageToCharacter::~ChatInstantMessageToCharacter()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInstantMessageToCharacter.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInstantMessageToCharacter.h
new file mode 100644
index 00000000..e4e5d088
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInstantMessageToCharacter.h
@@ -0,0 +1,68 @@
+// ChatInstantMessageToCharacter.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatInstantMessageToCharacter_H
+#define	_INCLUDED_ChatInstantMessageToCharacter_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatInstantMessageToCharacter : public GameNetworkMessage
+{
+public:
+	ChatInstantMessageToCharacter(unsigned int sequence, const ChatAvatarId & characterName, const Unicode::String & message, const Unicode::String & outOfBand);
+	ChatInstantMessageToCharacter(Archive::ReadIterator & source);
+	~ChatInstantMessageToCharacter();
+
+	const ChatAvatarId &     getCharacterName  () const;
+	const Unicode::String &  getMessage        () const;
+	const Unicode::String &  getOutOfBand      () const;
+	const unsigned int       getSequence       () const;
+
+private:
+	ChatInstantMessageToCharacter & operator = (const ChatInstantMessageToCharacter & rhs);
+	ChatInstantMessageToCharacter(const ChatInstantMessageToCharacter & source);
+	
+	Archive::AutoVariable<ChatAvatarId>     characterName;
+	Archive::AutoVariable<Unicode::String>  message;
+	Archive::AutoVariable<Unicode::String>  outOfBand;
+	Archive::AutoVariable<unsigned int>     sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatInstantMessageToCharacter::getCharacterName() const
+{
+	return characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatInstantMessageToCharacter::getMessage() const
+{
+	return message.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatInstantMessageToCharacter::getOutOfBand() const
+{
+	return outOfBand.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatInstantMessageToCharacter::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatInstantMessageToCharacter_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInstantMessageToClient.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInstantMessageToClient.cpp
new file mode 100644
index 00000000..5d42cc86
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInstantMessageToClient.cpp
@@ -0,0 +1,44 @@
+// ChatInstantMessageToClient.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatInstantMessageToClient.h"
+
+//-----------------------------------------------------------------------
+
+ChatInstantMessageToClient::ChatInstantMessageToClient(const ChatAvatarId & f, const Unicode::String & m, const Unicode::String & o) :
+GameNetworkMessage("ChatInstantMessageToClient"),
+fromName(f),
+message(m),
+outOfBand(o)
+{
+	addVariable(fromName);
+	addVariable(message);
+	addVariable(outOfBand);
+}
+
+//-----------------------------------------------------------------------
+
+ChatInstantMessageToClient::ChatInstantMessageToClient(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatInstantMessageToClient"),
+fromName(),
+message(),
+outOfBand()
+{
+	addVariable(fromName);
+	addVariable(message);
+	addVariable(outOfBand);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatInstantMessageToClient::~ChatInstantMessageToClient()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInstantMessageToClient.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInstantMessageToClient.h
new file mode 100644
index 00000000..aa9c514b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInstantMessageToClient.h
@@ -0,0 +1,59 @@
+// ChatInstantMessageToClient.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatInstantMessageToClient_H
+#define	_INCLUDED_ChatInstantMessageToClient_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatInstantMessageToClient : public GameNetworkMessage
+{
+public:
+	ChatInstantMessageToClient(const ChatAvatarId & fromName, const Unicode::String & message, const Unicode::String & outOfBand);
+	explicit ChatInstantMessageToClient(Archive::ReadIterator & source);
+	~ChatInstantMessageToClient();
+
+	const ChatAvatarId &     getFromName   () const;
+	const Unicode::String &  getMessage    () const;
+	const Unicode::String &  getOutOfBand  () const;
+
+private:
+	ChatInstantMessageToClient & operator = (const ChatInstantMessageToClient & rhs);
+	ChatInstantMessageToClient(const ChatInstantMessageToClient & source);
+
+	Archive::AutoVariable<ChatAvatarId>     fromName;
+	Archive::AutoVariable<Unicode::String>  message;
+	Archive::AutoVariable<Unicode::String>  outOfBand;
+};
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatInstantMessageToClient::getMessage() const
+{
+	return message.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatInstantMessageToClient::getFromName() const
+{
+	return fromName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatInstantMessageToClient::getOutOfBand() const
+{
+	return outOfBand.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatInstantMessageToClient_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteAvatarToRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteAvatarToRoom.cpp
new file mode 100644
index 00000000..0fff85b5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteAvatarToRoom.cpp
@@ -0,0 +1,41 @@
+// ChatInviteAvatarToRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatInviteAvatarToRoom.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatInviteAvatarToRoom::ChatInviteAvatarToRoom(const ChatAvatarId & a, const std::string & r) :
+GameNetworkMessage("ChatInviteAvatarToRoom"),
+avatarId(a),
+roomName(r)
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatInviteAvatarToRoom::ChatInviteAvatarToRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatInviteAvatarToRoom"),
+avatarId(),
+roomName()
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatInviteAvatarToRoom::~ChatInviteAvatarToRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteAvatarToRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteAvatarToRoom.h
new file mode 100644
index 00000000..ef9b3d0a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteAvatarToRoom.h
@@ -0,0 +1,49 @@
+// ChatInviteAvatarToRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatInviteAvatarToRoom_H
+#define	_INCLUDED_ChatInviteAvatarToRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+
+//-----------------------------------------------------------------------
+
+class ChatInviteAvatarToRoom : public GameNetworkMessage
+{
+public:
+	ChatInviteAvatarToRoom(const ChatAvatarId & avatarId, const std::string & roomName);
+	ChatInviteAvatarToRoom(Archive::ReadIterator & source);
+	~ChatInviteAvatarToRoom();
+
+	const ChatAvatarId &  getAvatarId  () const;
+	const std::string &   getRoomName  () const;
+
+private:
+	ChatInviteAvatarToRoom & operator = (const ChatInviteAvatarToRoom & rhs);
+	ChatInviteAvatarToRoom(const ChatInviteAvatarToRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  avatarId;
+	Archive::AutoVariable<std::string>   roomName;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatInviteAvatarToRoom::getAvatarId() const
+{
+	return avatarId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatInviteAvatarToRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatInviteAvatarToRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.cpp
new file mode 100644
index 00000000..959f0dab
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.cpp
@@ -0,0 +1,57 @@
+// ChatInviteGroupMembersToRoom.cpp
+// Copyright 2000-05, Sony Online Entertainment Inc., all rights reserved. 
+// Author: RoyFleck
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatInviteGroupMembersToRoom.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatInviteGroupMembersToRoom::ChatInviteGroupMembersToRoom(const NetworkId & i, const ChatAvatarId & g, const std::string & r, const stdvector<NetworkId>::fwd & m) :
+GameNetworkMessage("ChatInviteGroupMembersToRoom"),
+invitorNetworkId(i),
+groupLeaderId(g),
+roomName(r),
+invitedMembers()
+{
+	invitedMembers.set(m);
+
+	addVariable(invitorNetworkId);
+	addVariable(groupLeaderId);
+	addVariable(roomName);
+	addVariable(invitedMembers);
+}
+
+//-----------------------------------------------------------------------
+
+ChatInviteGroupMembersToRoom::ChatInviteGroupMembersToRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatInviteGroupMembersToRoom"),
+invitorNetworkId(),
+groupLeaderId(),
+roomName(),
+invitedMembers()
+{
+	addVariable(invitorNetworkId);
+	addVariable(groupLeaderId);
+	addVariable(roomName);
+	addVariable(invitedMembers);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatInviteGroupMembersToRoom::~ChatInviteGroupMembersToRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const std::vector<NetworkId> & ChatInviteGroupMembersToRoom::getInvitedMembers() const
+{
+	return invitedMembers.get();
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.h
new file mode 100644
index 00000000..3f204fda
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.h
@@ -0,0 +1,62 @@
+// ChatInviteGroupMembersToRoom.h
+// Copyright 2000-05, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Roy Fleck
+
+#ifndef	_INCLUDED_ChatInviteGroupMembersToRoom_H
+#define	_INCLUDED_ChatInviteGroupMembersToRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedFoundation/NetworkId.h"
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class ChatInviteGroupMembersToRoom : public GameNetworkMessage
+{
+public:
+	ChatInviteGroupMembersToRoom(const NetworkId & invitor, const ChatAvatarId & groupLeaderId, const std::string & roomName, const stdvector<NetworkId>::fwd & members);
+	explicit ChatInviteGroupMembersToRoom(Archive::ReadIterator & source);
+	~ChatInviteGroupMembersToRoom();
+
+	const NetworkId &                 getInvitorNetworkId() const;
+	const ChatAvatarId &              getGroupLeaderId   () const;
+	const std::string &               getRoomName        () const;
+	const stdvector<NetworkId>::fwd & getInvitedMembers  () const;
+
+private:
+	ChatInviteGroupMembersToRoom & operator = (const ChatInviteGroupMembersToRoom & rhs);
+	ChatInviteGroupMembersToRoom(const ChatInviteGroupMembersToRoom & source);
+
+	Archive::AutoVariable<NetworkId>    invitorNetworkId;
+	Archive::AutoVariable<ChatAvatarId> groupLeaderId;
+	Archive::AutoVariable<std::string>  roomName;
+	Archive::AutoArray<NetworkId>       invitedMembers;
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & ChatInviteGroupMembersToRoom::getInvitorNetworkId() const
+{
+	return invitorNetworkId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatInviteGroupMembersToRoom::getGroupLeaderId() const
+{
+	return groupLeaderId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatInviteGroupMembersToRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatInviteGroupMembersToRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupToRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupToRoom.cpp
new file mode 100644
index 00000000..32ec93dc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupToRoom.cpp
@@ -0,0 +1,41 @@
+// ChatInviteGroupToRoom.cpp
+// Copyright 2000-05, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Roy Fleck
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatInviteGroupToRoom.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatInviteGroupToRoom::ChatInviteGroupToRoom(const ChatAvatarId & a, const std::string & r) :
+GameNetworkMessage("ChatInviteGroupToRoom"),
+avatarId(a),
+roomName(r)
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatInviteGroupToRoom::ChatInviteGroupToRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatInviteGroupToRoom"),
+avatarId(),
+roomName()
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatInviteGroupToRoom::~ChatInviteGroupToRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupToRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupToRoom.h
new file mode 100644
index 00000000..78766f1e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupToRoom.h
@@ -0,0 +1,49 @@
+// ChatInviteGroupToRoom.h
+// Copyright 2000-05, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Roy Fleck
+
+#ifndef	_INCLUDED_ChatInviteGroupToRoom_H
+#define	_INCLUDED_ChatInviteGroupToRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+
+//-----------------------------------------------------------------------
+
+class ChatInviteGroupToRoom : public GameNetworkMessage
+{
+public:
+	ChatInviteGroupToRoom(const ChatAvatarId & avatarId, const std::string & roomName);
+	ChatInviteGroupToRoom(Archive::ReadIterator & source);
+	~ChatInviteGroupToRoom();
+
+	const ChatAvatarId &  getAvatarId  () const;
+	const std::string &   getRoomName  () const;
+
+private:
+	ChatInviteGroupToRoom & operator = (const ChatInviteGroupToRoom & rhs);
+	ChatInviteGroupToRoom(const ChatInviteGroupToRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  avatarId;
+	Archive::AutoVariable<std::string>   roomName;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatInviteGroupToRoom::getAvatarId() const
+{
+	return avatarId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatInviteGroupToRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatInviteGroupToRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatKickAvatarFromRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatKickAvatarFromRoom.cpp
new file mode 100644
index 00000000..4f7cb735
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatKickAvatarFromRoom.cpp
@@ -0,0 +1,45 @@
+// ChatKickAvatarFromRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Roy Fleck
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include "sharedNetworkMessages/ChatKickAvatarFromRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatKickAvatarFromRoom::ChatKickAvatarFromRoom(
+	const ChatAvatarId & avatarId,
+	const std::string & roomName
+) :
+	GameNetworkMessage("ChatKickAvatarFromRoom"),
+	m_avatarId(avatarId),
+	m_roomName(roomName)
+{
+	addVariable(m_avatarId);
+	addVariable(m_roomName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatKickAvatarFromRoom::ChatKickAvatarFromRoom(Archive::ReadIterator & source) :
+	GameNetworkMessage("ChatKickAvatarFromRoom"),
+	m_avatarId(),
+	m_roomName()
+{
+	addVariable(m_avatarId);
+	addVariable(m_roomName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatKickAvatarFromRoom::~ChatKickAvatarFromRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatKickAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatKickAvatarFromRoom.h
new file mode 100644
index 00000000..e02e3649
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatKickAvatarFromRoom.h
@@ -0,0 +1,48 @@
+// ChatKickAvatarFromRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Roy Fleck
+
+#ifndef	_INCLUDED_ChatKickAvatarFromRoom_H
+#define	_INCLUDED_ChatKickAvatarFromRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatKickAvatarFromRoom : public GameNetworkMessage
+{
+public:
+	ChatKickAvatarFromRoom(const ChatAvatarId & avatarId, const std::string & roomName);
+	explicit ChatKickAvatarFromRoom(Archive::ReadIterator & source);
+	~ChatKickAvatarFromRoom();
+
+	const ChatAvatarId &  getAvatarId    () const;
+	const std::string &   getRoomName    () const;
+
+private:
+	ChatKickAvatarFromRoom & operator = (const ChatKickAvatarFromRoom & rhs);
+	ChatKickAvatarFromRoom(const ChatKickAvatarFromRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId> m_avatarId;
+	Archive::AutoVariable<std::string>  m_roomName;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatKickAvatarFromRoom::getAvatarId() const
+{
+	return m_avatarId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatKickAvatarFromRoom::getRoomName() const
+{
+	return m_roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatKickAvatarFromRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatMessageFromGame.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatMessageFromGame.cpp
new file mode 100644
index 00000000..f414bae0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatMessageFromGame.cpp
@@ -0,0 +1,103 @@
+// ChatMessageFromGame.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatMessageFromGame.h"
+#include "UnicodeUtils.h"
+
+//-----------------------------------------------------------------------
+
+ChatMessageFromGame::ChatMessageFromGame(enum MessageTypes mt, const std::string & f, const std::string & t, const Unicode::String & m, const Unicode::String & o) :
+GameNetworkMessage("ChatMessageFromGame"),
+from(f),
+message(m),
+messageType(static_cast<unsigned char>(mt)),
+oob(o),
+room(""),
+subject(Unicode::narrowToWide("")),
+to(t)
+{
+	addVariable(from);
+	addVariable(message);
+	addVariable(messageType);
+	addVariable(oob);
+	addVariable(room);
+	addVariable(subject);
+	addVariable(to);
+}
+
+//-----------------------------------------------------------------------
+
+ChatMessageFromGame::ChatMessageFromGame(enum MessageTypes mt, const std::string & f, const std::string & t, const Unicode::String & m, const Unicode::String & o, const Unicode::String & s) :
+GameNetworkMessage("ChatMessageFromGame"),
+from(f),
+message(m),
+messageType(static_cast<unsigned char>(mt)),
+oob(o),
+room(""),
+subject(s),
+to(t)
+{
+	addVariable(from);
+	addVariable(message);
+	addVariable(messageType);
+	addVariable(oob);
+	addVariable(room);
+	addVariable(subject);
+	addVariable(to);
+}
+
+//-----------------------------------------------------------------------
+
+ChatMessageFromGame::ChatMessageFromGame(enum MessageTypes mt, const std::string & f, const Unicode::String & m, const Unicode::String & o, const std::string & r) :
+GameNetworkMessage("ChatMessageFromGame"),
+from(f),
+message(m),
+messageType(static_cast<unsigned char>(mt)),
+oob(o),
+room(r),
+subject(Unicode::narrowToWide("")),
+to()
+{
+	addVariable(from);
+	addVariable(message);
+	addVariable(messageType);
+	addVariable(oob);
+	addVariable(room);
+	addVariable(subject);
+	addVariable(to);
+}
+
+//-----------------------------------------------------------------------
+
+ChatMessageFromGame::ChatMessageFromGame(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatMessageFromGame"),
+from(),
+message(),
+messageType(INSTANT),
+oob(),
+room(),
+subject(),
+to()
+{
+	addVariable(from);
+	addVariable(message);
+	addVariable(messageType);
+	addVariable(oob);
+	addVariable(room);
+	addVariable(subject);
+	addVariable(to);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatMessageFromGame::~ChatMessageFromGame()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatMessageFromGame.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatMessageFromGame.h
new file mode 100644
index 00000000..a4277184
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatMessageFromGame.h
@@ -0,0 +1,103 @@
+// ChatMessageFromGame.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatMessageFromGame_H
+#define	_INCLUDED_ChatMessageFromGame_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatMessageFromGame : public GameNetworkMessage
+{
+public:
+	enum MessageTypes
+	{
+		INSTANT,
+		PERSISTENT,
+		ROOM
+	};
+
+	ChatMessageFromGame(enum MessageTypes messageType, const std::string & from, const std::string & to, const Unicode::String & message, const Unicode::String & oob);
+	ChatMessageFromGame(enum MessageTypes messageType, const std::string & from, const std::string & to, const Unicode::String & message, const Unicode::String & oob, const Unicode::String & subject);
+	ChatMessageFromGame(enum MessageTypes messageType, const std::string & from, const Unicode::String & message, const Unicode::String & oob, const std::string & room);
+	explicit ChatMessageFromGame(Archive::ReadIterator & source);
+	~ChatMessageFromGame();
+
+
+	const std::string &      getFrom         () const;
+	const Unicode::String &  getMessage      () const;
+	const MessageTypes       getMessageType  () const;
+	const Unicode::String &  getOutOfBand    () const;
+	const std::string &      getRoom         () const;
+	const Unicode::String &  getSubject      () const;
+	const std::string &      getTo           () const;
+
+private:
+	ChatMessageFromGame & operator = (const ChatMessageFromGame & rhs);
+	ChatMessageFromGame(const ChatMessageFromGame & source);
+
+	Archive::AutoVariable<std::string>      from;
+	Archive::AutoVariable<Unicode::String>  message;
+	Archive::AutoVariable<unsigned char>    messageType;
+	Archive::AutoVariable<Unicode::String>  oob;
+	Archive::AutoVariable<std::string>      room;
+	Archive::AutoVariable<Unicode::String>  subject;
+	Archive::AutoVariable<std::string>      to;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string &  ChatMessageFromGame::getFrom() const
+{
+	return from.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatMessageFromGame::getMessage() const
+{
+	return message.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatMessageFromGame::MessageTypes ChatMessageFromGame::getMessageType() const
+{
+	return static_cast<MessageTypes>(messageType.get());
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatMessageFromGame::getOutOfBand() const
+{
+	return oob.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatMessageFromGame::getRoom() const
+{
+	return room.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatMessageFromGame::getSubject() const
+{
+	return subject.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatMessageFromGame::getTo() const
+{
+	return to.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatMessageFromGame_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnAddFriend.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnAddFriend.cpp
new file mode 100644
index 00000000..f1df0d34
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnAddFriend.cpp
@@ -0,0 +1,40 @@
+// ChatOnAddFriend.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatOnAddFriend.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnAddFriend::ChatOnAddFriend(const unsigned int s, const unsigned int r) :
+GameNetworkMessage("ChatOnAddFriend"),
+result(r),
+sequence(s)
+{
+	addVariable(result);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnAddFriend::ChatOnAddFriend(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnAddFriend"),
+result(),
+sequence()
+{
+	addVariable(result);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnAddFriend::~ChatOnAddFriend()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnAddFriend.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnAddFriend.h
new file mode 100644
index 00000000..0be86cac
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnAddFriend.h
@@ -0,0 +1,49 @@
+// ChatOnAddFriend.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnAddFriend_H
+#define	_INCLUDED_ChatOnAddFriend_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnAddFriend : public GameNetworkMessage
+{
+public:
+	ChatOnAddFriend(const unsigned int sequence, const unsigned int result);
+	ChatOnAddFriend(Archive::ReadIterator & source);
+	~ChatOnAddFriend();
+
+	const unsigned int  getResult    () const;
+	const unsigned int  getSequence  () const;
+
+private:
+	ChatOnAddFriend & operator = (const ChatOnAddFriend & rhs);
+	ChatOnAddFriend(const ChatOnAddFriend & source);
+
+	Archive::AutoVariable<unsigned int>  result;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnAddFriend::getResult() const
+{
+	return result.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnAddFriend::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnAddFriend_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnAddModeratorToRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnAddModeratorToRoom.cpp
new file mode 100644
index 00000000..1a8b275b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnAddModeratorToRoom.cpp
@@ -0,0 +1,52 @@
+// ChatOnAddModeratorToRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatOnAddModeratorToRoom.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnAddModeratorToRoom::ChatOnAddModeratorToRoom(const unsigned int c, const unsigned int s, const ChatAvatarId & a, const ChatAvatarId &granter, const std::string & r) :
+GameNetworkMessage("ChatOnAddModeratorToRoom"),
+avatarId(a),
+granterId(granter),
+resultCode(c),
+roomName(r),
+sequenceId(s)
+{
+	addVariable(avatarId);
+	addVariable(granterId);
+	addVariable(resultCode);
+	addVariable(roomName);
+	addVariable(sequenceId);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnAddModeratorToRoom::ChatOnAddModeratorToRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnAddModeratorToRoom"),
+avatarId(),
+granterId(),
+resultCode(),
+roomName(),
+sequenceId()
+{
+	addVariable(avatarId);
+	addVariable(granterId);
+	addVariable(resultCode);
+	addVariable(roomName);
+	addVariable(sequenceId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnAddModeratorToRoom::~ChatOnAddModeratorToRoom()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnAddModeratorToRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnAddModeratorToRoom.h
new file mode 100644
index 00000000..4cec9044
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnAddModeratorToRoom.h
@@ -0,0 +1,77 @@
+// ChatOnAddModeratorToRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnAddModeratorToRoom_H
+#define	_INCLUDED_ChatOnAddModeratorToRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnAddModeratorToRoom : public GameNetworkMessage
+{
+public:
+	ChatOnAddModeratorToRoom(const unsigned int resultCode, const unsigned int sequenceId, const ChatAvatarId & avatarId, const ChatAvatarId &granter, const std::string & roomName);
+	explicit ChatOnAddModeratorToRoom(Archive::ReadIterator & source);
+	~ChatOnAddModeratorToRoom();
+
+	const ChatAvatarId &  getAvatarId    () const;
+	const ChatAvatarId &  getGranterId   () const;
+	const unsigned int    getResultCode  () const;
+	const std::string &   getRoomName    () const;
+	const unsigned int    getSequenceId  () const;
+
+private:
+	ChatOnAddModeratorToRoom & operator = (const ChatOnAddModeratorToRoom & rhs);
+	ChatOnAddModeratorToRoom(const ChatOnAddModeratorToRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  avatarId;
+	Archive::AutoVariable<ChatAvatarId>  granterId;
+	Archive::AutoVariable<unsigned int>  resultCode;
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<unsigned int>  sequenceId;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnAddModeratorToRoom::getAvatarId() const
+{
+	return avatarId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnAddModeratorToRoom::getGranterId() const
+{
+	return granterId.get();
+}
+
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnAddModeratorToRoom::getResultCode() const
+{
+	return resultCode.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatOnAddModeratorToRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnAddModeratorToRoom::getSequenceId() const
+{
+	return sequenceId.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnAddModeratorToRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnBanAvatarFromRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnBanAvatarFromRoom.cpp
new file mode 100644
index 00000000..d1606acd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnBanAvatarFromRoom.cpp
@@ -0,0 +1,52 @@
+// ChatOnBanAvatarFromRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatOnBanAvatarFromRoom.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnBanAvatarFromRoom::ChatOnBanAvatarFromRoom(const unsigned int s, const unsigned int r, const std::string &room, const ChatAvatarId &bannerId, const ChatAvatarId &banneeId) :
+GameNetworkMessage("ChatOnBanAvatarFromRoom"),
+roomName(room),
+banner(bannerId),
+bannee(banneeId),
+result(r),
+sequence(s)
+{
+	addVariable(roomName);
+	addVariable(banner);
+	addVariable(bannee);
+	addVariable(result);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnBanAvatarFromRoom::ChatOnBanAvatarFromRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnBanAvatarFromRoom"),
+roomName(),
+banner(),
+bannee(),
+result(),
+sequence()
+{
+	addVariable(roomName);
+	addVariable(banner);
+	addVariable(bannee);
+	addVariable(result);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnBanAvatarFromRoom::~ChatOnBanAvatarFromRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnBanAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnBanAvatarFromRoom.h
new file mode 100644
index 00000000..b67e6e03
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnBanAvatarFromRoom.h
@@ -0,0 +1,80 @@
+// ChatOnBanAvatarFromRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnBanAvatarFromRoom_H
+#define	_INCLUDED_ChatOnBanAvatarFromRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class ChatOnBanAvatarFromRoom : public GameNetworkMessage
+{
+public:
+	ChatOnBanAvatarFromRoom(const unsigned int sequence, const unsigned int result, const std::string &roomName, const ChatAvatarId &banner, const ChatAvatarId &bannee );
+	ChatOnBanAvatarFromRoom(Archive::ReadIterator & source);
+	~ChatOnBanAvatarFromRoom();
+
+	const std::string  & getRoomName  () const;
+	const ChatAvatarId & getBanner    () const;
+	const ChatAvatarId & getBannee    () const;
+	const unsigned int   getResult    () const;
+	const unsigned int   getSequence  () const;
+
+private:
+	ChatOnBanAvatarFromRoom & operator = (const ChatOnBanAvatarFromRoom & rhs);
+	ChatOnBanAvatarFromRoom(const ChatOnBanAvatarFromRoom & source);
+
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<ChatAvatarId>  banner;
+	Archive::AutoVariable<ChatAvatarId>  bannee;
+	Archive::AutoVariable<unsigned int>  result;
+	Archive::AutoVariable<unsigned int>  sequence;
+
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatOnBanAvatarFromRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnBanAvatarFromRoom::getBanner() const
+{
+	return banner.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnBanAvatarFromRoom::getBannee() const
+{
+	return bannee.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnBanAvatarFromRoom::getResult() const
+{
+	return result.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnBanAvatarFromRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnBanAvatarFromRoom_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnChangeFriendStatus.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnChangeFriendStatus.cpp
new file mode 100644
index 00000000..b8ab1f9c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnChangeFriendStatus.cpp
@@ -0,0 +1,52 @@
+// ChatOnChangeFriendStatus.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatOnChangeFriendStatus.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnChangeFriendStatus::ChatOnChangeFriendStatus(unsigned int q, const NetworkId & c, const ChatAvatarId & _friendName, bool a, unsigned int result) :
+GameNetworkMessage("ChatOnChangeFriendStatus"),
+character(c),
+friendName(_friendName),
+sequence(q),
+add(a),
+resultCode(result)
+{
+	addVariable(character);
+	addVariable(friendName);
+	addVariable(sequence);
+	addVariable(add);
+	addVariable(resultCode);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnChangeFriendStatus::ChatOnChangeFriendStatus(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnChangeFriendStatus"),
+character(),
+friendName(),
+sequence(0),
+add(0),
+resultCode(0)
+{
+	addVariable(character);
+	addVariable(friendName);
+	addVariable(sequence);
+	addVariable(add);
+	addVariable(resultCode);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnChangeFriendStatus::~ChatOnChangeFriendStatus()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnChangeFriendStatus.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnChangeFriendStatus.h
new file mode 100644
index 00000000..21983df5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnChangeFriendStatus.h
@@ -0,0 +1,75 @@
+// ChatOnChangeFriendStatus.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+#ifndef	_INCLUDED_ChatOnChangeFriendStatus_H
+#define	_INCLUDED_ChatOnChangeFriendStatus_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnChangeFriendStatus : public GameNetworkMessage
+{
+public:
+	ChatOnChangeFriendStatus(unsigned int sequence, const NetworkId & character, const ChatAvatarId & friendName, bool add, unsigned int result);
+	ChatOnChangeFriendStatus(Archive::ReadIterator & source);
+	~ChatOnChangeFriendStatus();
+
+	const NetworkId &     getCharacter      () const;
+	const ChatAvatarId &  getFriendName     () const;
+	unsigned int          getSequence       () const;
+	bool                  getAdd            () const;
+	unsigned int          getResultCode     () const;
+
+private:
+	ChatOnChangeFriendStatus & operator = (const ChatOnChangeFriendStatus & rhs);
+	ChatOnChangeFriendStatus(const ChatOnChangeFriendStatus & source);
+
+	Archive::AutoVariable<NetworkId>      character;
+	Archive::AutoVariable<ChatAvatarId>   friendName;
+	Archive::AutoVariable<unsigned int>   sequence;  
+	Archive::AutoVariable<bool>           add;  
+	Archive::AutoVariable<unsigned int>   resultCode;  
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & ChatOnChangeFriendStatus::getCharacter () const
+{
+	return character.get();
+}
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnChangeFriendStatus::getFriendName () const
+{
+	return friendName.get();
+}
+//-----------------------------------------------------------------------
+
+inline unsigned int ChatOnChangeFriendStatus::getSequence () const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ChatOnChangeFriendStatus::getAdd () const
+{
+	return add.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned int ChatOnChangeFriendStatus::getResultCode () const
+{
+	return resultCode.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnChangeFriendStatus_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnChangeIgnoreStatus.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnChangeIgnoreStatus.cpp
new file mode 100644
index 00000000..1e77247d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnChangeIgnoreStatus.cpp
@@ -0,0 +1,52 @@
+// ChatOnChangeIgnoreStatus.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatOnChangeIgnoreStatus.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnChangeIgnoreStatus::ChatOnChangeIgnoreStatus(unsigned int q, const NetworkId & c, const ChatAvatarId & _ignoreName, bool a, unsigned int result) :
+GameNetworkMessage("ChatOnChangeIgnoreStatus"),
+character(c),
+ignoreName(_ignoreName),
+sequence(q),
+ignore(a),
+resultCode(result)
+{
+	addVariable(character);
+	addVariable(ignoreName);
+	addVariable(sequence);
+	addVariable(ignore);
+	addVariable(resultCode);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnChangeIgnoreStatus::ChatOnChangeIgnoreStatus(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnChangeIgnoreStatus"),
+character(),
+ignoreName(),
+sequence(0),
+ignore(0),
+resultCode(0)
+{
+	addVariable(character);
+	addVariable(ignoreName);
+	addVariable(sequence);
+	addVariable(ignore);
+	addVariable(resultCode);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnChangeIgnoreStatus::~ChatOnChangeIgnoreStatus()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnChangeIgnoreStatus.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnChangeIgnoreStatus.h
new file mode 100644
index 00000000..9d4dbd14
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnChangeIgnoreStatus.h
@@ -0,0 +1,75 @@
+// ChatOnChangeIgnoreStatus.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+#ifndef	_INCLUDED_ChatOnChangeIgnoreStatus_H
+#define	_INCLUDED_ChatOnChangeIgnoreStatus_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnChangeIgnoreStatus : public GameNetworkMessage
+{
+public:
+	ChatOnChangeIgnoreStatus(unsigned int sequence, const NetworkId & character, const ChatAvatarId & ignoreName, bool ignore, unsigned int result);
+	ChatOnChangeIgnoreStatus(Archive::ReadIterator & source);
+	~ChatOnChangeIgnoreStatus();
+
+	const NetworkId &     getCharacter      () const;
+	const ChatAvatarId &  getIgnoreName     () const;
+	unsigned int          getSequence       () const;
+	bool                  getIgnore         () const;
+	unsigned int          getResultCode     () const;
+
+private:
+	ChatOnChangeIgnoreStatus & operator = (const ChatOnChangeIgnoreStatus & rhs);
+	ChatOnChangeIgnoreStatus(const ChatOnChangeIgnoreStatus & source);
+
+	Archive::AutoVariable<NetworkId>      character;
+	Archive::AutoVariable<ChatAvatarId>   ignoreName;
+	Archive::AutoVariable<unsigned int>   sequence;  
+	Archive::AutoVariable<bool>           ignore;  
+	Archive::AutoVariable<unsigned int>   resultCode;  
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & ChatOnChangeIgnoreStatus::getCharacter () const
+{
+	return character.get();
+}
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnChangeIgnoreStatus::getIgnoreName () const
+{
+	return ignoreName.get();
+}
+//-----------------------------------------------------------------------
+
+inline unsigned int ChatOnChangeIgnoreStatus::getSequence () const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ChatOnChangeIgnoreStatus::getIgnore () const
+{
+	return ignore.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned int ChatOnChangeIgnoreStatus::getResultCode () const
+{
+	return resultCode.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnChangeIgnoreStatus_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnConnectAvatar.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnConnectAvatar.cpp
new file mode 100644
index 00000000..4630f536
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnConnectAvatar.cpp
@@ -0,0 +1,31 @@
+// ChatOnConnectAvatar.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatOnConnectAvatar.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnConnectAvatar::ChatOnConnectAvatar() :
+GameNetworkMessage("ChatOnConnectAvatar")
+{
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnConnectAvatar::ChatOnConnectAvatar(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnConnectAvatar")
+{
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnConnectAvatar::~ChatOnConnectAvatar()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnConnectAvatar.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnConnectAvatar.h
new file mode 100644
index 00000000..b5766574
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnConnectAvatar.h
@@ -0,0 +1,28 @@
+// ChatOnConnectAvatar.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef	_INCLUDED_ChatOnConnectAvatar_H
+#define	_INCLUDED_ChatOnConnectAvatar_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnConnectAvatar : public GameNetworkMessage
+{
+public:
+	ChatOnConnectAvatar();
+	ChatOnConnectAvatar(Archive::ReadIterator & source);
+	~ChatOnConnectAvatar();
+
+private:
+	ChatOnConnectAvatar & operator = (const ChatOnConnectAvatar & rhs);
+	ChatOnConnectAvatar(const ChatOnConnectAvatar & source);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnConnectAvatar_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnCreateRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnCreateRoom.cpp
new file mode 100644
index 00000000..76654cd1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnCreateRoom.cpp
@@ -0,0 +1,44 @@
+// ChatOnCreateRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatOnCreateRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnCreateRoom::ChatOnCreateRoom(const unsigned int s, const unsigned int c, const ChatRoomData & r) :
+GameNetworkMessage("ChatOnCreateRoom"),
+resultCode(c),
+roomData(r),
+sequence(s)
+{
+	addVariable(resultCode);
+	addVariable(roomData);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnCreateRoom::ChatOnCreateRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnCreateRoom"),
+resultCode(),
+roomData(),
+sequence()
+{
+	addVariable(resultCode);
+	addVariable(roomData);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnCreateRoom::~ChatOnCreateRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnCreateRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnCreateRoom.h
new file mode 100644
index 00000000..e5b76944
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnCreateRoom.h
@@ -0,0 +1,59 @@
+// ChatOnCreateRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnCreateRoom_H
+#define	_INCLUDED_ChatOnCreateRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatRoomData.h"
+#include "sharedNetworkMessages/ChatRoomDataArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnCreateRoom : public GameNetworkMessage
+{
+public:
+	ChatOnCreateRoom(const unsigned int sequence, const unsigned int resultCode, const ChatRoomData & roomData);
+	ChatOnCreateRoom(Archive::ReadIterator &);
+	~ChatOnCreateRoom();
+
+	const unsigned int    getResultCode    () const;
+	const ChatRoomData &  getRoomData      () const;
+	const unsigned int    getSequence      () const;
+
+private:
+	ChatOnCreateRoom & operator = (const ChatOnCreateRoom & rhs);
+	ChatOnCreateRoom(const ChatOnCreateRoom & source);
+
+	Archive::AutoVariable<unsigned int>  resultCode;
+	Archive::AutoVariable<ChatRoomData>  roomData;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnCreateRoom::getResultCode() const
+{
+	return resultCode.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatRoomData & ChatOnCreateRoom::getRoomData() const
+{
+	return roomData.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnCreateRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnCreateRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnDeleteAllPersistentMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnDeleteAllPersistentMessages.cpp
new file mode 100644
index 00000000..3e9aaad0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnDeleteAllPersistentMessages.cpp
@@ -0,0 +1,53 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+// ChatOnDeleteAllPersistentMessages.cpp
+// Copyright 2003, Sony Online Entertainment Inc., all rights reserved. 
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatOnDeleteAllPersistentMessages.h"
+
+//-----------------------------------------------------------------------------
+
+ChatOnDeleteAllPersistentMessages::ChatOnDeleteAllPersistentMessages(std::string const &targetName, bool const success)
+ : GameNetworkMessage("ChatOnDeleteAllPersistentMessages")
+ , m_targetName(targetName)
+ , m_success(success)
+{
+	addVariable(m_targetName);
+	addVariable(m_success);
+}
+
+//-----------------------------------------------------------------------------
+ChatOnDeleteAllPersistentMessages::ChatOnDeleteAllPersistentMessages(Archive::ReadIterator & source)
+ : GameNetworkMessage("ChatOnDeleteAllPersistentMessages")
+ , m_targetName()
+ , m_success()
+{
+	addVariable(m_targetName);
+	addVariable(m_success);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------------
+
+ChatOnDeleteAllPersistentMessages::~ChatOnDeleteAllPersistentMessages()
+{
+}
+
+//-----------------------------------------------------------------------------
+
+std::string const &ChatOnDeleteAllPersistentMessages::getTargetName() const
+{
+	return m_targetName.get();
+}
+
+//-----------------------------------------------------------------------------
+
+bool const &ChatOnDeleteAllPersistentMessages::isSuccess() const
+{
+	return m_success.get();
+}
+
+///////////////////////////////////////////////////////////////////////////////
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnDeleteAllPersistentMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnDeleteAllPersistentMessages.h
new file mode 100644
index 00000000..c8b1feb3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnDeleteAllPersistentMessages.h
@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+// ChatOnDeleteAllPersistentMessages.cpp
+// Copyright 2003, Sony Online Entertainment Inc., all rights reserved. 
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef	INCLUDED_ChatOnDeleteAllPersistentMessages_H
+#define	INCLUDED_ChatOnDeleteAllPersistentMessages_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------------
+
+class ChatOnDeleteAllPersistentMessages : public GameNetworkMessage
+{
+public:
+	ChatOnDeleteAllPersistentMessages(std::string const &targetName, bool const success);
+	ChatOnDeleteAllPersistentMessages(Archive::ReadIterator & source);
+	~ChatOnDeleteAllPersistentMessages();
+
+	std::string const &getTargetName() const;
+	bool const &isSuccess() const;
+
+private:
+
+	Archive::AutoVariable<std::string> m_targetName;
+	Archive::AutoVariable<bool>        m_success;
+
+	// Disabled
+
+	ChatOnDeleteAllPersistentMessages();
+	ChatOnDeleteAllPersistentMessages & operator = (const ChatOnDeleteAllPersistentMessages & rhs);
+	ChatOnDeleteAllPersistentMessages(const ChatOnDeleteAllPersistentMessages & source);
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+#endif	// INCLUDED_ChatOnDeleteAllPersistentMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnDestroyRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnDestroyRoom.cpp
new file mode 100644
index 00000000..ea047d39
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnDestroyRoom.cpp
@@ -0,0 +1,48 @@
+// ChatOnDestroyRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatOnDestroyRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnDestroyRoom::ChatOnDestroyRoom(const unsigned int s, const unsigned int c, const unsigned int r, const ChatAvatarId & d) :
+GameNetworkMessage("ChatOnDestroyRoom"),
+destroyer(d),
+resultCode(c),
+roomId(r),
+sequence(s)
+{
+	addVariable(destroyer);
+	addVariable(resultCode);
+	addVariable(roomId);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnDestroyRoom::ChatOnDestroyRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnDestroyRoom"),
+destroyer(),
+resultCode(),
+roomId(),
+sequence()
+{
+	addVariable(destroyer);
+	addVariable(resultCode);
+	addVariable(roomId);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnDestroyRoom::~ChatOnDestroyRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnDestroyRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnDestroyRoom.h
new file mode 100644
index 00000000..99425ef1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnDestroyRoom.h
@@ -0,0 +1,68 @@
+// ChatOnDestroyRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnDestroyRoom_H
+#define	_INCLUDED_ChatOnDestroyRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnDestroyRoom : public GameNetworkMessage
+{
+public:
+	ChatOnDestroyRoom(const unsigned int sequence, const unsigned int resultCode, const unsigned int roomId, const ChatAvatarId & destroyer);
+	ChatOnDestroyRoom(Archive::ReadIterator &);
+	~ChatOnDestroyRoom();
+
+	const ChatAvatarId &  getDestroyer     () const;
+	const unsigned int    getResultCode    () const;
+	const unsigned int    getRoomId        () const;
+	const unsigned int    getSequence      () const;
+
+private:
+	ChatOnDestroyRoom & operator = (const ChatOnDestroyRoom & rhs);
+	ChatOnDestroyRoom(const ChatOnDestroyRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  destroyer;
+	Archive::AutoVariable<unsigned int>  resultCode;
+	Archive::AutoVariable<unsigned int>  roomId;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnDestroyRoom::getDestroyer() const
+{
+	return destroyer.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnDestroyRoom::getResultCode() const
+{
+	return resultCode.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnDestroyRoom::getRoomId() const
+{
+	return roomId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnDestroyRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnDestroyRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnEnteredRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnEnteredRoom.cpp
new file mode 100644
index 00000000..2b719a27
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnEnteredRoom.cpp
@@ -0,0 +1,48 @@
+// ChatOnEnteredRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatOnEnteredRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnEnteredRoom::ChatOnEnteredRoom(const unsigned int s, const unsigned int r, const unsigned int n, const ChatAvatarId & c) :
+GameNetworkMessage("ChatOnEnteredRoom"),
+characterName(c),
+result(r),
+roomId(n),
+sequence(s)
+{
+	addVariable(characterName);
+	addVariable(result);
+	addVariable(roomId);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnEnteredRoom::ChatOnEnteredRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnEnteredRoom"),
+characterName(),
+result(),
+roomId(),
+sequence()
+{
+	addVariable(characterName);
+	addVariable(result);
+	addVariable(roomId);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnEnteredRoom::~ChatOnEnteredRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnEnteredRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnEnteredRoom.h
new file mode 100644
index 00000000..8014b872
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnEnteredRoom.h
@@ -0,0 +1,68 @@
+// ChatOnEnteredRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnEnteredRoom_H
+#define	_INCLUDED_ChatOnEnteredRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnEnteredRoom : public GameNetworkMessage
+{
+public:
+	ChatOnEnteredRoom(unsigned int sequence, const unsigned int result, const unsigned int roomId, const ChatAvatarId & characterName);
+	ChatOnEnteredRoom(Archive::ReadIterator &);
+	~ChatOnEnteredRoom();
+
+	const ChatAvatarId &  getCharacterName  () const;
+	const unsigned int    getResult         () const;
+	const unsigned int    getRoomId         () const;
+	const unsigned int    getSequence       () const;
+
+private:
+	ChatOnEnteredRoom & operator = (const ChatOnEnteredRoom & rhs);
+	ChatOnEnteredRoom(const ChatOnEnteredRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  characterName;
+	Archive::AutoVariable<unsigned int>  result;
+	Archive::AutoVariable<unsigned int>  roomId;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnEnteredRoom::getCharacterName() const
+{
+	return characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnEnteredRoom::getResult() const
+{
+	return result.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnEnteredRoom::getRoomId() const
+{
+	return roomId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnEnteredRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnEnteredRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnGetFriendsList.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnGetFriendsList.cpp
new file mode 100644
index 00000000..a214855f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnGetFriendsList.cpp
@@ -0,0 +1,41 @@
+// ChatOnGetFriendsList.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatOnGetFriendsList.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnGetFriendsList::ChatOnGetFriendsList(const NetworkId & c, const std::vector<ChatAvatarId> & friendsList) :
+GameNetworkMessage("ChatOnGetFriendsList"),
+character(c),
+friends()
+{
+	friends.set(friendsList);
+	addVariable(character);
+	addVariable(friends);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnGetFriendsList::ChatOnGetFriendsList(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnGetFriendsList"),
+character(),
+friends()
+{
+	addVariable(character);
+	addVariable(friends);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnGetFriendsList::~ChatOnGetFriendsList()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnGetFriendsList.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnGetFriendsList.h
new file mode 100644
index 00000000..71c992b3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnGetFriendsList.h
@@ -0,0 +1,50 @@
+// ChatOnGetFriendsList.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+#ifndef	_INCLUDED_ChatOnGetFriendsList_H
+#define	_INCLUDED_ChatOnGetFriendsList_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include <vector>
+
+//-----------------------------------------------------------------------
+
+class ChatOnGetFriendsList : public GameNetworkMessage
+{
+public:
+	ChatOnGetFriendsList(const NetworkId & character, const std::vector<ChatAvatarId> & friends);
+	ChatOnGetFriendsList(Archive::ReadIterator & source);
+	~ChatOnGetFriendsList();
+
+	const NetworkId &                  getCharacter      () const;
+	const std::vector<ChatAvatarId> &  getFriends        () const;
+
+private:
+	ChatOnGetFriendsList & operator = (const ChatOnGetFriendsList & rhs);
+	ChatOnGetFriendsList(const ChatOnGetFriendsList & source);
+
+	Archive::AutoVariable<NetworkId>      character;
+	Archive::AutoArray<ChatAvatarId>      friends;  
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & ChatOnGetFriendsList::getCharacter () const
+{
+	return character.get();
+}
+//-----------------------------------------------------------------------
+
+inline const std::vector<ChatAvatarId> & ChatOnGetFriendsList::getFriends () const
+{
+	return friends.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnGetFriendsList_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnGetIgnoreList.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnGetIgnoreList.cpp
new file mode 100644
index 00000000..f7c99cf4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnGetIgnoreList.cpp
@@ -0,0 +1,41 @@
+// ChatOnGetIgnoreList.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatOnGetIgnoreList.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnGetIgnoreList::ChatOnGetIgnoreList(const NetworkId & c, const std::vector<ChatAvatarId> & ignoreList) :
+GameNetworkMessage("ChatOnGetIgnoreList"),
+character(c),
+ignores()
+{
+	ignores.set(ignoreList);
+	addVariable(character);
+	addVariable(ignores);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnGetIgnoreList::ChatOnGetIgnoreList(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnGetIgnoreList"),
+character(),
+ignores()
+{
+	addVariable(character);
+	addVariable(ignores);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnGetIgnoreList::~ChatOnGetIgnoreList()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnGetIgnoreList.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnGetIgnoreList.h
new file mode 100644
index 00000000..7f940f3c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnGetIgnoreList.h
@@ -0,0 +1,50 @@
+// ChatOnGetIgnoreList.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Matt Sivertson
+
+#ifndef	_INCLUDED_ChatOnGetIgnoreList_H
+#define	_INCLUDED_ChatOnGetIgnoreList_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include <vector>
+
+//-----------------------------------------------------------------------
+
+class ChatOnGetIgnoreList : public GameNetworkMessage
+{
+public:
+	ChatOnGetIgnoreList(const NetworkId & character, const std::vector<ChatAvatarId> & ignoreList);
+	ChatOnGetIgnoreList(Archive::ReadIterator & source);
+	~ChatOnGetIgnoreList();
+
+	const NetworkId &                  getCharacter      () const;
+	const std::vector<ChatAvatarId> &  getIgnoreList     () const;
+
+private:
+	ChatOnGetIgnoreList & operator = (const ChatOnGetIgnoreList & rhs);
+	ChatOnGetIgnoreList(const ChatOnGetIgnoreList & source);
+
+	Archive::AutoVariable<NetworkId>   character;
+	Archive::AutoArray<ChatAvatarId>      ignores;  
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & ChatOnGetIgnoreList::getCharacter () const
+{
+	return character.get();
+}
+//-----------------------------------------------------------------------
+
+inline const std::vector<ChatAvatarId> & ChatOnGetIgnoreList::getIgnoreList () const
+{
+	return ignores.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnGetIgnoreList_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnInviteGroupToRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnInviteGroupToRoom.cpp
new file mode 100644
index 00000000..5ee96cb6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnInviteGroupToRoom.cpp
@@ -0,0 +1,49 @@
+// ChatOnInviteToRoom.cpp
+// Copyright 2000-05, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Roy Fleck
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatOnInviteGroupToRoom.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnInviteGroupToRoom::ChatOnInviteGroupToRoom(const unsigned int r, const std::string &room, const ChatAvatarId &invitorId, const ChatAvatarId &inviteeId) :
+GameNetworkMessage("ChatOnInviteGroupToRoom"),
+roomName(room),
+invitor(invitorId),
+invitee(inviteeId),
+result(r)
+{
+	addVariable(roomName);
+	addVariable(invitor);
+	addVariable(invitee);
+	addVariable(result);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnInviteGroupToRoom::ChatOnInviteGroupToRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnInviteGroupToRoom"),
+roomName(),
+invitor(),
+invitee(),
+result()
+{
+	addVariable(roomName);
+	addVariable(invitor);
+	addVariable(invitee);
+	addVariable(result);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnInviteGroupToRoom::~ChatOnInviteGroupToRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnInviteGroupToRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnInviteGroupToRoom.h
new file mode 100644
index 00000000..cb8e4930
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnInviteGroupToRoom.h
@@ -0,0 +1,70 @@
+// ChatOnInviteGroupToRoom.h
+// Copyright 2000-05, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Roy Fleck
+
+#ifndef	_INCLUDED_ChatOnInviteGroupToRoom_H
+#define	_INCLUDED_ChatOnInviteGroupToRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class ChatOnInviteGroupToRoom : public GameNetworkMessage
+{
+public:
+	ChatOnInviteGroupToRoom(const unsigned int result, const std::string &roomName, const ChatAvatarId &invitor, const ChatAvatarId &invitee );
+	ChatOnInviteGroupToRoom(Archive::ReadIterator & source);
+	~ChatOnInviteGroupToRoom();
+
+	const std::string  & getRoomName  () const;
+	const ChatAvatarId & getInvitor   () const;
+	const ChatAvatarId & getInvitee   () const;
+	const unsigned int   getResult    () const;
+
+private:
+	ChatOnInviteGroupToRoom & operator = (const ChatOnInviteGroupToRoom & rhs);
+	ChatOnInviteGroupToRoom(const ChatOnInviteGroupToRoom & source);
+
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<ChatAvatarId>  invitor;
+	Archive::AutoVariable<ChatAvatarId>  invitee;
+	Archive::AutoVariable<unsigned int>  result;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatOnInviteGroupToRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnInviteGroupToRoom::getInvitor() const
+{
+	return invitor.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnInviteGroupToRoom::getInvitee() const
+{
+	return invitee.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnInviteGroupToRoom::getResult() const
+{
+	return result.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnInviteGroupToRoom_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnInviteToRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnInviteToRoom.cpp
new file mode 100644
index 00000000..72dd8936
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnInviteToRoom.cpp
@@ -0,0 +1,49 @@
+// ChatOnInviteToRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatOnInviteToRoom.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnInviteToRoom::ChatOnInviteToRoom(const unsigned int r, const std::string &room, const ChatAvatarId &invitorId, const ChatAvatarId &inviteeId) :
+GameNetworkMessage("ChatOnInviteToRoom"),
+roomName(room),
+invitor(invitorId),
+invitee(inviteeId),
+result(r)
+{
+	addVariable(roomName);
+	addVariable(invitor);
+	addVariable(invitee);
+	addVariable(result);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnInviteToRoom::ChatOnInviteToRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnInviteToRoom"),
+roomName(),
+invitor(),
+invitee(),
+result()
+{
+	addVariable(roomName);
+	addVariable(invitor);
+	addVariable(invitee);
+	addVariable(result);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnInviteToRoom::~ChatOnInviteToRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnInviteToRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnInviteToRoom.h
new file mode 100644
index 00000000..f81dda9a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnInviteToRoom.h
@@ -0,0 +1,71 @@
+// ChatOnInviteToRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnInviteToRoom_H
+#define	_INCLUDED_ChatOnInviteToRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class ChatOnInviteToRoom : public GameNetworkMessage
+{
+public:
+	ChatOnInviteToRoom(const unsigned int result, const std::string &roomName, const ChatAvatarId &invitor, const ChatAvatarId &invitee );
+	ChatOnInviteToRoom(Archive::ReadIterator & source);
+	~ChatOnInviteToRoom();
+
+	const std::string  & getRoomName  () const;
+	const ChatAvatarId & getInvitor   () const;
+	const ChatAvatarId & getInvitee   () const;
+	const unsigned int   getResult    () const;
+
+private:
+	ChatOnInviteToRoom & operator = (const ChatOnInviteToRoom & rhs);
+	ChatOnInviteToRoom(const ChatOnInviteToRoom & source);
+
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<ChatAvatarId>  invitor;
+	Archive::AutoVariable<ChatAvatarId>  invitee;
+	Archive::AutoVariable<unsigned int>  result;
+
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatOnInviteToRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnInviteToRoom::getInvitor() const
+{
+	return invitor.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnInviteToRoom::getInvitee() const
+{
+	return invitee.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnInviteToRoom::getResult() const
+{
+	return result.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnInviteToRoom_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnKickAvatarFromRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnKickAvatarFromRoom.cpp
new file mode 100644
index 00000000..72fc3694
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnKickAvatarFromRoom.cpp
@@ -0,0 +1,49 @@
+// ChatOnKickAvatarFromRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Roy Fleck
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include "sharedNetworkMessages/ChatOnKickAvatarFromRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnKickAvatarFromRoom::ChatOnKickAvatarFromRoom(const unsigned int c, const ChatAvatarId & i, const ChatAvatarId &remover, const std::string & r) :
+GameNetworkMessage("ChatOnKickAvatarFromRoom"),
+avatarId(i),
+removerId(remover),
+resultCode(c),
+roomName(r)
+{
+	addVariable(avatarId);
+	addVariable(removerId);
+	addVariable(resultCode);
+	addVariable(roomName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnKickAvatarFromRoom::ChatOnKickAvatarFromRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnKickAvatarFromRoom"),
+avatarId(),
+removerId(),
+resultCode(),
+roomName()
+{
+	addVariable(avatarId);
+	addVariable(removerId);
+	addVariable(resultCode);
+	addVariable(roomName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnKickAvatarFromRoom::~ChatOnKickAvatarFromRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnKickAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnKickAvatarFromRoom.h
new file mode 100644
index 00000000..96043304
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnKickAvatarFromRoom.h
@@ -0,0 +1,67 @@
+// ChatOnKickAvatarFromRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Roy Fleck
+
+#ifndef	_INCLUDED_ChatOnKickAvatarFromRoom_H
+#define	_INCLUDED_ChatOnKickAvatarFromRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnKickAvatarFromRoom : public GameNetworkMessage
+{
+public:
+	ChatOnKickAvatarFromRoom(const unsigned int resultCode, const ChatAvatarId & avatarId, const ChatAvatarId &removerId, const std::string & roomName);
+	explicit ChatOnKickAvatarFromRoom(Archive::ReadIterator & source);
+	~ChatOnKickAvatarFromRoom();
+
+	const ChatAvatarId &  getAvatarId    () const;
+	const ChatAvatarId &  getRemoverId   () const;
+	const unsigned int    getResultCode  () const;
+	const std::string &   getRoomName    () const;
+
+private:
+	ChatOnKickAvatarFromRoom & operator = (const ChatOnKickAvatarFromRoom & rhs);
+	ChatOnKickAvatarFromRoom(const ChatOnKickAvatarFromRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  avatarId;
+	Archive::AutoVariable<ChatAvatarId>  removerId;
+	Archive::AutoVariable<unsigned int>  resultCode;
+	Archive::AutoVariable<std::string>   roomName;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnKickAvatarFromRoom::getAvatarId() const
+{
+	return avatarId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnKickAvatarFromRoom::getRemoverId() const
+{
+	return removerId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnKickAvatarFromRoom::getResultCode() const
+{
+	return resultCode.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatOnKickAvatarFromRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnKickAvatarFromRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnLeaveRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnLeaveRoom.cpp
new file mode 100644
index 00000000..b3318115
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnLeaveRoom.cpp
@@ -0,0 +1,48 @@
+// ChatOnLeaveRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatOnLeaveRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnLeaveRoom::ChatOnLeaveRoom(const unsigned int s, const unsigned int r, const unsigned int n, const ChatAvatarId & c) :
+GameNetworkMessage("ChatOnLeaveRoom"),
+characterName(c),
+resultCode(r),
+roomId(n),
+sequence(s)
+{
+	addVariable(characterName);
+	addVariable(resultCode);
+	addVariable(roomId);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnLeaveRoom::ChatOnLeaveRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnLeaveRoom"),
+characterName(),
+resultCode(),
+roomId(),
+sequence()
+{
+	addVariable(characterName);
+	addVariable(resultCode);
+	addVariable(roomId);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnLeaveRoom::~ChatOnLeaveRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnLeaveRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnLeaveRoom.h
new file mode 100644
index 00000000..34d230a7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnLeaveRoom.h
@@ -0,0 +1,68 @@
+// ChatOnLeaveRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnLeaveRoom_H
+#define	_INCLUDED_ChatOnLeaveRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnLeaveRoom : public GameNetworkMessage
+{
+public:
+	ChatOnLeaveRoom(unsigned int sequence, const unsigned int resultCode, const unsigned int roomId, const ChatAvatarId & characterName);
+	ChatOnLeaveRoom(Archive::ReadIterator &);
+	~ChatOnLeaveRoom();
+
+	const ChatAvatarId &  getCharacterName  () const;
+	const unsigned int    getResultCode     () const;
+	const unsigned int    getRoomId         () const;
+	const unsigned int    getSequence       () const;
+
+private:
+	ChatOnLeaveRoom & operator = (const ChatOnLeaveRoom & rhs);
+	ChatOnLeaveRoom(const ChatOnLeaveRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  characterName;
+	Archive::AutoVariable<unsigned int>  resultCode;
+	Archive::AutoVariable<unsigned int>  roomId;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnLeaveRoom::getCharacterName() const
+{
+	return characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnLeaveRoom::getResultCode() const
+{
+	return resultCode.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnLeaveRoom::getRoomId() const
+{
+	return roomId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnLeaveRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnLeaveRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnReceiveRoomInvitation.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnReceiveRoomInvitation.cpp
new file mode 100644
index 00000000..c3cefc56
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnReceiveRoomInvitation.cpp
@@ -0,0 +1,42 @@
+// ChatOnReceiveRoomInvitation.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include "sharedNetworkMessages/ChatOnReceiveRoomInvitation.h"
+
+
+//-----------------------------------------------------------------------
+
+ChatOnReceiveRoomInvitation::ChatOnReceiveRoomInvitation(const std::string & r, const ChatAvatarId & id) :
+GameNetworkMessage("ChatOnReceiveRoomInvitation"),
+invitorAvatar(id),
+roomName(r)
+{
+	addVariable(invitorAvatar);
+	addVariable(roomName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnReceiveRoomInvitation::ChatOnReceiveRoomInvitation(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnReceiveRoomInvitation"),
+invitorAvatar(),
+roomName()
+{
+	addVariable(invitorAvatar);
+	addVariable(roomName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnReceiveRoomInvitation::~ChatOnReceiveRoomInvitation()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnReceiveRoomInvitation.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnReceiveRoomInvitation.h
new file mode 100644
index 00000000..53bd643e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnReceiveRoomInvitation.h
@@ -0,0 +1,49 @@
+// ChatOnReceiveRoomInvitation.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnReceiveRoomInvitation_H
+#define	_INCLUDED_ChatOnReceiveRoomInvitation_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnReceiveRoomInvitation : public GameNetworkMessage
+{
+public:
+	ChatOnReceiveRoomInvitation(const std::string & roomName, const ChatAvatarId & invitorAvator);
+	ChatOnReceiveRoomInvitation(Archive::ReadIterator & source);
+	~ChatOnReceiveRoomInvitation();
+
+	const ChatAvatarId &  getInvitorAvatar  () const;
+	const std::string &   getRoomName       () const;
+
+private:
+	ChatOnReceiveRoomInvitation & operator = (const ChatOnReceiveRoomInvitation & rhs);
+	ChatOnReceiveRoomInvitation(const ChatOnReceiveRoomInvitation & source);
+
+	Archive::AutoVariable<ChatAvatarId>  invitorAvatar;
+	Archive::AutoVariable<std::string>   roomName;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnReceiveRoomInvitation::getInvitorAvatar() const
+{
+	return invitorAvatar.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatOnReceiveRoomInvitation::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnReceiveRoomInvitation_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnRemoveModeratorFromRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnRemoveModeratorFromRoom.cpp
new file mode 100644
index 00000000..4702377c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnRemoveModeratorFromRoom.cpp
@@ -0,0 +1,53 @@
+// ChatOnRemoveModeratorFromRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include "sharedNetworkMessages/ChatOnRemoveModeratorFromRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnRemoveModeratorFromRoom::ChatOnRemoveModeratorFromRoom(const unsigned int c, const unsigned int s, const ChatAvatarId & i, const ChatAvatarId &remover, const std::string & r) :
+GameNetworkMessage("ChatOnRemoveModeratorFromRoom"),
+avatarId(i),
+removerId(remover),
+resultCode(c),
+roomName(r),
+sequenceId(s)
+{
+	addVariable(avatarId);
+	addVariable(removerId);
+	addVariable(resultCode);
+	addVariable(roomName);
+	addVariable(sequenceId);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnRemoveModeratorFromRoom::ChatOnRemoveModeratorFromRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnRemoveModeratorFromRoom"),
+avatarId(),
+removerId(),
+resultCode(),
+roomName(),
+sequenceId()
+{
+	addVariable(avatarId);
+	addVariable(removerId);
+	addVariable(resultCode);
+	addVariable(roomName);
+	addVariable(sequenceId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnRemoveModeratorFromRoom::~ChatOnRemoveModeratorFromRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnRemoveModeratorFromRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnRemoveModeratorFromRoom.h
new file mode 100644
index 00000000..408c09b7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnRemoveModeratorFromRoom.h
@@ -0,0 +1,77 @@
+// ChatOnRemoveModeratorFromRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnRemoveModeratorFromRoom_H
+#define	_INCLUDED_ChatOnRemoveModeratorFromRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnRemoveModeratorFromRoom : public GameNetworkMessage
+{
+public:
+	ChatOnRemoveModeratorFromRoom(const unsigned int resultCode, const unsigned int sequenceId, const ChatAvatarId & avatarId, const ChatAvatarId &removerId, const std::string & roomName);
+	explicit ChatOnRemoveModeratorFromRoom(Archive::ReadIterator & source);
+	~ChatOnRemoveModeratorFromRoom();
+
+	const ChatAvatarId &  getAvatarId    () const;
+	const ChatAvatarId &  getRemoverId   () const;
+	const unsigned int    getResultCode  () const;
+	const std::string &   getRoomName    () const;
+	const unsigned int    getSequenceId  () const;
+
+private:
+	ChatOnRemoveModeratorFromRoom & operator = (const ChatOnRemoveModeratorFromRoom & rhs);
+	ChatOnRemoveModeratorFromRoom(const ChatOnRemoveModeratorFromRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  avatarId;
+	Archive::AutoVariable<ChatAvatarId>  removerId;
+	Archive::AutoVariable<unsigned int>  resultCode;
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<unsigned int>  sequenceId;
+
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnRemoveModeratorFromRoom::getAvatarId() const
+{
+	return avatarId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnRemoveModeratorFromRoom::getRemoverId() const
+{
+	return removerId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnRemoveModeratorFromRoom::getResultCode() const
+{
+	return resultCode.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatOnRemoveModeratorFromRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnRemoveModeratorFromRoom::getSequenceId() const
+{
+	return sequenceId.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnRemoveModeratorFromRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnRequestLog.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnRequestLog.cpp
new file mode 100644
index 00000000..5f9f5b1d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnRequestLog.cpp
@@ -0,0 +1,63 @@
+// ChatOnRequestLog.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatOnRequestLog.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnRequestLog::ChatOnRequestLog(const unsigned int s, const std::vector<ChatLogEntry> & entries) :
+GameNetworkMessage("ChatOnRequestLog"),
+logEntries(),
+sequence(s)
+{
+	logEntries.set(entries);
+	addVariable(logEntries);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnRequestLog::ChatOnRequestLog(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnRequestLog"),
+logEntries(),
+sequence()
+{
+	addVariable(logEntries);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnRequestLog::~ChatOnRequestLog()
+{
+}
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, ChatLogEntry & target)
+	{
+		get (source, target.m_from);
+		get (source, target.m_to);
+		get (source, target.m_channel);
+		get (source, target.m_message);
+		get (source, target.m_time);	
+	}
+
+	void put (ByteStream & target, const ChatLogEntry & source)
+	{
+		put (target, source.m_from);
+		put (target, source.m_to);
+		put (target, source.m_channel);
+		put (target, source.m_message);
+		put (target, source.m_time);
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnRequestLog.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnRequestLog.h
new file mode 100644
index 00000000..776ac485
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnRequestLog.h
@@ -0,0 +1,86 @@
+// ChatOnRequestLog.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnRequestLog_H
+#define	_INCLUDED_ChatOnRequestLog_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "UnicodeUtils.h"
+
+//-----------------------------------------------------------------------
+
+
+struct ChatLogEntry
+{
+	ChatLogEntry()
+     : m_from()
+	 , m_to()
+	 , m_channel()
+	 , m_message()
+	 , m_time(0)
+	{
+	}
+
+    ChatLogEntry(Unicode::String const &from, Unicode::String const &to, Unicode::String const &channel, Unicode::String const &message, time_t time)
+	 : m_from(from)
+	 , m_to(to)
+	 , m_channel(channel)
+	 , m_message(message)
+	 , m_time(time)
+	 {
+	 }
+
+    Unicode::String m_from;
+    Unicode::String m_to;
+    Unicode::String m_channel;
+    Unicode::String m_message;
+    time_t m_time;
+};
+
+namespace Archive
+{
+	void get (ReadIterator & source, ChatLogEntry & target);
+	void put (ByteStream & target, const ChatLogEntry & source);
+}
+
+//-----------------------------------------------------------------------
+
+class ChatOnRequestLog : public GameNetworkMessage
+{
+public:
+	ChatOnRequestLog(unsigned int sequence, const std::vector<ChatLogEntry> &entries);
+	ChatOnRequestLog(Archive::ReadIterator &);
+	~ChatOnRequestLog();
+
+	const std::vector<ChatLogEntry> &  getLogEntries  () const;
+	const unsigned int                 getSequence    () const;
+
+private:
+	ChatOnRequestLog & operator = (const ChatOnRequestLog & rhs);
+	ChatOnRequestLog(const ChatOnRequestLog & source);
+
+	Archive::AutoArray<ChatLogEntry>     logEntries;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::vector<ChatLogEntry> & ChatOnRequestLog::getLogEntries() const
+{
+	return logEntries.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnRequestLog::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnRequestLog_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendInstantMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendInstantMessage.cpp
new file mode 100644
index 00000000..a9a187cd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendInstantMessage.cpp
@@ -0,0 +1,40 @@
+// ChatOnSendInstantMessage.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatOnSendInstantMessage.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnSendInstantMessage::ChatOnSendInstantMessage(const unsigned int s, const unsigned int r) :
+GameNetworkMessage("ChatOnSendInstantMessage"),
+result(r),
+sequence(s)
+{
+	addVariable(result);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnSendInstantMessage::ChatOnSendInstantMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnSendInstantMessage"),
+result(),
+sequence()
+{
+	addVariable(result);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnSendInstantMessage::~ChatOnSendInstantMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendInstantMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendInstantMessage.h
new file mode 100644
index 00000000..f000604b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendInstantMessage.h
@@ -0,0 +1,49 @@
+// ChatOnSendInstantMessage.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnSendInstantMessage_H
+#define	_INCLUDED_ChatOnSendInstantMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnSendInstantMessage : public GameNetworkMessage
+{
+public:
+	ChatOnSendInstantMessage(const unsigned int sequence, const unsigned int result);
+	ChatOnSendInstantMessage(Archive::ReadIterator & source);
+	~ChatOnSendInstantMessage();
+
+	const unsigned int  getResult    () const;
+	const unsigned int  getSequence  () const;
+
+private:
+	ChatOnSendInstantMessage & operator = (const ChatOnSendInstantMessage & rhs);
+	ChatOnSendInstantMessage(const ChatOnSendInstantMessage & source);
+
+	Archive::AutoVariable<unsigned int>  result;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnSendInstantMessage::getResult() const
+{
+	return result.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnSendInstantMessage::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnSendInstantMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendPersistentMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendPersistentMessage.cpp
new file mode 100644
index 00000000..e60332d3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendPersistentMessage.cpp
@@ -0,0 +1,40 @@
+// ChatOnSendPersistentMessage.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatOnSendPersistentMessage.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnSendPersistentMessage::ChatOnSendPersistentMessage(const unsigned int s, const unsigned int r) :
+GameNetworkMessage("ChatOnSendPersistentMessage"),
+result(r),
+sequence(s)
+{
+	addVariable(result);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnSendPersistentMessage::ChatOnSendPersistentMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnSendPersistentMessage"),
+result(),
+sequence()
+{
+	addVariable(result);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnSendPersistentMessage::~ChatOnSendPersistentMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendPersistentMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendPersistentMessage.h
new file mode 100644
index 00000000..bf238f0e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendPersistentMessage.h
@@ -0,0 +1,49 @@
+// ChatOnSendPersistentMessage.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnSendPersistentMessage_H
+#define	_INCLUDED_ChatOnSendPersistentMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnSendPersistentMessage : public GameNetworkMessage
+{
+public:
+	ChatOnSendPersistentMessage(const unsigned int sequence, const unsigned int result);
+	ChatOnSendPersistentMessage(Archive::ReadIterator & source);
+	~ChatOnSendPersistentMessage();
+
+	const unsigned int  getResult    () const;
+	const unsigned int  getSequence  () const;
+
+private:
+	ChatOnSendPersistentMessage & operator = (const ChatOnSendPersistentMessage & rhs);
+	ChatOnSendPersistentMessage(const ChatOnSendPersistentMessage & source);
+
+	Archive::AutoVariable<unsigned int>  result;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnSendPersistentMessage::getResult() const
+{
+	return result.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnSendPersistentMessage::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnSendPersistentMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendRoomInvitation.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendRoomInvitation.cpp
new file mode 100644
index 00000000..78a862ed
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendRoomInvitation.cpp
@@ -0,0 +1,40 @@
+// ChatOnSendRoomInvitation.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatOnSendRoomInvitation.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnSendRoomInvitation::ChatOnSendRoomInvitation(const unsigned int s, const unsigned int r) :
+GameNetworkMessage("ChatOnSendRoomInvitation"),
+result(r),
+sequence(s)
+{
+	addVariable(result);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnSendRoomInvitation::ChatOnSendRoomInvitation(Archive::ReadIterator & source) : 
+GameNetworkMessage("ChatOnSendRoomInvitation"),
+result(),
+sequence()
+{
+	addVariable(result);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnSendRoomInvitation::~ChatOnSendRoomInvitation()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendRoomInvitation.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendRoomInvitation.h
new file mode 100644
index 00000000..6db7bc7d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendRoomInvitation.h
@@ -0,0 +1,48 @@
+// ChatOnSendRoomInvitation.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnSendRoomInvitation_H
+#define	_INCLUDED_ChatOnSendRoomInvitation_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnSendRoomInvitation : public GameNetworkMessage
+{
+public:
+	ChatOnSendRoomInvitation(const unsigned int sequence, const unsigned int result);
+	explicit ChatOnSendRoomInvitation(Archive::ReadIterator & source);
+	~ChatOnSendRoomInvitation();
+
+	const unsigned int getResult    () const;
+	const unsigned int getSequence  () const;
+
+private:
+	ChatOnSendRoomInvitation & operator = (const ChatOnSendRoomInvitation & rhs);
+	ChatOnSendRoomInvitation(const ChatOnSendRoomInvitation & source);
+
+	Archive::AutoVariable<unsigned int>  result;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnSendRoomInvitation::getResult() const
+{
+	return result.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnSendRoomInvitation::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnSendRoomInvitation_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendRoomMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendRoomMessage.cpp
new file mode 100644
index 00000000..0dbbf90b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendRoomMessage.cpp
@@ -0,0 +1,40 @@
+// ChatOnSendRoomMessage.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatOnSendRoomMessage.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnSendRoomMessage::ChatOnSendRoomMessage(const unsigned int s, const unsigned int r) :
+GameNetworkMessage("ChatOnSendRoomMessage"),
+result(r),
+sequence(s)
+{
+	addVariable(result);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnSendRoomMessage::ChatOnSendRoomMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnSendRoomMessage"),
+result(),
+sequence()
+{
+	addVariable(result);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnSendRoomMessage::~ChatOnSendRoomMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendRoomMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendRoomMessage.h
new file mode 100644
index 00000000..5d1310d8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnSendRoomMessage.h
@@ -0,0 +1,48 @@
+// ChatOnSendRoomMessage.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnSendRoomMessage_H
+#define	_INCLUDED_ChatOnSendRoomMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatOnSendRoomMessage : public GameNetworkMessage
+{
+public:
+	ChatOnSendRoomMessage(const unsigned int sequence, const unsigned int result);
+	explicit ChatOnSendRoomMessage(Archive::ReadIterator & source);
+	~ChatOnSendRoomMessage();
+
+	const unsigned int  getResult    () const;
+	const unsigned int  getSequence  () const;
+
+private:
+	ChatOnSendRoomMessage & operator = (const ChatOnSendRoomMessage & rhs);
+	ChatOnSendRoomMessage(const ChatOnSendRoomMessage & source);
+
+	Archive::AutoVariable<unsigned int>  result;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnSendRoomMessage::getResult() const
+{
+	return result.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnSendRoomMessage::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnSendRoomMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnUnbanAvatarFromRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnUnbanAvatarFromRoom.cpp
new file mode 100644
index 00000000..fa97d25b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnUnbanAvatarFromRoom.cpp
@@ -0,0 +1,52 @@
+// ChatOnUnbanAvatarFromRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatOnUnbanAvatarFromRoom.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnUnbanAvatarFromRoom::ChatOnUnbanAvatarFromRoom(const unsigned int s, const unsigned int r, const std::string &room, const ChatAvatarId &bannerId, const ChatAvatarId &banneeId) :
+GameNetworkMessage("ChatOnUnbanAvatarFromRoom"),
+roomName(room),
+banner(bannerId),
+bannee(banneeId),
+result(r),
+sequence(s)
+{
+	addVariable(roomName);
+	addVariable(banner);
+	addVariable(bannee);
+	addVariable(result);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnUnbanAvatarFromRoom::ChatOnUnbanAvatarFromRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnUnbanAvatarFromRoom"),
+roomName(),
+banner(),
+bannee(),
+result(),
+sequence()
+{
+	addVariable(roomName);
+	addVariable(banner);
+	addVariable(bannee);
+	addVariable(result);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnUnbanAvatarFromRoom::~ChatOnUnbanAvatarFromRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnUnbanAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnUnbanAvatarFromRoom.h
new file mode 100644
index 00000000..f13f4a0c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnUnbanAvatarFromRoom.h
@@ -0,0 +1,80 @@
+// ChatOnUnbanAvatarFromRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnUnbanAvatarFromRoom_H
+#define	_INCLUDED_ChatOnUnbanAvatarFromRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class ChatOnUnbanAvatarFromRoom : public GameNetworkMessage
+{
+public:
+	ChatOnUnbanAvatarFromRoom(const unsigned int sequence, const unsigned int result, const std::string &roomName, const ChatAvatarId &banner, const ChatAvatarId &bannee );
+	ChatOnUnbanAvatarFromRoom(Archive::ReadIterator & source);
+	~ChatOnUnbanAvatarFromRoom();
+
+	const std::string  & getRoomName  () const;
+	const ChatAvatarId & getUnbanner    () const;
+	const ChatAvatarId & getUnbannee    () const;
+	const unsigned int   getResult    () const;
+	const unsigned int   getSequence  () const;
+
+private:
+	ChatOnUnbanAvatarFromRoom & operator = (const ChatOnUnbanAvatarFromRoom & rhs);
+	ChatOnUnbanAvatarFromRoom(const ChatOnUnbanAvatarFromRoom & source);
+
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<ChatAvatarId>  banner;
+	Archive::AutoVariable<ChatAvatarId>  bannee;
+	Archive::AutoVariable<unsigned int>  result;
+	Archive::AutoVariable<unsigned int>  sequence;
+
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatOnUnbanAvatarFromRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnUnbanAvatarFromRoom::getUnbanner() const
+{
+	return banner.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnUnbanAvatarFromRoom::getUnbannee() const
+{
+	return bannee.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnUnbanAvatarFromRoom::getResult() const
+{
+	return result.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnUnbanAvatarFromRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnUnbanAvatarFromRoom_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnUninviteFromRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnUninviteFromRoom.cpp
new file mode 100644
index 00000000..afab1a8a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnUninviteFromRoom.cpp
@@ -0,0 +1,53 @@
+// ChatOnUninviteFromRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatOnUninviteFromRoom.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatOnUninviteFromRoom::ChatOnUninviteFromRoom(const unsigned int s, const unsigned int r, const std::string &room, const ChatAvatarId &invitorId, const ChatAvatarId &inviteeId) :
+GameNetworkMessage("ChatOnUninviteFromRoom"),
+roomName(room),
+invitor(invitorId),
+invitee(inviteeId),
+result(r),
+sequence(s)
+{
+	addVariable(roomName);
+	addVariable(invitor);
+	addVariable(invitee);
+	addVariable(result);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnUninviteFromRoom::ChatOnUninviteFromRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatOnUninviteFromRoom"),
+roomName(),
+invitor(),
+invitee(),
+result(),
+sequence()
+{
+	addVariable(roomName);
+	addVariable(invitor);
+	addVariable(invitee);
+	addVariable(result);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatOnUninviteFromRoom::~ChatOnUninviteFromRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnUninviteFromRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnUninviteFromRoom.h
new file mode 100644
index 00000000..d39b71dd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatOnUninviteFromRoom.h
@@ -0,0 +1,80 @@
+// ChatOnUninviteFromRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatOnUninviteFromRoom_H
+#define	_INCLUDED_ChatOnUninviteFromRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class ChatOnUninviteFromRoom : public GameNetworkMessage
+{
+public:
+	ChatOnUninviteFromRoom(const unsigned int sequence, const unsigned int result, const std::string &roomName, const ChatAvatarId &invitor, const ChatAvatarId &invitee );
+	ChatOnUninviteFromRoom(Archive::ReadIterator & source);
+	~ChatOnUninviteFromRoom();
+
+	const std::string  & getRoomName  () const;
+	const ChatAvatarId & getInvitor   () const;
+	const ChatAvatarId & getInvitee   () const;
+	const unsigned int   getResult    () const;
+	const unsigned int   getSequence  () const;
+
+private:
+	ChatOnUninviteFromRoom & operator = (const ChatOnUninviteFromRoom & rhs);
+	ChatOnUninviteFromRoom(const ChatOnUninviteFromRoom & source);
+
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<ChatAvatarId>  invitor;
+	Archive::AutoVariable<ChatAvatarId>  invitee;
+	Archive::AutoVariable<unsigned int>  result;
+	Archive::AutoVariable<unsigned int>  sequence;
+
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatOnUninviteFromRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnUninviteFromRoom::getInvitor() const
+{
+	return invitor.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatOnUninviteFromRoom::getInvitee() const
+{
+	return invitee.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnUninviteFromRoom::getResult() const
+{
+	return result.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatOnUninviteFromRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatOnUninviteFromRoom_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClient.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClient.cpp
new file mode 100644
index 00000000..fda8ef61
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClient.cpp
@@ -0,0 +1,85 @@
+// ChatPersistentMessageToClient.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatPersistentMessageToClient.h"
+#include "sharedNetworkMessages/ChatPersistentMessageToClientDataArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatPersistentMessageToClient::ChatPersistentMessageToClient(const unsigned int i, signed char stat, const std::string & g, const std::string & s, const std::string & c, const Unicode::String & subj, const unsigned int t) :
+GameNetworkMessage("ChatPersistentMessageToClient"),
+data ()
+{
+	Data d;
+
+	d.fromCharacterName = c;
+	d.fromGameCode = g;
+	d.fromServerCode = s;
+	d.id = i;
+	d.isHeader = true;
+	d.subject = subj;
+	d.status = stat;
+	d.timeStamp = t;
+
+	data.set (d);
+
+	addVariable (data);
+}
+
+//-----------------------------------------------------------------------
+
+ChatPersistentMessageToClient::ChatPersistentMessageToClient(const unsigned int i, signed char stat, const std::string & g, const std::string & s, const std::string & c, const Unicode::String & subj, const Unicode::String & m, const Unicode::String & o, const unsigned int t) :
+GameNetworkMessage("ChatPersistentMessageToClient"),
+data ()
+{
+	Data d;
+
+	d.fromCharacterName = c;
+	d.fromGameCode = g;
+	d.fromServerCode = s;
+	d.id = i;
+	d.isHeader = false;
+	d.subject = subj;
+	d.message = m;
+	d.outOfBand = o;
+	d.status = stat;
+	d.timeStamp = t;
+
+	data.set (d);
+
+	addVariable (data);
+}
+
+//-----------------------------------------------------------------------
+
+ChatPersistentMessageToClient::ChatPersistentMessageToClient(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatPersistentMessageToClient"),
+data ()
+{
+	addVariable (data);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatPersistentMessageToClient::~ChatPersistentMessageToClient()
+{
+}
+
+//-----------------------------------------------------------------------
+
+ChatPersistentMessageToClient & ChatPersistentMessageToClient::operator = (const ChatPersistentMessageToClient & rhs)
+{
+	if(this != &rhs)
+	{
+		*this = rhs;
+	}
+	return *this;
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClient.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClient.h
new file mode 100644
index 00000000..2031869d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClient.h
@@ -0,0 +1,44 @@
+// ChatPersistentMessageToClient.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatPersistentMessageToClient_H
+#define	_INCLUDED_ChatPersistentMessageToClient_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatPersistentMessageToClientDataArchive.h"
+#include "sharedNetworkMessages/ChatPersistentMessageToClientData.h"
+
+//-----------------------------------------------------------------------
+
+class ChatPersistentMessageToClient : public GameNetworkMessage
+{
+public:
+	typedef ChatPersistentMessageToClientData Data;
+
+	ChatPersistentMessageToClient(const unsigned int id, signed char status, const std::string & fromGameCode, const std::string & fromServerCode, const std::string & fromCharacterName, const Unicode::String & subject, const unsigned int timeStamp);
+	ChatPersistentMessageToClient(const unsigned int id, signed char status, const std::string & fromGameCode, const std::string & fromServerCode, const std::string & fromCharacterName, const Unicode::String & subject, const Unicode::String & message, const Unicode::String & oob, const unsigned int timeStamp);
+	explicit ChatPersistentMessageToClient(Archive::ReadIterator &);
+	~ChatPersistentMessageToClient();
+
+	const Data &             getData               () const;
+
+private:
+	ChatPersistentMessageToClient & operator = (const ChatPersistentMessageToClient & rhs);
+	ChatPersistentMessageToClient(const ChatPersistentMessageToClient & source);
+
+	Archive::AutoVariable<Data>      data;
+};
+
+//----------------------------------------------------------------------
+
+inline const ChatPersistentMessageToClient::Data & ChatPersistentMessageToClient::getData () const
+{
+	return data.get ();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatPersistentMessageToClient_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClientData.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClientData.cpp
new file mode 100644
index 00000000..3bd0be7e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClientData.cpp
@@ -0,0 +1,28 @@
+//======================================================================
+//
+// ChatPersistentMessageToClientData.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatPersistentMessageToClientData.h"
+
+//======================================================================
+
+ChatPersistentMessageToClientData::ChatPersistentMessageToClientData () :
+fromCharacterName (),
+fromGameCode      (),
+fromServerCode    (),
+id                (0),
+isHeader          (true),
+message           (),
+subject           (),
+outOfBand         (),
+status            (0),
+timeStamp         (0)
+{
+
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClientData.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClientData.h
new file mode 100644
index 00000000..8c98430f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClientData.h
@@ -0,0 +1,31 @@
+//======================================================================
+//
+// ChatPersistentMessageToClientData.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ChatPersistentMessageToClientData_H
+#define INCLUDED_ChatPersistentMessageToClientData_H
+
+//======================================================================
+
+struct ChatPersistentMessageToClientData
+{
+	std::string      fromCharacterName;
+	std::string      fromGameCode;
+	std::string      fromServerCode;
+	unsigned int     id;
+	bool             isHeader;
+	Unicode::String  message;
+	Unicode::String  subject;
+	Unicode::String  outOfBand;
+	signed char      status;
+	unsigned int     timeStamp;
+
+	ChatPersistentMessageToClientData ();
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClientDataArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClientDataArchive.cpp
new file mode 100644
index 00000000..68486116
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClientDataArchive.cpp
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// ChatPersistentMessageToClientDataArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatPersistentMessageToClientDataArchive.h"
+#include "sharedNetworkMessages/ChatPersistentMessageToClientData.h"
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, ChatPersistentMessageToClientData & target)
+	{
+		get (source, target.fromCharacterName);
+		get (source, target.fromGameCode);
+		get (source, target.fromServerCode);
+		get (source, target.id);
+		get (source, target.isHeader);
+		get (source, target.message);
+		get (source, target.subject);
+		get (source, target.outOfBand);
+		get (source, target.status);
+		get (source, target.timeStamp);		
+	}
+
+	void put (ByteStream & target, const ChatPersistentMessageToClientData & source)
+	{
+		put (target, source.fromCharacterName);
+		put (target, source.fromGameCode);
+		put (target, source.fromServerCode);
+		put (target, source.id);
+		put (target, source.isHeader);
+		put (target, source.message);
+		put (target, source.subject);
+		put (target, source.outOfBand);
+		put (target, source.status);
+		put (target, source.timeStamp);		
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClientDataArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClientDataArchive.h
new file mode 100644
index 00000000..5e421431
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToClientDataArchive.h
@@ -0,0 +1,27 @@
+//======================================================================
+//
+// ChatPersistentMessageToClientDataArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ChatPersistentMessageToClientDataArchive_H
+#define INCLUDED_ChatPersistentMessageToClientDataArchive_H
+
+//======================================================================
+
+#include "Archive/ByteStream.h"
+
+struct ChatPersistentMessageToClientData;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, ChatPersistentMessageToClientData & target);
+	void put (ByteStream & target, const ChatPersistentMessageToClientData & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToServer.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToServer.cpp
new file mode 100644
index 00000000..282c23cb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToServer.cpp
@@ -0,0 +1,52 @@
+// ChatPersistentMessageToServer.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatPersistentMessageToServer.h"
+
+//-----------------------------------------------------------------------
+
+
+ChatPersistentMessageToServer::ChatPersistentMessageToServer(const unsigned int s, const ChatAvatarId & c, const Unicode::String & subj, const Unicode::String & m, const Unicode::String & o) :
+GameNetworkMessage("ChatPersistentMessageToServer"),
+message(m.substr(0, ChatPersistentMessageToServerNamespace::MAX_MESSAGE_SIZE)),	
+outOfBand(o),
+sequence(s),
+subject(subj),
+toCharacterName(c)
+{
+	addVariable(message);
+	addVariable(outOfBand);
+	addVariable(sequence);
+	addVariable(subject);
+	addVariable(toCharacterName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatPersistentMessageToServer::ChatPersistentMessageToServer(Archive::ReadIterator  & source) :
+GameNetworkMessage("ChatPersistentMessageToServer"),
+message(),
+outOfBand(),
+subject(),
+toCharacterName()
+{
+	addVariable(message);
+	addVariable(outOfBand);
+	addVariable(sequence);
+	addVariable(subject);
+	addVariable(toCharacterName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatPersistentMessageToServer::~ChatPersistentMessageToServer()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToServer.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToServer.h
new file mode 100644
index 00000000..da85eb93
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPersistentMessageToServer.h
@@ -0,0 +1,82 @@
+// ChatPersistentMessageToServer.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatPersistentMessageToServer_H
+#define	_INCLUDED_ChatPersistentMessageToServer_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+
+namespace ChatPersistentMessageToServerNamespace {
+	const unsigned int MAX_MESSAGE_SIZE = 4000;
+}
+
+class ChatPersistentMessageToServer : public GameNetworkMessage
+{
+public:
+	ChatPersistentMessageToServer(const unsigned int sequence, const ChatAvatarId & toCharacter, const Unicode::String & subject, const Unicode::String & message, const Unicode::String & outOfBand);
+	ChatPersistentMessageToServer(Archive::ReadIterator &);
+	~ChatPersistentMessageToServer();
+
+	const Unicode::String &  getMessage          () const;
+	const Unicode::String &  getOutOfBand        () const;
+	const unsigned int       getSequence         () const;
+	const Unicode::String &  getSubject          () const;
+	const ChatAvatarId &     getToCharacterName  () const;
+
+private:
+	ChatPersistentMessageToServer & operator = (const ChatPersistentMessageToServer & rhs);
+	ChatPersistentMessageToServer(const ChatPersistentMessageToServer & source);
+
+	Archive::AutoVariable<Unicode::String>  message;
+	Archive::AutoVariable<Unicode::String>  outOfBand;
+	Archive::AutoVariable<unsigned int>     sequence;
+	Archive::AutoVariable<Unicode::String>  subject;
+	Archive::AutoVariable<ChatAvatarId>     toCharacterName;
+};
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatPersistentMessageToServer::getMessage() const
+{
+	return message.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatPersistentMessageToServer::getOutOfBand() const
+{
+	return outOfBand.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatPersistentMessageToServer::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatPersistentMessageToServer::getSubject() const
+{
+	return subject.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatPersistentMessageToServer::getToCharacterName() const
+{
+	return toCharacterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatPersistentMessageToServer_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPutAvatarInRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPutAvatarInRoom.cpp
new file mode 100644
index 00000000..f1587c49
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPutAvatarInRoom.cpp
@@ -0,0 +1,61 @@
+// ChatPutAvatarInRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatPutAvatarInRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatPutAvatarInRoom::ChatPutAvatarInRoom(const std::string & a, const std::string & r, bool forceCreate, bool createPrivate) :
+GameNetworkMessage("ChatPutAvatarInRoom"),
+m_avatarName(a),
+m_roomName(r),
+m_forceCreate(forceCreate),
+m_createPrivate(createPrivate)
+{
+	addVariable(m_avatarName);
+	addVariable(m_roomName);
+	addVariable(m_forceCreate);
+	addVariable(m_createPrivate);
+}
+
+//-----------------------------------------------------------------------
+
+ChatPutAvatarInRoom::ChatPutAvatarInRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatPutAvatarInRoom"),
+m_avatarName(),
+m_roomName(),
+m_forceCreate(false),
+m_createPrivate(false)
+{
+	addVariable(m_avatarName);
+	addVariable(m_roomName);
+	addVariable(m_forceCreate);
+	addVariable(m_createPrivate);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatPutAvatarInRoom::~ChatPutAvatarInRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
+bool ChatPutAvatarInRoom::getForceCreate() const
+{
+	return m_forceCreate.get();
+}
+
+//-----------------------------------------------------------------------
+
+bool ChatPutAvatarInRoom::getCreatePrivate() const
+{
+	return m_createPrivate.get();
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPutAvatarInRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPutAvatarInRoom.h
new file mode 100644
index 00000000..cb3f4394
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatPutAvatarInRoom.h
@@ -0,0 +1,52 @@
+// ChatPutAvatarInRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatPutAvatarInRoom_H
+#define	_INCLUDED_ChatPutAvatarInRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatPutAvatarInRoom : public GameNetworkMessage
+{
+public:
+	ChatPutAvatarInRoom(const std::string & avatarName, const std::string & roomName, bool forceCreate, bool createPrivate);
+	explicit ChatPutAvatarInRoom(Archive::ReadIterator & source);
+	~ChatPutAvatarInRoom();
+
+	const std::string &  getAvatarName  () const;
+	const std::string &  getRoomName    () const;
+	bool                 getForceCreate () const;
+	bool                 getCreatePrivate() const;
+
+private:
+	ChatPutAvatarInRoom & operator = (const ChatPutAvatarInRoom & rhs);
+	ChatPutAvatarInRoom(const ChatPutAvatarInRoom & source);
+
+	Archive::AutoVariable<std::string>  m_avatarName;
+	Archive::AutoVariable<std::string>  m_roomName;
+	Archive::AutoVariable<bool>         m_forceCreate;
+	Archive::AutoVariable<bool>         m_createPrivate;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatPutAvatarInRoom::getAvatarName() const
+{
+	return m_avatarName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatPutAvatarInRoom::getRoomName() const
+{
+	return m_roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatPutAvatarInRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatQueryRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatQueryRoom.cpp
new file mode 100644
index 00000000..9418e983
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatQueryRoom.cpp
@@ -0,0 +1,40 @@
+// ChatQueryRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatQueryRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatQueryRoom::ChatQueryRoom(const unsigned int s, const std::string & n) :
+GameNetworkMessage("ChatQueryRoom"),
+roomName(n),
+sequence(s)
+{
+	addVariable(sequence);
+	addVariable(roomName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatQueryRoom::ChatQueryRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatQueryRoom"),
+roomName(),
+sequence()
+{
+	addVariable(sequence);
+	addVariable(roomName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatQueryRoom::~ChatQueryRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatQueryRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatQueryRoom.h
new file mode 100644
index 00000000..259383b8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatQueryRoom.h
@@ -0,0 +1,48 @@
+// ChatQueryRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatQueryRoom_H
+#define	_INCLUDED_ChatQueryRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatQueryRoom : public GameNetworkMessage
+{
+public:
+	ChatQueryRoom(unsigned int sequence, const std::string & roomName);
+	ChatQueryRoom(Archive::ReadIterator &);
+	~ChatQueryRoom();
+
+	const std::string & getRoomName  () const;
+	const unsigned int  getSequence  () const;
+
+private:
+	ChatQueryRoom & operator = (const ChatQueryRoom & rhs);
+	ChatQueryRoom(const ChatQueryRoom & source);
+
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatQueryRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatQueryRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatQueryRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatQueryRoomResults.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatQueryRoomResults.cpp
new file mode 100644
index 00000000..46e3938a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatQueryRoomResults.cpp
@@ -0,0 +1,67 @@
+// ChatQueryRoomResults.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatQueryRoomResults.h"
+
+//-----------------------------------------------------------------------
+
+ChatQueryRoomResults::ChatQueryRoomResults(const unsigned int s, const ChatRoomData & n, const std::vector<ChatAvatarId> & a, const std::vector<ChatAvatarId> & m, const std::vector<ChatAvatarId> & i, const std::vector<ChatAvatarId> & b) :
+GameNetworkMessage("ChatQueryRoomResults"),
+avatars(),
+invitees(),
+moderators(),
+banned(),
+roomData(n),
+sequence(s)
+{
+	avatars.set(a);
+	invitees.set(i);
+	moderators.set(m);
+	banned.set(b);
+	addVariable(avatars);
+	addVariable(invitees);
+	addVariable(moderators);
+	addVariable(banned);
+	addVariable(sequence);
+	addVariable(roomData);
+}
+
+//-----------------------------------------------------------------------
+
+ChatQueryRoomResults::ChatQueryRoomResults(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatQueryRoomResults"),
+avatars(),
+invitees(),
+moderators(),
+banned(),
+roomData(),
+sequence()
+{
+	addVariable(avatars);
+	addVariable(invitees);
+	addVariable(moderators);
+	addVariable(banned);
+	addVariable(sequence);
+	addVariable(roomData);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatQueryRoomResults::~ChatQueryRoomResults()
+{
+}
+
+//----------------------------------------------------------------------
+
+const std::vector<ChatAvatarId> & ChatQueryRoomResults::getBanned () const
+{
+	return banned.get();
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatQueryRoomResults.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatQueryRoomResults.h
new file mode 100644
index 00000000..f5d37004
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatQueryRoomResults.h
@@ -0,0 +1,81 @@
+// ChatQueryRoomResults.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatQueryRoomResults_H
+#define	_INCLUDED_ChatQueryRoomResults_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include "sharedNetworkMessages/ChatRoomData.h"
+#include "sharedNetworkMessages/ChatRoomDataArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatQueryRoomResults : public GameNetworkMessage
+{
+public:
+	ChatQueryRoomResults(unsigned int sequence, const ChatRoomData & roomData, const std::vector<ChatAvatarId> & avatars, const std::vector<ChatAvatarId> & moderators, const std::vector<ChatAvatarId> & invitees, const std::vector<ChatAvatarId> & banned);
+	ChatQueryRoomResults(Archive::ReadIterator &);
+	~ChatQueryRoomResults();
+
+	const std::vector<ChatAvatarId> &  getAvatars     () const;
+	const std::vector<ChatAvatarId> &  getInvitees    () const;
+	const std::vector<ChatAvatarId> &  getModerators  () const;
+	const std::vector<ChatAvatarId> &  getBanned      () const;
+	const ChatRoomData &               getRoomData    () const;
+	const unsigned int                 getSequence    () const;
+
+private:
+	ChatQueryRoomResults & operator = (const ChatQueryRoomResults & rhs);
+	ChatQueryRoomResults(const ChatQueryRoomResults & source);
+
+	Archive::AutoArray<ChatAvatarId>     avatars;
+	Archive::AutoArray<ChatAvatarId>     invitees;
+	Archive::AutoArray<ChatAvatarId>     moderators;
+	Archive::AutoArray<ChatAvatarId>     banned;
+	Archive::AutoVariable<ChatRoomData>  roomData;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::vector<ChatAvatarId> & ChatQueryRoomResults::getAvatars() const
+{
+	return avatars.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::vector<ChatAvatarId> & ChatQueryRoomResults::getInvitees() const
+{
+	return invitees.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::vector<ChatAvatarId> & ChatQueryRoomResults::getModerators() const
+{
+	return moderators.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const ChatRoomData & ChatQueryRoomResults::getRoomData() const
+{
+	return roomData.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatQueryRoomResults::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatQueryRoomResults_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveAvatarFromRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveAvatarFromRoom.cpp
new file mode 100644
index 00000000..b72391b5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveAvatarFromRoom.cpp
@@ -0,0 +1,42 @@
+// ChatRemoveAvatarFromRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include "sharedNetworkMessages/ChatRemoveAvatarFromRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatRemoveAvatarFromRoom::ChatRemoveAvatarFromRoom(const ChatAvatarId & a, const std::string & r) :
+GameNetworkMessage("ChatRemoveAvatarFromRoom"),
+avatarId(a),
+roomName(r)
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRemoveAvatarFromRoom::ChatRemoveAvatarFromRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatRemoveAvatarFromRoom"),
+avatarId(),
+roomName()
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRemoveAvatarFromRoom::~ChatRemoveAvatarFromRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveAvatarFromRoom.h
new file mode 100644
index 00000000..2134c572
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveAvatarFromRoom.h
@@ -0,0 +1,48 @@
+// ChatRemoveAvatarFromRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatRemoveAvatarFromRoom_H
+#define	_INCLUDED_ChatRemoveAvatarFromRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatRemoveAvatarFromRoom : public GameNetworkMessage
+{
+public:
+	ChatRemoveAvatarFromRoom(const ChatAvatarId & avatarId, const std::string & roomName);
+	explicit ChatRemoveAvatarFromRoom(Archive::ReadIterator & source);
+	~ChatRemoveAvatarFromRoom();
+
+	const ChatAvatarId &  getAvatarId  () const;
+	const std::string &   getRoomName  () const;
+
+private:
+	ChatRemoveAvatarFromRoom & operator = (const ChatRemoveAvatarFromRoom & rhs);
+	ChatRemoveAvatarFromRoom(const ChatRemoveAvatarFromRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId> avatarId;
+	Archive::AutoVariable<std::string>  roomName;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatRemoveAvatarFromRoom::getAvatarId() const
+{
+	return avatarId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatRemoveAvatarFromRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatRemoveAvatarFromRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveFriend.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveFriend.cpp
new file mode 100644
index 00000000..7875fc0f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveFriend.cpp
@@ -0,0 +1,36 @@
+// ChatRemoveFriend.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatRemoveFriend.h"
+
+//-----------------------------------------------------------------------
+
+ChatRemoveFriend::ChatRemoveFriend(const ChatAvatarId & c) :
+GameNetworkMessage("ChatRemoveFriend"),
+characterName(c)
+{
+	addVariable(characterName);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRemoveFriend::ChatRemoveFriend(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatRemoveFriend"),
+characterName()
+{
+	addVariable(characterName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRemoveFriend::~ChatRemoveFriend()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveFriend.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveFriend.h
new file mode 100644
index 00000000..f4c62ad7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveFriend.h
@@ -0,0 +1,41 @@
+// ChatRemoveFriend.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatRemoveFriend_H
+#define	_INCLUDED_ChatRemoveFriend_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatRemoveFriend : public GameNetworkMessage
+{
+public:
+	ChatRemoveFriend(const ChatAvatarId & characterName);
+	ChatRemoveFriend(Archive::ReadIterator & source);
+	~ChatRemoveFriend();
+
+	const ChatAvatarId &  getCharacterName  () const;
+
+private:
+	ChatRemoveFriend & operator = (const ChatRemoveFriend & rhs);
+	ChatRemoveFriend(const ChatRemoveFriend & source);
+
+	Archive::AutoVariable<ChatAvatarId>   characterName;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatRemoveFriend::getCharacterName () const
+{
+	return characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatRemoveFriend_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveModeratorFromRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveModeratorFromRoom.cpp
new file mode 100644
index 00000000..1dc25700
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveModeratorFromRoom.cpp
@@ -0,0 +1,45 @@
+// ChatRemoveModeratorFromRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include "sharedNetworkMessages/ChatRemoveModeratorFromRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatRemoveModeratorFromRoom::ChatRemoveModeratorFromRoom(const unsigned int s, const ChatAvatarId & a, const std::string & r) :
+GameNetworkMessage("ChatRemoveModeratorFromRoom"),
+avatarId(a),
+roomName(r),
+sequenceId(s)
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+	addVariable(sequenceId);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRemoveModeratorFromRoom::ChatRemoveModeratorFromRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatRemoveModeratorFromRoom"),
+avatarId(),
+roomName(),
+sequenceId(0)
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+	addVariable(sequenceId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRemoveModeratorFromRoom::~ChatRemoveModeratorFromRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveModeratorFromRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveModeratorFromRoom.h
new file mode 100644
index 00000000..74863932
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRemoveModeratorFromRoom.h
@@ -0,0 +1,58 @@
+// ChatRemoveModeratorFromRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatRemoveModeratorFromRoom_H
+#define	_INCLUDED_ChatRemoveModeratorFromRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+
+//-----------------------------------------------------------------------
+
+class ChatRemoveModeratorFromRoom : public GameNetworkMessage
+{
+public:
+	ChatRemoveModeratorFromRoom(const unsigned int sequenceId, const ChatAvatarId & avatarId, const std::string & roomName);
+	ChatRemoveModeratorFromRoom(Archive::ReadIterator & source);
+	~ChatRemoveModeratorFromRoom();
+
+	const ChatAvatarId &  getAvatarId    () const;
+	const std::string &   getRoomName    () const;
+	const unsigned int    getSequenceId  () const;
+
+private:
+	ChatRemoveModeratorFromRoom & operator = (const ChatRemoveModeratorFromRoom & rhs);
+	ChatRemoveModeratorFromRoom(const ChatRemoveModeratorFromRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  avatarId;
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<unsigned int>  sequenceId;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatRemoveModeratorFromRoom::getAvatarId() const
+{
+	return avatarId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatRemoveModeratorFromRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatRemoveModeratorFromRoom::getSequenceId() const
+{
+	return sequenceId.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatRemoveModeratorFromRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestLog.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestLog.cpp
new file mode 100644
index 00000000..6d66430e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestLog.cpp
@@ -0,0 +1,40 @@
+// ChatRequestLog.cpp
+// Copyright 2000-02, Sony Online Createtainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatRequestLog.h"
+
+//-----------------------------------------------------------------------
+
+ChatRequestLog::ChatRequestLog(const unsigned int s, Unicode::String const &player) :
+GameNetworkMessage("ChatRequestLog"),
+m_player(player),
+sequence(s)
+{
+	addVariable(m_player);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRequestLog::ChatRequestLog(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatRequestLog"),
+m_player(),
+sequence()
+{
+	addVariable(m_player);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRequestLog::~ChatRequestLog()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestLog.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestLog.h
new file mode 100644
index 00000000..376d4dc8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestLog.h
@@ -0,0 +1,48 @@
+// ChatRequestLog.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatRequestLog_H
+#define	_INCLUDED_ChatRequestLog_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatRequestLog : public GameNetworkMessage
+{
+public:
+	ChatRequestLog(const unsigned int sequence, Unicode::String const &player);
+	ChatRequestLog(Archive::ReadIterator &);
+	~ChatRequestLog();
+
+	Unicode::String const &getPlayer() const;
+	const unsigned int       getSequence     () const;
+
+private:
+	ChatRequestLog & operator = (const ChatRequestLog & rhs);
+	ChatRequestLog(const ChatRequestLog & source);
+
+	Archive::AutoVariable<Unicode::String> m_player;
+	Archive::AutoVariable<unsigned int>     sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline Unicode::String const &ChatRequestLog::getPlayer() const
+{
+	return m_player.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatRequestLog::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatRequestLog_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestPersistentMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestPersistentMessage.cpp
new file mode 100644
index 00000000..72e3b254
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestPersistentMessage.cpp
@@ -0,0 +1,39 @@
+// ChatRequestPersistentMessage.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatRequestPersistentMessage.h"
+
+//-----------------------------------------------------------------------
+
+ChatRequestPersistentMessage::ChatRequestPersistentMessage(const unsigned int s, const unsigned int i) :
+GameNetworkMessage("ChatRequestPersistentMessage"),
+messageId(i),
+sequence(s)
+{
+	addVariable(sequence);
+	addVariable(messageId);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRequestPersistentMessage::ChatRequestPersistentMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatRequestPersistentMessage"),
+messageId()
+{
+	addVariable(sequence);
+	addVariable(messageId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRequestPersistentMessage::~ChatRequestPersistentMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestPersistentMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestPersistentMessage.h
new file mode 100644
index 00000000..d9b65058
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestPersistentMessage.h
@@ -0,0 +1,47 @@
+// ChatRequestPersistentMessage.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatRequestPersistentMessage_H
+#define	_INCLUDED_ChatRequestPersistentMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+//-----------------------------------------------------------------------
+
+class ChatRequestPersistentMessage : public GameNetworkMessage
+{
+public:
+	ChatRequestPersistentMessage(const unsigned int sequence, const unsigned int messageId);
+	explicit ChatRequestPersistentMessage(Archive::ReadIterator &);
+	~ChatRequestPersistentMessage();
+
+	const unsigned int  getMessageId  () const;
+	const unsigned int  getSequence   () const;
+
+private:
+	ChatRequestPersistentMessage & operator = (const ChatRequestPersistentMessage & rhs);
+	ChatRequestPersistentMessage(const ChatRequestPersistentMessage & source);
+
+	Archive::AutoVariable<unsigned int>  messageId;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatRequestPersistentMessage::getMessageId() const
+{
+	return messageId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatRequestPersistentMessage::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatRequestPersistentMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestRoomList.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestRoomList.cpp
new file mode 100644
index 00000000..3a569c8e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestRoomList.cpp
@@ -0,0 +1,32 @@
+// ChatRequestRoomList.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatRequestRoomList.h"
+
+//-----------------------------------------------------------------------
+
+ChatRequestRoomList::ChatRequestRoomList() :
+GameNetworkMessage("ChatRequestRoomList")
+{
+}
+
+//-----------------------------------------------------------------------
+
+ChatRequestRoomList::ChatRequestRoomList(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatRequestRoomList")
+{
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRequestRoomList::~ChatRequestRoomList()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestRoomList.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestRoomList.h
new file mode 100644
index 00000000..ed209d6c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRequestRoomList.h
@@ -0,0 +1,28 @@
+// ChatRequestRoomList.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatRequestRoomList_H
+#define	_INCLUDED_ChatRequestRoomList_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatRequestRoomList : public GameNetworkMessage
+{
+public:
+	ChatRequestRoomList();
+	ChatRequestRoomList(Archive::ReadIterator &);
+	~ChatRequestRoomList();
+
+private:
+	ChatRequestRoomList & operator = (const ChatRequestRoomList & rhs);
+	ChatRequestRoomList(const ChatRequestRoomList & source);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatRequestRoomList_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomData.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomData.cpp
new file mode 100644
index 00000000..c69ed256
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomData.cpp
@@ -0,0 +1,27 @@
+//======================================================================
+//
+// ChatRoomData.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatRoomData.h"
+
+//-----------------------------------------------------------------------
+
+//======================================================================
+
+ChatRoomData::ChatRoomData () :
+id          (0),
+roomType    (0),
+path        (),
+owner       (),
+creator     (),
+title       (),
+moderators  (),
+moderated   (0)
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomData.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomData.h
new file mode 100644
index 00000000..5122efff
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomData.h
@@ -0,0 +1,74 @@
+//======================================================================
+//
+// ChatRoomData.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ChatRoomData_H
+#define INCLUDED_ChatRoomData_H
+
+//======================================================================
+
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+#include <vector>
+
+//-----------------------------------------------------------------------
+
+namespace ChatRoomTypes 
+{
+	static const std::string ROOM_SYSTEM    = "system";
+	static const std::string ROOM_UNIVERSE  = "Universe";
+	static const std::string ROOM_GALAXY    = "Galaxy";
+	static const std::string ROOM_PLANET    = "Planet";
+	static const std::string ROOM_CHAT      = "Chat";
+	static const std::string ROOM_GROUP     = "GroupChat";
+	static const std::string ROOM_GUILD     = "GuildChat";
+	static const std::string ROOM_CITY      = "CityChat";
+	static const std::string ROOM_IMPERIAL  = "Imperial";
+	static const std::string ROOM_IMPERIAL_WAR_ROOM = "ImperialWarRoom";
+	static const std::string ROOM_REBEL     = "Rebel";
+	static const std::string ROOM_REBEL_WAR_ROOM = "RebelWarRoom";
+	static const std::string ROOM_BOUNTY_HUNTER   = "BountyHunter";
+	static const std::string ROOM_COMMANDO        = "Commando";
+	static const std::string ROOM_ENTERTAINER     = "Entertainer";
+	static const std::string ROOM_FORCE_SENSITIVE = "ForceSensitive";
+	static const std::string ROOM_MEDIC           = "Medic";
+	static const std::string ROOM_OFFICER         = "Officer";
+	static const std::string ROOM_PILOT           = "Pilot";
+	static const std::string ROOM_POLITICIAN      = "Politician";
+	static const std::string ROOM_SMUGGLER        = "Smuggler";
+	static const std::string ROOM_SPY             = "Spy";
+	static const std::string ROOM_TRADER          = "Trader";
+	static const std::string ROOM_BEAST_MASTERY   = "BeastMastery";
+	static const std::string ROOM_WARDEN          = "Warden";
+}//namespace ChatRoomTypes
+
+enum 
+{
+	CHAT_ROOM_PUBLIC,
+	CHAT_ROOM_PRIVATE
+};
+
+//----------------------------------------------------------------------
+
+struct ChatRoomData
+{
+	uint32                     id;
+	unsigned int               roomType;
+	std::string                path;
+	ChatAvatarId               owner;
+	ChatAvatarId               creator;
+	Unicode::String            title;
+	std::vector<ChatAvatarId>  moderators;
+	std::vector<ChatAvatarId>  invitees;
+	unsigned char              moderated;
+
+	ChatRoomData ();
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomDataArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomDataArchive.cpp
new file mode 100644
index 00000000..d72ad5ed
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomDataArchive.cpp
@@ -0,0 +1,74 @@
+//======================================================================
+//
+// ChatRoomDataArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatRoomDataArchive.h"
+
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include "sharedNetworkMessages/ChatRoomData.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, ChatRoomData & target)
+	{
+		get (source, target.id);
+		get (source, target.roomType);
+		get (source, target.moderated);
+		get (source, target.path);	
+		get (source, target.owner);	
+		get (source, target.creator);	
+		get (source, target.title);	
+		int moderatorCount;
+		get (source, moderatorCount);
+		int i;
+		target.moderators.clear();
+		for(i = 0; i < moderatorCount; ++i)
+		{
+			ChatAvatarId id;
+			get(source, id);
+			target.moderators.push_back(id);
+		}
+		int inviteCount;
+		get(source, inviteCount);
+		for(i = 0; i < inviteCount; ++i)
+		{
+			ChatAvatarId id;
+			get(source, id);
+			target.invitees.push_back(id);
+		}
+	}
+
+	void put (ByteStream & target, const ChatRoomData & source)
+	{
+		put (target, source.id);
+		put (target, source.roomType);
+		put (target, source.moderated);
+		put (target, source.path);
+		put (target, source.owner);
+		put (target, source.creator);
+		put (target, source.title);	
+		int c = static_cast<int>(source.moderators.size());
+		put (target, c);
+		std::vector<ChatAvatarId>::const_iterator i;
+		for(i = source.moderators.begin(); i != source.moderators.end(); ++i)
+		{
+			put(target, (*i));
+		}
+
+		c = static_cast<int>(source.invitees.size());
+		put(target, c);
+		for(i = source.invitees.begin(); i != source.invitees.end(); ++i)
+		{
+			put(target, (*i));
+		}
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomDataArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomDataArchive.h
new file mode 100644
index 00000000..18b5d05c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomDataArchive.h
@@ -0,0 +1,27 @@
+//======================================================================
+//
+// ChatRoomDataArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ChatRoomDataArchive_H
+#define INCLUDED_ChatRoomDataArchive_H
+
+//======================================================================
+
+#include "Archive/ByteStream.h"
+
+struct ChatRoomData;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, ChatRoomData & target);
+	void put (ByteStream & target, const ChatRoomData & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomList.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomList.cpp
new file mode 100644
index 00000000..d09827a6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomList.cpp
@@ -0,0 +1,36 @@
+// ChatRoomList.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatRoomList.h"
+
+//-----------------------------------------------------------------------
+
+ChatRoomList::ChatRoomList(const std::vector<ChatRoomData> & r) :
+GameNetworkMessage("ChatRoomList"),
+roomData()
+{
+	roomData.set(r);
+	addVariable(roomData);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRoomList::ChatRoomList(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatRoomList"),
+roomData()
+{
+	addVariable(roomData);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRoomList::~ChatRoomList()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomList.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomList.h
new file mode 100644
index 00000000..2ebe7288
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomList.h
@@ -0,0 +1,42 @@
+// ChatRoomList.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatRoomList_H
+#define	_INCLUDED_ChatRoomList_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatRoomData.h"
+#include "sharedNetworkMessages/ChatRoomDataArchive.h"
+#include <vector>
+
+//-----------------------------------------------------------------------
+
+class ChatRoomList : public GameNetworkMessage
+{
+public:
+	explicit ChatRoomList(const std::vector<ChatRoomData> & roomData);
+	explicit ChatRoomList(Archive::ReadIterator &);
+	~ChatRoomList();
+
+	const std::vector<ChatRoomData> &  getRoomData      () const;
+
+private:
+	ChatRoomList & operator = (const ChatRoomList & rhs);
+	ChatRoomList(const ChatRoomList & source);
+
+	Archive::AutoArray<ChatRoomData>  roomData;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::vector<ChatRoomData> & ChatRoomList::getRoomData() const
+{
+	return roomData.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatRoomList_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomMessage.cpp
new file mode 100644
index 00000000..ad5b90c4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomMessage.cpp
@@ -0,0 +1,47 @@
+// ChatRoomMessage.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatRoomMessage.h"
+
+//-----------------------------------------------------------------------
+
+ChatRoomMessage::ChatRoomMessage(const unsigned int r, const ChatAvatarId & f, const Unicode::String & m, const Unicode::String & o) :
+GameNetworkMessage("ChatRoomMessage"),
+fromName(f),
+fromRoom(r),
+message(m),
+outOfBand(o)
+{
+	addVariable(fromName);
+	addVariable(fromRoom);
+	addVariable(message);
+	addVariable(outOfBand);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRoomMessage::ChatRoomMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatRoomMessage"),
+fromName(),
+message(),
+outOfBand()
+{
+	addVariable(fromName);
+	addVariable(fromRoom);
+	addVariable(message);
+	addVariable(outOfBand);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatRoomMessage::~ChatRoomMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomMessage.h
new file mode 100644
index 00000000..0809c286
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatRoomMessage.h
@@ -0,0 +1,68 @@
+// ChatRoomMessage.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatRoomMessage_H
+#define	_INCLUDED_ChatRoomMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatRoomMessage : public GameNetworkMessage
+{
+public:
+	ChatRoomMessage(const unsigned int fromRoom, const ChatAvatarId & fromName, const Unicode::String & message, const Unicode::String & outOfBand);
+	explicit ChatRoomMessage(Archive::ReadIterator & source);
+	~ChatRoomMessage();
+
+	const ChatAvatarId &     getFromName   () const;
+	const unsigned int       getFromRoom   () const;
+	const Unicode::String &  getMessage    () const;
+	const Unicode::String &  getOutOfBand  () const;
+
+private:
+	ChatRoomMessage & operator = (const ChatRoomMessage & rhs);
+	ChatRoomMessage(const ChatRoomMessage & source);
+
+	Archive::AutoVariable<ChatAvatarId>     fromName;
+	Archive::AutoVariable<unsigned int>     fromRoom;
+	Archive::AutoVariable<Unicode::String>  message;
+	Archive::AutoVariable<Unicode::String>  outOfBand;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatRoomMessage::getFromName() const
+{
+	return fromName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatRoomMessage::getFromRoom() const
+{
+	return fromRoom.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatRoomMessage::getMessage() const
+{
+	return message.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatRoomMessage::getOutOfBand() const
+{
+	return outOfBand.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatRoomMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatSendToRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatSendToRoom.cpp
new file mode 100644
index 00000000..43496dac
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatSendToRoom.cpp
@@ -0,0 +1,46 @@
+// ChatSendToRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "ChatSendToRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatSendToRoom::ChatSendToRoom(const unsigned int s, const unsigned int r, const Unicode::String & m, const Unicode::String & o) :
+GameNetworkMessage("ChatSendToRoom"),
+message(m),
+outOfBand(o),
+roomId(r),
+sequence(s)
+{
+	addVariable(message);
+	addVariable(outOfBand);
+	addVariable(roomId);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatSendToRoom::ChatSendToRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatSendToRoom"),
+message(),
+outOfBand(),
+roomId()
+{
+	addVariable(message);
+	addVariable(outOfBand);
+	addVariable(roomId);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatSendToRoom::~ChatSendToRoom()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatSendToRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatSendToRoom.h
new file mode 100644
index 00000000..56729c6f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatSendToRoom.h
@@ -0,0 +1,66 @@
+// ChatSendToRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatSendToRoom_H
+#define	_INCLUDED_ChatSendToRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatSendToRoom : public GameNetworkMessage
+{
+public:
+	ChatSendToRoom(const unsigned int sequence, const unsigned int roomId, const Unicode::String & message, const Unicode::String & outOfBand);
+	ChatSendToRoom(Archive::ReadIterator & source);
+	~ChatSendToRoom();
+
+	const Unicode::String &  getMessage     () const;
+	const Unicode::String &  getOutOfBand   () const;
+	const unsigned int       getRoomId      () const;
+	const unsigned int       getSequence    () const;
+
+private:
+	ChatSendToRoom & operator = (const ChatSendToRoom & rhs);
+	ChatSendToRoom(const ChatSendToRoom & source);
+
+	Archive::AutoVariable<Unicode::String>  message;
+	Archive::AutoVariable<Unicode::String>  outOfBand;
+	Archive::AutoVariable<unsigned int>     roomId;
+	Archive::AutoVariable<unsigned int>     sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatSendToRoom::getMessage() const
+{
+	return message.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatSendToRoom::getOutOfBand() const
+{
+	return outOfBand.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatSendToRoom::getRoomId() const
+{
+	return roomId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatSendToRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatSendToRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatServerStatus.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatServerStatus.cpp
new file mode 100644
index 00000000..942b88d6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatServerStatus.cpp
@@ -0,0 +1,35 @@
+// ChatServerStatus.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatServerStatus.h"
+
+//-----------------------------------------------------------------------
+
+ChatServerStatus::ChatServerStatus(const bool s) :
+GameNetworkMessage("ChatServerStatus"),
+status(s)
+{
+	addVariable(status);
+}
+
+//-----------------------------------------------------------------------
+
+ChatServerStatus::ChatServerStatus(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatServerStatus"),
+status()
+{
+	addVariable(status);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatServerStatus::~ChatServerStatus()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatServerStatus.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatServerStatus.h
new file mode 100644
index 00000000..a0d6a41a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatServerStatus.h
@@ -0,0 +1,39 @@
+// ChatServerStatus.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatServerStatus_H
+#define	_INCLUDED_ChatServerStatus_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ChatServerStatus : public GameNetworkMessage
+{
+public:
+	explicit ChatServerStatus(const bool status);
+	explicit ChatServerStatus(Archive::ReadIterator & source);
+	~ChatServerStatus();
+
+	const bool  getStatus  () const;
+
+private:
+	ChatServerStatus & operator = (const ChatServerStatus & rhs);
+	ChatServerStatus(const ChatServerStatus & source);
+	
+	Archive::AutoVariable<bool>  status;
+};
+
+//-----------------------------------------------------------------------
+
+inline const bool ChatServerStatus::getStatus() const
+{
+	return status.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatServerStatus_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatSystemMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatSystemMessage.cpp
new file mode 100644
index 00000000..ee2fa230
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatSystemMessage.cpp
@@ -0,0 +1,45 @@
+// ChatSystemMessage.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatSystemMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatSystemMessage::ChatSystemMessage(const unsigned char f, const Unicode::String & m, const Unicode::String & o) :
+GameNetworkMessage("ChatSystemMessage"),
+flags(f),
+message(m),
+outOfBand(o)
+{
+	addVariable(flags);
+	addVariable(message);
+	addVariable(outOfBand);
+}
+
+//-----------------------------------------------------------------------
+
+ChatSystemMessage::ChatSystemMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatSystemMessage"),
+flags(),
+message(),
+outOfBand()
+{
+	addVariable(flags);
+	addVariable(message);
+	addVariable(outOfBand);
+	unpack(source);	
+}
+
+//-----------------------------------------------------------------------
+
+ChatSystemMessage::~ChatSystemMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatSystemMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatSystemMessage.h
new file mode 100644
index 00000000..fd39dcbe
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatSystemMessage.h
@@ -0,0 +1,67 @@
+// ChatSystemMessage.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatSystemMessage_H
+#define	_INCLUDED_ChatSystemMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ChatSystemMessage : public GameNetworkMessage
+{
+public:
+	enum Flags
+	{
+		PERSONAL      = 0x00,
+		BROADCAST     = 0x01,
+		F_chatBoxOnly = 0x02,
+		F_quest = 0x04
+	};
+
+	ChatSystemMessage(const unsigned char flags, const Unicode::String & message, const Unicode::String & outOfBand);
+	ChatSystemMessage(Archive::ReadIterator & source);
+	~ChatSystemMessage();
+
+	const unsigned char      getFlags      () const;
+	const Unicode::String &  getMessage    () const;
+	const Unicode::String &  getOutOfBand  () const;
+private:
+	ChatSystemMessage & operator = (const ChatSystemMessage & rhs);
+	ChatSystemMessage(const ChatSystemMessage & source);
+
+	Archive::AutoVariable<unsigned char>    flags;
+	Archive::AutoVariable<Unicode::String>  message;
+	Archive::AutoVariable<Unicode::String>  outOfBand;
+
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned char ChatSystemMessage::getFlags() const
+{
+	return flags.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatSystemMessage::getMessage() const
+{
+	return message.get();
+}
+
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ChatSystemMessage::getOutOfBand() const
+{
+	return outOfBand.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatSystemMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatUnbanAvatarFromRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatUnbanAvatarFromRoom.cpp
new file mode 100644
index 00000000..6e5f09f9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatUnbanAvatarFromRoom.cpp
@@ -0,0 +1,43 @@
+// ChatUnbanAvatarFromRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatUnbanAvatarFromRoom.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+ChatUnbanAvatarFromRoom::ChatUnbanAvatarFromRoom(const unsigned int s, const ChatAvatarId & a, const std::string & r) :
+GameNetworkMessage("ChatUnbanAvatarFromRoom"),
+avatarId(a),
+roomName(r),
+sequence(s)
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatUnbanAvatarFromRoom::ChatUnbanAvatarFromRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatUnbanAvatarFromRoom"),
+avatarId(),
+roomName()
+{
+	addVariable(avatarId);
+	addVariable(roomName);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatUnbanAvatarFromRoom::~ChatUnbanAvatarFromRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatUnbanAvatarFromRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatUnbanAvatarFromRoom.h
new file mode 100644
index 00000000..1679dd31
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatUnbanAvatarFromRoom.h
@@ -0,0 +1,57 @@
+// ChatUnbanAvatarFromRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef	_INCLUDED_ChatUnbanAvatarFromRoom_H
+#define	_INCLUDED_ChatUnbanAvatarFromRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+
+//-----------------------------------------------------------------------
+
+class ChatUnbanAvatarFromRoom : public GameNetworkMessage
+{
+public:
+	ChatUnbanAvatarFromRoom(const unsigned int sequence, const ChatAvatarId & avatarId, const std::string & roomName);
+	ChatUnbanAvatarFromRoom(Archive::ReadIterator & source);
+	~ChatUnbanAvatarFromRoom();
+
+	const ChatAvatarId &  getAvatarId  () const;
+	const std::string &   getRoomName  () const;
+	const unsigned int    getSequence  () const;
+
+private:
+	ChatUnbanAvatarFromRoom & operator = (const ChatUnbanAvatarFromRoom & rhs);
+	ChatUnbanAvatarFromRoom(const ChatUnbanAvatarFromRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  avatarId; //avatar to ban
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatUnbanAvatarFromRoom::getAvatarId() const
+{
+	return avatarId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatUnbanAvatarFromRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatUnbanAvatarFromRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatUnbanAvatarFromRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatUninviteFromRoom.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatUninviteFromRoom.cpp
new file mode 100644
index 00000000..50a26506
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatUninviteFromRoom.cpp
@@ -0,0 +1,45 @@
+// ChatUninviteFromRoom.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ChatAvatarIdArchive.h"
+#include "sharedNetworkMessages/ChatUninviteFromRoom.h"
+
+//-----------------------------------------------------------------------
+
+ChatUninviteFromRoom::ChatUninviteFromRoom(const unsigned int s, const ChatAvatarId & a, const std::string & r) :
+GameNetworkMessage("ChatUninviteFromRoom"),
+avatar(a),
+roomName(r),
+sequence(s)
+{
+	addVariable(avatar);
+	addVariable(roomName);
+	addVariable(sequence);
+}
+
+//-----------------------------------------------------------------------
+
+ChatUninviteFromRoom::ChatUninviteFromRoom(Archive::ReadIterator & source) :
+GameNetworkMessage("ChatUninviteFromRoom"),
+avatar(),
+roomName(),
+sequence()
+{
+	addVariable(avatar);
+	addVariable(roomName);
+	addVariable(sequence);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ChatUninviteFromRoom::~ChatUninviteFromRoom()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatUninviteFromRoom.h b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatUninviteFromRoom.h
new file mode 100644
index 00000000..4d51bd55
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatUninviteFromRoom.h
@@ -0,0 +1,58 @@
+// ChatUninviteFromRoom.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ChatUninviteFromRoom_H
+#define	_INCLUDED_ChatUninviteFromRoom_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ChatAvatarId.h"
+
+//-----------------------------------------------------------------------
+
+class ChatUninviteFromRoom : public GameNetworkMessage
+{
+public:
+	ChatUninviteFromRoom(const unsigned int sequence, const ChatAvatarId & avatar, const std::string & roomName);
+	explicit ChatUninviteFromRoom(Archive::ReadIterator & source);
+	~ChatUninviteFromRoom();
+
+	const ChatAvatarId &  getAvatar    () const;
+	const std::string &   getRoomName  () const;
+	const unsigned int    getSequence  () const;
+
+private:
+	ChatUninviteFromRoom & operator = (const ChatUninviteFromRoom & rhs);
+	ChatUninviteFromRoom(const ChatUninviteFromRoom & source);
+
+	Archive::AutoVariable<ChatAvatarId>  avatar;
+	Archive::AutoVariable<std::string>   roomName;
+	Archive::AutoVariable<unsigned int>  sequence;
+};
+
+//-----------------------------------------------------------------------
+
+inline const ChatAvatarId & ChatUninviteFromRoom::getAvatar() const
+{
+	return avatar.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ChatUninviteFromRoom::getRoomName() const
+{
+	return roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned int ChatUninviteFromRoom::getSequence() const
+{
+	return sequence.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ChatUninviteFromRoom_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.cpp
new file mode 100644
index 00000000..44801932
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.cpp
@@ -0,0 +1,292 @@
+// ======================================================================
+//
+// AIDebuggingMessages.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/AIDebuggingMessages.h"
+
+//-----------------------------------------------------------------------
+
+const char* const RequestWatchObjectPath::MESSAGE_TYPE  = "RequestWatchObjectPath::MESSAGE_TYPE";
+const char* const RequestWatchPathMap::MESSAGE_TYPE     = "RequestWatchPathMap::MESSAGE_TYPE";
+const char* const RequestUnstick::MESSAGE_TYPE          = "RequestUnstick::MESSAGE_TYPE";
+const char* const AINodeInfo::MESSAGE_TYPE              = "AINodeInfo::MESSAGE_TYPE";
+const char* const AIPathInfo::MESSAGE_TYPE              = "AIPathInfo::MESSAGE_TYPE";
+
+//=======================================================================
+
+RequestWatchObjectPath::RequestWatchObjectPath()
+: GameNetworkMessage (MESSAGE_TYPE),
+  m_objectId(),
+  m_client(),
+	m_enable()
+{
+	addVariable(m_objectId);
+	addVariable(m_client);
+	addVariable(m_enable);
+}
+
+//-----------------------------------------------------------------------
+
+RequestWatchObjectPath::RequestWatchObjectPath(Archive::ReadIterator& source)
+: GameNetworkMessage (MESSAGE_TYPE),
+  m_objectId(),
+  m_client(),
+	m_enable()
+{
+	addVariable(m_objectId);
+	addVariable(m_client);
+	addVariable(m_enable);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RequestWatchObjectPath::~RequestWatchObjectPath()
+{
+}
+
+//=======================================================================
+
+RequestWatchPathMap::RequestWatchPathMap()
+: GameNetworkMessage (MESSAGE_TYPE),
+  m_client(),
+	m_enable()
+{
+	addVariable(m_client);
+	addVariable(m_enable);
+}
+
+//-----------------------------------------------------------------------
+
+RequestWatchPathMap::RequestWatchPathMap(Archive::ReadIterator& source)
+: GameNetworkMessage (MESSAGE_TYPE),
+  m_client(),
+	m_enable()
+{
+	addVariable(m_client);
+	addVariable(m_enable);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RequestWatchPathMap::~RequestWatchPathMap()
+{
+}
+
+//=======================================================================
+
+RequestUnstick::RequestUnstick()
+: GameNetworkMessage (MESSAGE_TYPE),
+  m_client()
+{
+	addVariable(m_client);
+}
+
+//-----------------------------------------------------------------------
+
+RequestUnstick::RequestUnstick(Archive::ReadIterator& source)
+: GameNetworkMessage (MESSAGE_TYPE),
+  m_client()
+{
+	addVariable(m_client);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RequestUnstick::~RequestUnstick()
+{
+}
+
+//=======================================================================
+
+AINodeInfo::AINodeInfo()
+: GameNetworkMessage (MESSAGE_TYPE),
+  m_nodeId(),
+  m_locationX(),
+  m_locationY(),
+  m_locationZ(),
+  m_parent(),
+  m_children(),
+  m_siblings(),
+  m_type(),
+  m_level()
+{
+	addVariable(m_nodeId);
+	addVariable(m_locationX);
+	addVariable(m_locationY);
+	addVariable(m_locationZ);
+	addVariable(m_parent);
+	addVariable(m_children);
+	addVariable(m_siblings);
+	addVariable(m_type);
+	addVariable(m_level);
+}
+
+//-----------------------------------------------------------------------
+
+AINodeInfo::AINodeInfo(Archive::ReadIterator& source)
+: GameNetworkMessage (MESSAGE_TYPE),
+  m_nodeId(),
+  m_locationX(),
+  m_locationY(),
+  m_locationZ(),
+  m_parent(),
+  m_children(),
+  m_siblings(),
+  m_type(),
+  m_level()
+{
+	addVariable(m_nodeId);
+	addVariable(m_locationX);
+	addVariable(m_locationY);
+	addVariable(m_locationZ);
+	addVariable(m_parent);
+	addVariable(m_children);
+	addVariable(m_siblings);
+	addVariable(m_type);
+	addVariable(m_level);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+const std::vector<int>& AINodeInfo::getChildren() const
+{
+	return m_children.get();
+}
+
+//-----------------------------------------------------------------------
+
+void AINodeInfo::setChildren(const std::vector<int>& c)
+{
+	m_children.set(c);
+}
+
+//-----------------------------------------------------------------------
+
+const std::vector<int>&  AINodeInfo::getSiblings() const
+{
+	return m_siblings.get();
+}
+
+//-----------------------------------------------------------------------
+
+void AINodeInfo::setSiblings(const std::vector<int>& s)
+{
+	m_siblings.set(s);
+}
+
+//----------------------------------------------------------------------
+
+AINodeInfo::~AINodeInfo()
+{
+}
+
+//=======================================================================
+
+AIPathInfo::AIPathInfo()
+: GameNetworkMessage (MESSAGE_TYPE),
+  m_objectId(),
+  m_nodes()
+{
+	addVariable(m_objectId);
+	addVariable(m_nodes);
+}
+
+//-----------------------------------------------------------------------
+
+AIPathInfo::AIPathInfo(Archive::ReadIterator& source)
+: GameNetworkMessage (MESSAGE_TYPE),
+  m_objectId(),
+  m_nodes()
+{
+	addVariable(m_objectId);
+	addVariable(m_nodes);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+std::vector<AIPathInfo_NodeInfo> const &AIPathInfo::getNodes() const
+{
+	return m_nodes.get();
+}
+
+//-----------------------------------------------------------------------
+
+void AIPathInfo::setNodes(std::vector<AIPathInfo_NodeInfo> const &n)
+{
+	m_nodes.set(n);
+}
+
+//----------------------------------------------------------------------
+
+AIPathInfo::~AIPathInfo()
+{
+}
+
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void put(ByteStream & target, AIPathInfo_NodeInfo const &n)
+	{
+		put(target, n.node);
+		unsigned char state = static_cast<unsigned char>(n.state);
+		put(target, state);
+	}
+	void get(ReadIterator & source, AIPathInfo_NodeInfo &n)
+	{
+		get(source, n.node);
+		unsigned char state;
+		get(source, state);
+		n.state = static_cast<AIPathInfo_NodeInfo::eState>(state);
+	}
+};
+
+//-----------------------------------------------------------------------
+
+DebugTransformMessage::DebugTransformMessage(const Transform& transform, const NetworkId& cellId) :
+GameNetworkMessage("DebugTransformMessage"),
+m_transform(transform),
+m_cellId(cellId)
+{
+	addVariable(m_transform);
+	addVariable(m_cellId);
+}
+
+//-----------------------------------------------------------------------
+
+DebugTransformMessage::DebugTransformMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("DebugTransformMessage"),
+m_transform(),
+m_cellId(NetworkId::cms_invalid)
+{
+	addVariable(m_transform);
+	addVariable(m_cellId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+DebugTransformMessage::~DebugTransformMessage  ()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void DebugTransformMessage::pack(Archive::ByteStream & target) const
+{
+	AutoByteStream::pack(target);
+}
+
+//=======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.h
new file mode 100644
index 00000000..d4a5deb6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.h
@@ -0,0 +1,417 @@
+// ======================================================================
+//
+// AIDebuggingMessages.h
+// copyright(c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_AIDebuggingMessages_H
+#define INCLUDED_AIDebuggingMessages_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedMath/Vector.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Transform.h"
+#include "sharedMathArchive/TransformArchive.h"
+
+// ======================================================================
+
+/**
+ * This message is sent by the client to request the information about a object's path
+ * This message will result in 1 AIObjectPathInfo message being sent down to the client.
+ * This message will optionally result in 1 AIPathInfo messages being sent down to the client.
+ * This message will optionally result in 1 or multiple AINodeInfo messages being sent down 
+ * to the client (via the PathInfo message).
+ */
+class RequestWatchObjectPath : public GameNetworkMessage
+{
+public:
+	static const char* const MESSAGE_TYPE;
+
+public:
+	RequestWatchObjectPath();
+	explicit   RequestWatchObjectPath(Archive::ReadIterator& source);
+	virtual   ~RequestWatchObjectPath();
+
+	NetworkId  getObjectId() const;
+	void       setObjectId(const NetworkId& pathId);
+	NetworkId  getClientId() const;
+	void       setClientId(const NetworkId &i_client);
+	bool       getEnable() const;
+	void       setEnable(const bool enable);
+
+private:
+	Archive::AutoVariable<NetworkId> m_objectId;
+	Archive::AutoVariable<NetworkId> m_client;
+	Archive::AutoVariable<bool> m_enable;
+
+private:
+	RequestWatchObjectPath(const RequestWatchObjectPath&);
+	RequestWatchObjectPath& operator=(const RequestWatchObjectPath& rhs);
+};
+
+//-----------------------------------------------------------------------
+
+inline NetworkId RequestWatchObjectPath::getObjectId() const
+{
+	return m_objectId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void RequestWatchObjectPath::setObjectId(const NetworkId& objectId)
+{
+	m_objectId.set(objectId);
+}
+
+//-----------------------------------------------------------------------
+
+inline NetworkId RequestWatchObjectPath::getClientId() const
+{
+	return m_client.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void RequestWatchObjectPath::setClientId(const NetworkId& objectId)
+{
+	m_client.set(objectId);
+}
+
+//-----------------------------------------------------------------------
+
+inline bool RequestWatchObjectPath::getEnable() const
+{
+	return m_enable.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void RequestWatchObjectPath::setEnable(const bool enable)
+{
+	m_enable.set(enable);
+}
+
+// ======================================================================
+
+/**
+ * This message is sent by the client to request the information about a object's path
+ * This message will result in 1 AIObjectPathInfo message being sent down to the client.
+ * This message will optionally result in 1 AIPathInfo messages being sent down to the client.
+ * This message will optionally result in 1 or multiple AINodeInfo messages being sent down 
+ * to the client (via the PathInfo message).
+ */
+class RequestWatchPathMap : public GameNetworkMessage
+{
+public:
+	static const char* const MESSAGE_TYPE;
+
+public:
+	RequestWatchPathMap();
+	explicit   RequestWatchPathMap(Archive::ReadIterator& source);
+	virtual   ~RequestWatchPathMap();
+
+	NetworkId  getClientId() const;
+	void       setClientId(const NetworkId &i_client);
+	bool       getEnable() const;
+	void       setEnable(const bool enable);
+
+private:
+	Archive::AutoVariable<NetworkId> m_client;
+	Archive::AutoVariable<bool> m_enable;
+
+private:
+	RequestWatchPathMap(const RequestWatchPathMap&);
+	RequestWatchPathMap& operator=(const RequestWatchPathMap& rhs);
+};
+
+//-----------------------------------------------------------------------
+
+inline NetworkId RequestWatchPathMap::getClientId() const
+{
+	return m_client.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void RequestWatchPathMap::setClientId(const NetworkId& objectId)
+{
+	m_client.set(objectId);
+}
+
+//-----------------------------------------------------------------------
+
+inline bool RequestWatchPathMap::getEnable() const
+{
+	return m_enable.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void RequestWatchPathMap::setEnable(const bool enable)
+{
+	m_enable.set(enable);
+}
+
+// ======================================================================
+
+class RequestUnstick : public GameNetworkMessage
+{
+public:
+	static const char* const MESSAGE_TYPE;
+
+public:
+	RequestUnstick();
+	explicit   RequestUnstick(Archive::ReadIterator& source);
+	virtual   ~RequestUnstick();
+
+	NetworkId  getClientId() const;
+	void       setClientId(const NetworkId &i_client);
+
+private:
+	Archive::AutoVariable<NetworkId> m_client;
+
+private:
+	RequestUnstick(const RequestUnstick&);
+	RequestUnstick& operator=(const RequestUnstick& rhs);
+};
+
+//-----------------------------------------------------------------------
+
+inline NetworkId RequestUnstick::getClientId() const
+{
+	return m_client.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void RequestUnstick::setClientId(const NetworkId& objectId)
+{
+	m_client.set(objectId);
+}
+
+//========================================================================
+/**
+ * This message is sent from the gameserver to the client, and represents the data about a given nodeId.
+ */
+class AINodeInfo : public GameNetworkMessage
+{
+public:
+	static const char* const MESSAGE_TYPE;
+
+public:
+	AINodeInfo();
+	explicit   AINodeInfo(Archive::ReadIterator& source);
+	virtual   ~AINodeInfo();
+
+	int                           getNodeId() const;
+	void                          setNodeId(int nodeId);
+	Vector                        getLocation() const;
+	void                          setLocation(const Vector& v);
+	int                           getParent() const;
+	void                          setParent(int p);
+	const stdvector<int>::fwd&    getChildren() const;
+	void                          setChildren(const stdvector<int>::fwd& c);
+	const stdvector<int>::fwd&    getSiblings() const;
+	void                          setSiblings(const stdvector<int>::fwd& c);
+	int                           getType() const;
+	void                          setType(int t);
+	int                           getLevel() const;
+	void                          setLevel(int l);
+
+
+private:
+	Archive::AutoVariable<int>    m_nodeId;
+	Archive::AutoVariable<float>  m_locationX;
+	Archive::AutoVariable<float>  m_locationY;
+	Archive::AutoVariable<float>  m_locationZ;
+	Archive::AutoVariable<int>    m_parent;
+	Archive::AutoArray<int>       m_children;
+	Archive::AutoArray<int>       m_siblings;
+	Archive::AutoVariable<int>    m_type;
+	Archive::AutoVariable<int>    m_level;
+
+private:
+	AINodeInfo(const AINodeInfo&);
+	AINodeInfo& operator=(const AINodeInfo& rhs);
+};
+
+//-----------------------------------------------------------------------
+
+inline int AINodeInfo::getNodeId() const
+{
+	return m_nodeId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void AINodeInfo::setNodeId(int n)
+{
+	m_nodeId.set(n);
+}
+
+//-----------------------------------------------------------------------
+
+inline Vector AINodeInfo::getLocation() const
+{
+	return Vector(m_locationX.get(), m_locationY.get(), m_locationZ.get());
+}
+
+//-----------------------------------------------------------------------
+
+inline void AINodeInfo::setLocation(const Vector& loc)
+{
+	m_locationX.set(loc.x);
+	m_locationY.set(loc.y);
+	m_locationZ.set(loc.z);
+}
+
+//-----------------------------------------------------------------------
+
+inline int AINodeInfo::getParent() const
+{
+	return m_parent.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void AINodeInfo::setParent(int p)
+{
+	m_parent.set(p);
+}
+
+//-----------------------------------------------------------------------
+
+inline int AINodeInfo::getType() const
+{
+	return m_type.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void AINodeInfo::setType(int t)
+{
+	m_type.set(t);
+}
+
+//-----------------------------------------------------------------------
+
+inline int AINodeInfo::getLevel() const
+{
+	return m_level.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void AINodeInfo::setLevel(int l)
+{
+	m_level.set(l);
+}
+
+// ======================================================================
+
+struct AIPathInfo_NodeInfo
+{
+	int node;
+	enum eState
+	{
+		kReported=1,
+		kCanMove=2,
+		kTarget=4,
+		kPassed=8,
+		kFacingTarget=16,
+		kInCone=32,
+		kFinalTarget=64
+	};
+	eState state;
+	bool operator==(AIPathInfo_NodeInfo const &other) const
+	{
+		return node == other.node && state == other.state;
+	}
+};
+
+/**
+ * This message is sent from the gameserver to the client, and represents the data about a given object's path
+ */
+class AIPathInfo : public GameNetworkMessage
+{
+public:
+	static const char* const MESSAGE_TYPE;
+
+public:
+	AIPathInfo();
+	explicit AIPathInfo(Archive::ReadIterator &source);
+	virtual ~AIPathInfo();
+
+	NetworkId const &getObjectId() const;
+	void setObjectId(NetworkId const & pathId);
+
+	stdvector<AIPathInfo_NodeInfo>::fwd const &getNodes() const;
+	void setNodes(stdvector<AIPathInfo_NodeInfo>::fwd const &n);
+
+private:
+	Archive::AutoVariable<NetworkId> m_objectId;
+	Archive::AutoArray<AIPathInfo_NodeInfo> m_nodes;
+
+private:
+	AIPathInfo(AIPathInfo const &);
+	AIPathInfo &operator=(AIPathInfo const &);
+};
+
+//-----------------------------------------------------------------------
+
+inline NetworkId const &AIPathInfo::getObjectId() const
+{
+	return m_objectId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline void AIPathInfo::setObjectId(NetworkId const &objectId)
+{
+	m_objectId.set(objectId);
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	void put(ByteStream & target, AIPathInfo_NodeInfo const &n);
+	void get(ReadIterator & source, AIPathInfo_NodeInfo &n);
+};
+
+// ======================================================================
+
+class DebugTransformMessage : public GameNetworkMessage
+{
+public: //ctor/dtor
+	DebugTransformMessage   (const Transform& transform, const NetworkId& cellId);
+	explicit DebugTransformMessage   (Archive::ReadIterator & source);
+	~DebugTransformMessage  ();
+
+public: // methods
+	const Transform &            getTransform       () const;
+	const NetworkId &            getCellId          () const;
+
+	void                         pack               (Archive::ByteStream & target) const;
+
+private: 
+	Archive::AutoVariable<Transform>           m_transform;
+	Archive::AutoVariable<NetworkId>            m_cellId;
+};
+
+//-----------------------------------------------------------------------
+inline const Transform & DebugTransformMessage::getTransform() const
+{
+	return m_transform.get();
+}
+//-----------------------------------------------------------------------
+inline const NetworkId & DebugTransformMessage::getCellId() const
+{
+	return m_cellId.get();
+}
+//-----------------------------------------------------------------------
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionMessage.cpp
new file mode 100644
index 00000000..58658ced
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionMessage.cpp
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// AcceptAuctionMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/AcceptAuctionMessage.h"
+
+// ======================================================================
+
+AcceptAuctionMessage::AcceptAuctionMessage(NetworkId itemId) :
+	GameNetworkMessage("AcceptAuctionMessage"),
+	m_itemId(itemId)
+{
+	AutoByteStream::addVariable(m_itemId);
+}
+
+// ======================================================================
+
+AcceptAuctionMessage::AcceptAuctionMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("AcceptAuctionMessage"),
+	m_itemId()
+{
+	AutoByteStream::addVariable(m_itemId);
+	unpack(source);
+}
+
+// ======================================================================
+
+AcceptAuctionMessage::~AcceptAuctionMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionMessage.h
new file mode 100644
index 00000000..624381d3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionMessage.h
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// AcceptAuctionMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AcceptAuctionMessage_H
+#define	_AcceptAuctionMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class AcceptAuctionMessage : public GameNetworkMessage
+{
+public:
+
+	AcceptAuctionMessage(NetworkId itemId);
+	explicit AcceptAuctionMessage(Archive::ReadIterator &source);
+
+	~AcceptAuctionMessage();
+
+public: // methods
+
+	NetworkId                        getItemId() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId> m_itemId;        //the item to be auctioned
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId AcceptAuctionMessage::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _AcceptAuctionMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionResponseMessage.cpp
new file mode 100644
index 00000000..f562d510
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionResponseMessage.cpp
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// AcceptAuctionResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/AcceptAuctionResponseMessage.h"
+
+// ======================================================================
+
+const char * const AcceptAuctionResponseMessage::MessageType = "AcceptAuctionResponseMessage";
+
+//----------------------------------------------------------------------
+
+AcceptAuctionResponseMessage::AcceptAuctionResponseMessage(NetworkId itemId, AuctionResult result) :
+	GameNetworkMessage(MessageType),
+	m_itemId(itemId),
+	m_result(result)
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_result);
+}
+
+// ======================================================================
+
+AcceptAuctionResponseMessage::AcceptAuctionResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage(MessageType),
+	m_itemId(),
+	m_result()
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_result);
+	unpack(source);
+}
+
+// ======================================================================
+
+AcceptAuctionResponseMessage::~AcceptAuctionResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionResponseMessage.h
new file mode 100644
index 00000000..525af5c2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AcceptAuctionResponseMessage.h
@@ -0,0 +1,63 @@
+// ======================================================================
+//
+// AcceptAuctionResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AcceptAuctionResponseMessage_H
+#define	_AcceptAuctionResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/AuctionErrorCodes.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class AcceptAuctionResponseMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	AcceptAuctionResponseMessage(NetworkId itemId, AuctionResult result);
+	explicit AcceptAuctionResponseMessage(Archive::ReadIterator &source);
+
+	~AcceptAuctionResponseMessage();
+
+public: // methods
+
+	NetworkId                        getItemId() const;
+	AuctionResult                    getResult() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId> m_itemId;        //the item to be auctioned
+	Archive::AutoVariable<int>       m_result;        //the auction container
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId AcceptAuctionResponseMessage::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline AuctionResult AcceptAuctionResponseMessage::getResult() const
+{
+	return static_cast<AuctionResult>(m_result.get());
+}
+
+
+// ----------------------------------------------------------------------
+
+#endif // _AcceptAuctionResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationMessage.cpp
new file mode 100644
index 00000000..aee0455a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationMessage.cpp
@@ -0,0 +1,68 @@
+// ======================================================================
+//
+// AddMapLocationMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/AddMapLocationMessage.h"
+
+// ======================================================================
+
+AddMapLocationMessage::AddMapLocationMessage(
+	const std::string &planetName,
+	const NetworkId &locationId, 
+	const Unicode::String &locationName,
+	const Vector2d &location,
+	uint8 category,
+	uint8 subCategory
+) :
+	GameNetworkMessage("AddMapLocationMessage"),
+	m_planetName   (planetName),
+	m_locationId   (locationId),
+	m_locationName (locationName),
+	m_locationX    (location.x),
+	m_locationY    (location.y),
+	m_category     (category),
+	m_subCategory  (subCategory)
+{
+	AutoByteStream::addVariable(m_planetName);
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_locationName);
+	AutoByteStream::addVariable(m_locationX);
+	AutoByteStream::addVariable(m_locationY);
+	AutoByteStream::addVariable(m_category);
+	AutoByteStream::addVariable(m_subCategory);
+}
+
+// ======================================================================
+
+AddMapLocationMessage::AddMapLocationMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage ("AddMapLocationMessage"),
+	m_planetName       (),
+	m_locationId       (),
+	m_locationName     (),
+	m_locationX        (0.0f),
+	m_locationY        (0.0f),
+	m_category         (),
+	m_subCategory      ()
+{
+	AutoByteStream::addVariable(m_planetName);
+	AutoByteStream::addVariable(m_locationId);
+	AutoByteStream::addVariable(m_locationName);
+	AutoByteStream::addVariable(m_locationX);
+	AutoByteStream::addVariable(m_locationY);
+	AutoByteStream::addVariable(m_category);
+	AutoByteStream::addVariable(m_subCategory);
+	unpack(source);
+}
+
+// ======================================================================
+
+AddMapLocationMessage::~AddMapLocationMessage()
+{
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationMessage.h
new file mode 100644
index 00000000..daf646ec
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationMessage.h
@@ -0,0 +1,105 @@
+// ======================================================================
+//
+// AddMapLocationMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AddMapLocationMessage_H
+#define	_AddMapLocationMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+#include "sharedMath/Vector2d.h"
+
+//-----------------------------------------------------------------------
+
+class AddMapLocationMessage : public GameNetworkMessage
+{
+public:
+
+	AddMapLocationMessage(const std::string &planetName, const NetworkId &locationId, const Unicode::String &locationName, const Vector2d &location, uint8 category, uint8 subCategory );
+	explicit AddMapLocationMessage(Archive::ReadIterator &source);
+
+	~AddMapLocationMessage();
+
+public: // methods
+
+	const std::string              & getPlanetName   () const;
+	const NetworkId                & getLocationId   () const;
+	const Unicode::String          & getLocationName () const;
+	float                            getLocationX    () const;
+	float                            getLocationY    () const;
+	uint8                            getCategory     () const;
+	uint8                            getSubCategory  () const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<std::string>           m_planetName; 
+	Archive::AutoVariable<NetworkId>             m_locationId; 
+	Archive::AutoVariable<Unicode::String>       m_locationName; 
+	Archive::AutoVariable<float>                 m_locationX; 
+	Archive::AutoVariable<float>                 m_locationY; 
+	Archive::AutoVariable<uint8>                 m_category; 
+	Archive::AutoVariable<uint8>                 m_subCategory; 
+};
+
+// ----------------------------------------------------------------------
+
+inline const std::string &AddMapLocationMessage::getPlanetName() const
+{
+	return m_planetName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &AddMapLocationMessage::getLocationId() const
+{
+	return m_locationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float AddMapLocationMessage::getLocationX() const
+{
+	return m_locationX.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline float AddMapLocationMessage::getLocationY() const
+{
+	return m_locationY.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & AddMapLocationMessage::getLocationName() const
+{
+	return m_locationName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint8 AddMapLocationMessage::getCategory() const
+{
+	return m_category.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint8 AddMapLocationMessage::getSubCategory() const
+{
+	return m_subCategory.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _AddMapLocationMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationResponseMessage.cpp
new file mode 100644
index 00000000..ddadf225
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationResponseMessage.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// AddMapLocationResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/AddMapLocationResponseMessage.h"
+
+// ======================================================================
+
+const char * const AddMapLocationResponseMessage::MessageType = "AddMapLocationResponseMessage";
+
+//----------------------------------------------------------------------
+
+AddMapLocationResponseMessage::AddMapLocationResponseMessage(const NetworkId &locationId) :
+	GameNetworkMessage(MessageType),
+	m_locationId(locationId)
+{
+	AutoByteStream::addVariable(m_locationId);
+}
+
+// ======================================================================
+
+AddMapLocationResponseMessage::AddMapLocationResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage(MessageType),
+	m_locationId()
+{
+	AutoByteStream::addVariable(m_locationId);
+	unpack(source);
+}
+
+// ======================================================================
+
+AddMapLocationResponseMessage::~AddMapLocationResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationResponseMessage.h
new file mode 100644
index 00000000..bb7237b2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AddMapLocationResponseMessage.h
@@ -0,0 +1,52 @@
+// ======================================================================
+//
+// AddMapLocationResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AddMapLocationResponseMessage_H
+#define	_AddMapLocationResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class AddMapLocationResponseMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	AddMapLocationResponseMessage(const NetworkId &locationId);
+	explicit AddMapLocationResponseMessage(Archive::ReadIterator &source);
+
+	~AddMapLocationResponseMessage();
+
+public: // methods
+
+	const NetworkId          & getLocationId() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId> m_locationId;
+};
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & AddMapLocationResponseMessage::getLocationId() const
+{
+	return m_locationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _AddMapLocationResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.cpp
new file mode 100644
index 00000000..0ee760bc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.cpp
@@ -0,0 +1,73 @@
+// ======================================================================
+//
+// AttributeListMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/AttributeListMessage.h"
+
+// ======================================================================
+
+const char * const AttributeListMessage::MessageType = "AttributeListMessage";
+
+//----------------------------------------------------------------------
+
+AttributeListMessage::AttributeListMessage(NetworkId const & networkId, AttributeVector const & data, int const revision) :
+GameNetworkMessage(MessageType),
+m_networkId(networkId),
+m_staticItemName(),
+m_data(),
+m_revision(revision)
+{
+	m_data.set(data);
+
+	addVariable(m_networkId);
+	addVariable(m_staticItemName);
+	addVariable(m_data);
+	addVariable(m_revision);
+}
+
+//----------------------------------------------------------------------
+
+AttributeListMessage::AttributeListMessage(std::string const & staticItemName, AttributeVector const & data, int const revision) :
+GameNetworkMessage(MessageType),
+m_networkId(),
+m_staticItemName(staticItemName),
+m_data(),
+m_revision(revision)
+{
+	m_data.set(data);
+
+	addVariable(m_networkId);
+	addVariable(m_staticItemName);
+	addVariable(m_data);
+	addVariable(m_revision);
+}
+
+//----------------------------------------------------------------------
+
+AttributeListMessage::AttributeListMessage(Archive::ReadIterator &source) :
+GameNetworkMessage(MessageType),
+m_networkId(),
+m_staticItemName(),
+m_data(),
+m_revision()
+{
+	addVariable(m_networkId);
+	addVariable(m_staticItemName);
+	addVariable(m_data);
+	addVariable(m_revision);
+
+	unpack(source);
+}
+
+//----------------------------------------------------------------------
+
+AttributeListMessage::~AttributeListMessage()
+{
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.h
new file mode 100644
index 00000000..aad15008
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.h
@@ -0,0 +1,80 @@
+// ======================================================================
+//
+// AttributeListMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AttributeListMessage_H
+#define	_AttributeListMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+class AttributeListMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	typedef std::pair<std::string, Unicode::String> AttributePair;
+	typedef stdvector<AttributePair>::fwd AttributeVector;
+
+	AttributeListMessage(NetworkId const & id, AttributeVector const & data, int const revision);
+	AttributeListMessage(std::string const & staticItemName, AttributeVector const & data, int const revision);
+	explicit AttributeListMessage(Archive::ReadIterator &source);
+
+	~AttributeListMessage();
+
+public:
+
+	AttributeVector const & getData() const;
+	NetworkId const & getNetworkId () const;
+	std::string const & getStaticItemName () const;
+	int getRevision() const;
+
+private:
+	Archive::AutoVariable<NetworkId> m_networkId;
+	Archive::AutoVariable<std::string> m_staticItemName;
+	Archive::AutoArray<AttributePair> m_data;
+	Archive::AutoVariable<int> m_revision;
+};
+
+// ----------------------------------------------------------------------
+
+inline const AttributeListMessage::AttributeVector & AttributeListMessage::getData() const
+{
+	return m_data.get();
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & AttributeListMessage::getNetworkId () const
+{
+	return m_networkId.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline std::string const & AttributeListMessage::getStaticItemName () const
+{
+	return m_staticItemName.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline int AttributeListMessage::getRevision() const
+{
+	return m_revision.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _AttributeListMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionData.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionData.h
new file mode 100644
index 00000000..58021cc6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionData.h
@@ -0,0 +1,179 @@
+// ======================================================================
+//
+// AuctionData.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AuctionData_H
+#define	_AuctionData_H
+
+#include <string>
+#include <Unicode.h>
+#include <vector>
+
+#include "sharedFoundation/NetworkId.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
+#ifndef AUCTION_PREMIUM_AUCTION
+#define AUCTION_PREMIUM_AUCTION (1 << 10)
+#endif
+
+#ifndef AUCTION_ACTIVE
+#define AUCTION_ACTIVE (1 << 11)
+#endif
+
+#ifndef AUCTION_VENDOR_TRANSFER
+#define AUCTION_VENDOR_TRANSFER (1 << 12)
+#endif
+
+#ifndef AUCTION_MAGIC_ITEM
+#define AUCTION_MAGIC_ITEM (1 << 13)
+#endif
+
+#ifndef AUCTION_OFFERED_ITEM
+#define AUCTION_OFFERED_ITEM (1 << 14)
+#endif
+
+//-----------------------------------------------------------------------
+
+namespace Auction 
+{
+	//----------------------------------------------------------------------
+
+	struct PalettizedItemDataHeader
+	{
+		NetworkId                     itemId;
+		uint8                         itemNameKey;
+		int32                         highBid;
+		int32                         timer;
+		int32                         buyNowPrice;
+		uint16                        locationKey;
+		NetworkId                     ownerId;
+		uint16                        ownerNameKey;
+		NetworkId                     highBidderId;
+		uint16                        highBidderNameKey;
+		int32                         maxProxyBid;
+		int32                         myBid;
+		long                          itemType;
+		int                           resourceContainerClassCrc;
+		int32                         flags;
+		int32                         entranceCharge;
+
+		PalettizedItemDataHeader () :
+		itemId         (),
+		itemNameKey    (0),
+		highBid        (0),
+		timer          (0),
+		buyNowPrice    (0),
+		locationKey    (0),
+		ownerId        (),
+		ownerNameKey   (0),
+		highBidderId   (),
+		highBidderNameKey (0),
+		maxProxyBid    (0),
+		myBid          (0),
+		itemType       (0),
+		resourceContainerClassCrc(0),
+		flags          (0),
+		entranceCharge (0)
+		{
+		}
+	};
+
+	struct ItemDataHeader
+	{
+		NetworkId                     itemId;
+		Unicode::String               itemName;
+		int32                         minBid;
+		int32                         highBid;
+		int32                         timer;
+		int32                         buyNowPrice;
+		std::string                   location;
+		NetworkId                     ownerId;
+		std::string                   ownerName;
+		NetworkId                     highBidderId;
+		std::string                   highBidderName;
+		int32                         maxProxyBid;
+		int32                         myBid;
+		long                          itemType;
+		int                           resourceContainerClassCrc;
+		int32                         flags;
+		int32                         entranceCharge;
+
+		ItemDataHeader () :
+		itemId         (),
+		itemName       (),
+		minBid         (0),
+		highBid        (0),
+		timer          (0),
+		buyNowPrice    (0),
+		location       (),
+		ownerId        (),
+		ownerName      (),
+		highBidderId   (),
+		highBidderName (),
+		maxProxyBid    (0),
+		myBid          (0),
+		itemType       (0),
+		resourceContainerClassCrc(0),
+		flags          (0),
+		entranceCharge (0)
+		{
+		}
+
+		bool isPremium   () const;
+		bool isActive    () const;
+		bool isMagicItem () const;
+	};
+	
+	//----------------------------------------------------------------------
+
+	struct ItemDataDetails
+	{
+		NetworkId                                             itemId;
+		Unicode::String                                       userDescription;
+		std::vector<std::pair<std::string, Unicode::String> > propertyList;
+		std::string                                           templateName;
+		std::string                                           appearanceString;
+		
+		ItemDataDetails () :
+			itemId           (),
+			userDescription  (),
+			propertyList     (),
+			templateName     (),
+			appearanceString ()
+		{
+		}
+	};
+
+	//----------------------------------------------------------------------
+
+	inline bool ItemDataHeader::isPremium () const
+	{
+		return (flags & AUCTION_PREMIUM_AUCTION) != 0;
+	}
+
+	//----------------------------------------------------------------------
+
+	inline bool ItemDataHeader::isActive  () const
+	{
+		return (flags & AUCTION_ACTIVE) != 0;
+	}
+
+	//----------------------------------------------------------------------
+
+	inline bool ItemDataHeader::isMagicItem  () const
+	{
+		return (flags & AUCTION_MAGIC_ITEM) != 0;
+	}
+
+	//----------------------------------------------------------------------
+}
+
+//----------------------------------------------------------------------
+
+
+#endif // _AuctionData_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionErrorCodes.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionErrorCodes.h
new file mode 100644
index 00000000..c7e16dca
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionErrorCodes.h
@@ -0,0 +1,52 @@
+// ======================================================================
+//
+// AuctionErrorCodes.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AuctionErrorCodes_H
+#define	_AuctionErrorCodes_H
+
+//-----------------------------------------------------------------------
+
+enum AuctionResult
+{
+	ar_OK,
+	ar_INVALID_AUCTIONER,
+	ar_INVALID_ITEM_ID,
+	ar_INVALID_CONTAINER_ID,
+	ar_INVALID_MINIMUM_BID,
+	ar_INVALID_AUCTION_LENGTH,
+	ar_ITEM_ALREADY_AUCTIONED,
+	ar_ITEM_NOT_IN_CONTAINER,
+	ar_NOT_ITEM_OWNER,
+	ar_NOT_ENOUGH_MONEY,
+	ar_INVALID_BID,
+	ar_BID_REJECTED,
+	ar_INVENTORY_FULL,
+	ar_TOO_MANY_AUCTIONS,
+	ar_BID_TOO_HIGH,
+	ar_AUCTION_ALREADY_COMPLETED,
+	ar_VENDOR_DEACTIVATED,
+	ar_ITEM_NOLONGER_EXISTS,
+	ar_INVALID_ITEM_REIMBURSAL,
+	ar_IN_TRADE,
+	ar_IN_CRATE,
+	ar_NOT_ALLOWED,
+	ar_NOT_EMPTY,
+	ar_BID_OUTBID,
+	ar_TOO_MANY_VENDORS,
+	ar_TOO_MANY_VENDOR_ITEMS,
+	ar_IS_BIOLINKED,
+	ar_ITEM_EQUIPPED,
+	ar_ITEM_RESTRICTED,
+	ar_PRICE_TOO_HIGH
+};
+
+
+// ----------------------------------------------------------------------
+
+#endif // _AuctionErrorCodes_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersMessage.cpp
new file mode 100644
index 00000000..ff7de9f3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersMessage.cpp
@@ -0,0 +1,181 @@
+// ======================================================================
+//
+// AuctionQueryHeadersMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/AuctionQueryHeadersMessage.h"
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, AuctionQueryHeadersMessage::SearchCondition & target)
+	{
+		get(source, target.attributeNameCrc);
+		get(source, target.requiredAttribute);
+
+		int8 temp;
+		get(source, temp);
+		target.comparison = static_cast<AuctionQueryHeadersMessage::SearchConditionComparison>(temp);
+
+		if (target.comparison == AuctionQueryHeadersMessage::SCC_int)
+		{
+			get(source, target.intMin);
+			get(source, target.intMax);
+		}
+		else if (target.comparison == AuctionQueryHeadersMessage::SCC_float)
+		{
+			get(source, target.floatMin);
+			get(source, target.floatMax);
+		}
+		else if ((target.comparison == AuctionQueryHeadersMessage::SCC_string_equal) ||
+		         (target.comparison == AuctionQueryHeadersMessage::SCC_string_not_equal) ||
+		         (target.comparison == AuctionQueryHeadersMessage::SCC_string_contain) ||
+		         (target.comparison == AuctionQueryHeadersMessage::SCC_string_not_contain))
+		{
+			get(source, target.stringValue);
+		}
+		else // error
+		{
+			target.comparison = AuctionQueryHeadersMessage::SCC_int;
+		}
+	}
+
+	void put(ByteStream & target, const AuctionQueryHeadersMessage::SearchCondition & source)
+	{
+		put(target, source.attributeNameCrc);
+		put(target, source.requiredAttribute);
+		put(target, static_cast<int8>(source.comparison));
+
+		if (source.comparison == AuctionQueryHeadersMessage::SCC_int)
+		{
+			put(target, source.intMin);
+			put(target, source.intMax);
+		}
+		else if (source.comparison == AuctionQueryHeadersMessage::SCC_float)
+		{
+			put(target, source.floatMin);
+			put(target, source.floatMax);
+		}
+		else if ((source.comparison == AuctionQueryHeadersMessage::SCC_string_equal) ||
+		         (source.comparison == AuctionQueryHeadersMessage::SCC_string_not_equal) ||
+		         (source.comparison == AuctionQueryHeadersMessage::SCC_string_contain) ||
+		         (source.comparison == AuctionQueryHeadersMessage::SCC_string_not_contain))
+		{
+			put(target, source.stringValue);
+		}
+	}
+}
+
+// ======================================================================
+
+AuctionQueryHeadersMessage::AuctionQueryHeadersMessage(
+	AuctionLocationSearch locationSearchType,
+	const NetworkId & container,
+	int requestId,
+	AuctionSearchType searchType,
+	int itemType,
+	bool itemTypeExactMatch,
+	int itemTemplateId,
+	const Unicode::String & textFilterAll,
+	const Unicode::String & textFilterAny,
+	int priceFilterMin,
+	int priceFilterMax,
+	bool priceFilterIncludesFee,
+	const std::list<SearchCondition> & advancedSearch,
+	AdvancedSearchMatchAllAny advancedSearchMatchAllAny,
+	bool myVendorsOnly,
+	uint16 queryOffset
+):
+	GameNetworkMessage("AuctionQueryHeadersMessage"),
+	m_locationSearchType(static_cast<int>(locationSearchType)),
+	m_requestId(requestId),
+	m_searchType(static_cast<int>(searchType)),
+	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_container(container),
+	m_myVendorsOnly(myVendorsOnly),
+	m_queryOffset(queryOffset)
+{
+	m_advancedSearch.set(advancedSearch);
+
+	AutoByteStream::addVariable(m_locationSearchType);
+	AutoByteStream::addVariable(m_requestId);
+	AutoByteStream::addVariable(m_searchType);
+	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_container);
+	AutoByteStream::addVariable(m_myVendorsOnly);
+	AutoByteStream::addVariable(m_queryOffset);
+}
+
+// ======================================================================
+
+AuctionQueryHeadersMessage::AuctionQueryHeadersMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("AuctionQueryHeadersMessage"),
+	m_locationSearchType(),
+	m_requestId(),
+	m_searchType(),
+	m_itemType(),
+	m_itemTypeExactMatch(),
+	m_itemTemplateId(),
+	m_textFilterAll(),
+	m_textFilterAny(),
+	m_priceFilterMin(),
+	m_priceFilterMax(),
+	m_priceFilterIncludesFee(),
+	m_advancedSearch(),
+	m_advancedSearchMatchAllAny(static_cast<int8>(ASMAA_match_all)),
+	m_container(),
+	m_myVendorsOnly(),
+	m_queryOffset(0)
+{
+	AutoByteStream::addVariable(m_locationSearchType);
+	AutoByteStream::addVariable(m_requestId);
+	AutoByteStream::addVariable(m_searchType);
+	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_container);
+	AutoByteStream::addVariable(m_myVendorsOnly);
+	AutoByteStream::addVariable(m_queryOffset);
+
+	unpack(source);
+
+	// error handling (against hacked client)
+	if ((m_advancedSearchMatchAllAny.get() < 0) || (m_advancedSearchMatchAllAny.get() >= static_cast<int8>(ASMAA_LAST)))
+		m_advancedSearchMatchAllAny.set(static_cast<int8>(ASMAA_match_all));
+}
+
+// ======================================================================
+
+AuctionQueryHeadersMessage::~AuctionQueryHeadersMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersMessage.h
new file mode 100644
index 00000000..830bdaa5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersMessage.h
@@ -0,0 +1,339 @@
+// ======================================================================
+//
+// AuctionQueryHeadersMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AuctionQueryHeadersMessage_H
+#define	_AuctionQueryHeadersMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedFoundation/Tag.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+class AuctionQueryHeadersMessage : public GameNetworkMessage
+{
+public: // types
+	/*  auction query types */
+	enum AuctionSearchType
+	{
+		AST_ByCategory,
+		AST_ByLocation,
+		AST_ByAll,
+		AST_ByPlayerSales,
+		AST_ByPlayerBids,
+		AST_ByPlayerStockroom,
+		AST_ByVendorOffers,
+		AST_ByVendorSelling,
+		AST_ByVendorStockroom,
+		AST_ByPlayerOffersToVendor
+	};
+
+	enum AuctionLocationSearch
+	{
+		ALS_Galaxy,
+		ALS_Planet,
+		ALS_Region,
+		ALS_Market
+	};
+
+	enum SearchConditionComparison
+	{
+		// DO NOT CHANGE THE ORDERING OR THE NUMBERING
+		// ADD NEW ENUM VALUE BEFORE SCC_LAST
+		SCC_int = 0,
+		SCC_float,
+		SCC_string_equal,
+		SCC_string_not_equal,
+		SCC_string_contain,
+		SCC_string_not_contain,
+		SCC_LAST
+	};
+
+	// order of enum value MUST match the order defined in the combo box for dsComboMatchAllAny defined in ui_auction.inc
+	enum AdvancedSearchMatchAllAny
+	{
+		// DO NOT CHANGE THE ORDERING OR THE NUMBERING
+		// ADD NEW ENUM VALUE BEFORE ASMAA_LAST
+		ASMAA_match_all = 0,
+		ASMAA_match_any,
+		ASMAA_not_match_all,
+		ASMAA_not_match_any,
+		ASMAA_LAST
+	};
+
+	class SearchCondition
+	{
+	public:
+		SearchCondition() :
+		  attributeNameCrc(), requiredAttribute(false), comparison(SCC_int), intMin(0), intMax(0), floatMin(0.0f), floatMax(0.0f), stringValue() {};
+
+		SearchCondition(SearchCondition const & rhs) :
+		  attributeNameCrc(rhs.attributeNameCrc), requiredAttribute(rhs.requiredAttribute), comparison(rhs.comparison), intMin(rhs.intMin), intMax(rhs.intMax), floatMin(rhs.floatMin), floatMax(rhs.floatMax), stringValue(rhs.stringValue) {};
+
+		explicit SearchCondition(uint32 const pAttributeNameCrc, bool const pRequiredAttribute, int const pIntMin, int const pIntMax) :
+		  attributeNameCrc(pAttributeNameCrc), requiredAttribute(pRequiredAttribute), comparison(SCC_int), intMin(pIntMin), intMax(pIntMax), floatMin(0.0f), floatMax(0.0f), stringValue() {};
+
+		explicit SearchCondition(uint32 const pAttributeNameCrc, bool const pRequiredAttribute, double const pFloatMin, double const pFloatMax) :
+		  attributeNameCrc(pAttributeNameCrc), requiredAttribute(pRequiredAttribute), comparison(SCC_float), intMin(0), intMax(0), floatMin(pFloatMin), floatMax(pFloatMax), stringValue() {};
+
+		explicit SearchCondition(uint32 const pAttributeNameCrc, bool const pRequiredAttribute, SearchConditionComparison const pComparison, std::string const & pStringValue) :
+		  attributeNameCrc(pAttributeNameCrc), requiredAttribute(pRequiredAttribute), comparison(pComparison), intMin(0), intMax(0), floatMin(0.0f), floatMax(0.0f), stringValue(pStringValue) {};
+
+		SearchCondition &operator =(SearchCondition const & rhs)
+		{
+			if (this != (&rhs))
+			{
+				attributeNameCrc = rhs.attributeNameCrc;
+				requiredAttribute = rhs.requiredAttribute;
+				comparison = rhs.comparison;
+				intMin = rhs.intMin;
+				intMax = rhs.intMax;
+				floatMin = rhs.floatMin;
+				floatMax = rhs.floatMax;
+				stringValue = rhs.stringValue;
+			}
+
+			return *this;
+		}
+
+		bool operator== (SearchCondition const & rhs) const
+		{
+			if (this == &rhs)
+			{
+				return true;
+			}
+
+			if ((attributeNameCrc != rhs.attributeNameCrc) ||
+				(requiredAttribute != rhs.requiredAttribute) ||
+				(comparison != rhs.comparison))
+			{
+				return false;
+			}
+
+			if (comparison == SCC_int)
+			{
+				return ((intMin == rhs.intMin) && (intMax == rhs.intMax));
+			}
+			else if (comparison == SCC_float)
+			{
+				return ((floatMin == rhs.floatMin) && (floatMax == rhs.floatMax));
+			}
+
+			return (stringValue == rhs.stringValue);
+		}
+
+		bool operator!= (SearchCondition const & rhs) const
+		{
+			return !operator==(rhs);
+		}
+
+		uint32 attributeNameCrc;
+		bool requiredAttribute;
+		SearchConditionComparison comparison;
+
+		int intMin;
+		int intMax;
+
+		double floatMin;
+		double floatMax;
+
+		std::string stringValue;
+	};
+
+public:
+
+	AuctionQueryHeadersMessage(
+		AuctionLocationSearch locationSearchType,
+		const NetworkId & container,
+		int requestId,
+		AuctionSearchType searchType,
+		int itemType,
+		bool itemTypeExactMatch,
+		int itemTemplateId,
+		const Unicode::String & textFilterAll,
+		const Unicode::String & textFilterAny,
+		int priceFilterMin,
+		int priceFilterMax,
+		bool priceFilterIncludesFee,
+		const std::list<SearchCondition> & advancedSearch,
+		AdvancedSearchMatchAllAny advancedSearchMatchAllAny,
+		bool myVendorsOnly = false,
+		uint16 queryOffset = 0);
+	explicit AuctionQueryHeadersMessage(Archive::ReadIterator &source);
+
+	~AuctionQueryHeadersMessage();
+
+public: // methods
+
+	int                              getLocationSearchType() const;
+	int                              getRequestId() const;
+	int                              getSearchType() const;
+	int                              getItemType() const;
+	bool                             getItemTypeExactMatch() const;
+	int                              getItemTemplateId() const;
+	const Unicode::String &          getTextFilterAll() const;
+	const Unicode::String &          getTextFilterAny() const;
+	int                              getPriceFilterMin() const;
+	int                              getPriceFilterMax() const;
+	bool                             getPriceFilterIncludesFee() const;
+	const std::list<SearchCondition> & getAdvancedSearch() const;
+	AdvancedSearchMatchAllAny        getAdvancedSearchMatchAllAny() const;
+	const NetworkId &                getContainer() const;
+	bool                             getMyVendorsOnly() const;
+	uint16                           getQueryOffset() const;
+
+private: 
+	Archive::AutoVariable<int>              m_locationSearchType;   //string to search by
+	Archive::AutoVariable<int>              m_requestId;      //sequence number
+	Archive::AutoVariable<int>              m_searchType;     //item category
+	Archive::AutoVariable<int>              m_itemType;       //item category
+	Archive::AutoVariable<bool>             m_itemTypeExactMatch;
+	Archive::AutoVariable<int>              m_itemTemplateId; //if non-zero, specifies the template id of a particular item
+	Archive::AutoVariable<Unicode::String>  m_textFilterAll;  //text filter for name
+	Archive::AutoVariable<Unicode::String>  m_textFilterAny;
+	Archive::AutoVariable<int>              m_priceFilterMin;
+	Archive::AutoVariable<int>              m_priceFilterMax;
+	Archive::AutoVariable<bool>             m_priceFilterIncludesFee;
+	Archive::AutoList<SearchCondition>      m_advancedSearch;
+	Archive::AutoVariable<int8>             m_advancedSearchMatchAllAny;
+	Archive::AutoVariable<NetworkId>        m_container;      
+	Archive::AutoVariable<bool>             m_myVendorsOnly;
+	Archive::AutoVariable<uint16>           m_queryOffset;
+};
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryHeadersMessage::getLocationSearchType() const
+{
+	return m_locationSearchType.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryHeadersMessage::getRequestId() const
+{
+	return m_requestId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryHeadersMessage::getSearchType() const
+{
+	return m_searchType.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryHeadersMessage::getItemType() const
+{
+	return m_itemType.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool AuctionQueryHeadersMessage::getItemTypeExactMatch() const
+{
+	return m_itemTypeExactMatch.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryHeadersMessage::getItemTemplateId() const
+{
+	return m_itemTemplateId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & AuctionQueryHeadersMessage::getTextFilterAll() const
+{
+	return m_textFilterAll.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & AuctionQueryHeadersMessage::getTextFilterAny() const
+{
+	return m_textFilterAny.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryHeadersMessage::getPriceFilterMin() const
+{
+	return m_priceFilterMin.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryHeadersMessage::getPriceFilterMax() const
+{
+	return m_priceFilterMax.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool AuctionQueryHeadersMessage::getPriceFilterIncludesFee() const
+{
+	return m_priceFilterIncludesFee.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::list<AuctionQueryHeadersMessage::SearchCondition> & AuctionQueryHeadersMessage::getAdvancedSearch() const
+{
+	return m_advancedSearch.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline AuctionQueryHeadersMessage::AdvancedSearchMatchAllAny AuctionQueryHeadersMessage::getAdvancedSearchMatchAllAny() const
+{
+	return static_cast<AdvancedSearchMatchAllAny>(m_advancedSearchMatchAllAny.get());
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & AuctionQueryHeadersMessage::getContainer() const
+{
+	return m_container.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool AuctionQueryHeadersMessage::getMyVendorsOnly() const
+{
+	return m_myVendorsOnly.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint16 AuctionQueryHeadersMessage::getQueryOffset() const
+{
+	return m_queryOffset.get();
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+
+	void get(ReadIterator & source, AuctionQueryHeadersMessage::SearchCondition & target);
+	void put(ByteStream & target, const AuctionQueryHeadersMessage::SearchCondition & source);
+}
+
+// ======================================================================
+
+#endif // _AuctionQueryHeadersMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersResponseMessage.cpp
new file mode 100644
index 00000000..8a4c9670
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersResponseMessage.cpp
@@ -0,0 +1,219 @@
+// ======================================================================
+//
+// AuctionQueryHeadersResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/AuctionQueryHeadersResponseMessage.h"
+
+#include "sharedFoundation/NetworkIdArchive.h"
+
+// ======================================================================
+
+const char * const AuctionQueryHeadersResponseMessage::MessageType = "AuctionQueryHeadersResponseMessage";
+
+//----------------------------------------------------------------------
+
+AuctionQueryHeadersResponseMessage::AuctionQueryHeadersResponseMessage(int requestId, int typeFlag, AuctionHeaderVector const &auctionData, uint16 queryOffset, bool hasMorePages) :
+	GameNetworkMessage  (MessageType),
+	m_requestId         (requestId),
+	m_typeFlag          (typeFlag),
+	m_auctionData       (),
+	m_queryOffset       (queryOffset),
+	m_hasMorePages      (hasMorePages)
+{
+	m_auctionData = auctionData;
+	AutoByteStream::addVariable(m_requestId);
+	AutoByteStream::addVariable(m_typeFlag);
+	AutoByteStream::addVariable(m_stringPalette);
+	AutoByteStream::addVariable(m_wideStringPalette);
+	palettizeAuctionData();
+	AutoByteStream::addVariable(m_palettizedAuctionData);
+	AutoByteStream::addVariable(m_queryOffset);
+	AutoByteStream::addVariable(m_hasMorePages);
+}
+
+// ----------------------------------------------------------------------
+
+AuctionQueryHeadersResponseMessage::AuctionQueryHeadersResponseMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage (MessageType),
+	m_requestId        (),
+	m_typeFlag         (),
+	m_auctionData      (),
+	m_queryOffset      (0),
+	m_hasMorePages     (false)
+{
+	AutoByteStream::addVariable(m_requestId);
+	AutoByteStream::addVariable(m_typeFlag);
+	AutoByteStream::addVariable(m_stringPalette);
+	AutoByteStream::addVariable(m_wideStringPalette);
+	AutoByteStream::addVariable(m_palettizedAuctionData);
+	AutoByteStream::addVariable(m_queryOffset);
+	AutoByteStream::addVariable(m_hasMorePages);
+	unpack(source);
+	decodeAuctionData();
+}
+
+// ----------------------------------------------------------------------
+
+AuctionQueryHeadersResponseMessage::~AuctionQueryHeadersResponseMessage()
+{
+}
+
+//----------------------------------------------------------------------
+
+uint16 AuctionQueryHeadersResponseMessage::getPaletteIndex(const std::string &str)
+{
+	std::vector<std::string> &stringPalette = m_stringPalette.get();
+	for (uint16 i = 0; i < stringPalette.size(); ++i)
+	{
+		if (stringPalette[i] == str)
+		{
+			return i;	
+		}
+	}
+
+	stringPalette.push_back(str);
+	return static_cast<uint16>(stringPalette.size() - 1);
+}
+
+//----------------------------------------------------------------------
+
+uint16 AuctionQueryHeadersResponseMessage::getPaletteIndex(const Unicode::String &str)
+{
+	std::vector<Unicode::String> & stringPalette = m_wideStringPalette.get();
+	for (uint16 i = 0; i < stringPalette.size(); ++i)
+	{
+		if (stringPalette[i] == str)
+		{
+			return i;	
+		}
+	}
+
+	stringPalette.push_back(str);
+	return static_cast<uint16>(stringPalette.size() - 1);
+}
+
+//----------------------------------------------------------------------
+
+void AuctionQueryHeadersResponseMessage::palettizeAuctionData()
+{
+	PalettizedAuctionHeaderVector palettizedData;
+	palettizedData.resize (m_auctionData.size ());
+
+	AuctionHeaderVector::const_iterator i;
+	int index = 0;
+	for (i = m_auctionData.begin(); i != m_auctionData.end(); ++i, ++index)
+	{
+		const Auction::ItemDataHeader & header = *i;
+		Auction::PalettizedItemDataHeader & pal = palettizedData [index];
+
+		pal.itemId                = header.itemId;
+		pal.itemNameKey           = static_cast<uint8>(getPaletteIndex(header.itemName));
+		pal.highBid               = header.highBid;
+		pal.timer                 = header.timer;
+		pal.buyNowPrice           = header.buyNowPrice;
+		pal.locationKey           = getPaletteIndex(header.location);
+		pal.ownerId               = header.ownerId;
+		pal.ownerNameKey          = getPaletteIndex(header.ownerName);
+		pal.highBidderId          = header.highBidderId;
+		pal.highBidderNameKey     = getPaletteIndex(header.highBidderName);
+		pal.maxProxyBid           = header.maxProxyBid;
+		pal.myBid                 = header.myBid;
+		pal.itemType              = header.itemType;
+		pal.resourceContainerClassCrc = header.resourceContainerClassCrc;
+		pal.flags                 = header.flags;
+		pal.entranceCharge        = header.entranceCharge;
+	}
+
+	m_palettizedAuctionData.set(palettizedData);
+}
+
+//----------------------------------------------------------------------
+
+void AuctionQueryHeadersResponseMessage::decodeAuctionData()
+{
+	const std::vector<std::string> & stringPalette          = m_stringPalette.get();
+	const std::vector<Unicode::String> & wideStringPalette  = m_wideStringPalette.get();
+	const PalettizedAuctionHeaderVector & palettizedData    = m_palettizedAuctionData.get();
+
+	m_auctionData.resize (palettizedData.size ());
+
+	int index = 0;
+	PalettizedAuctionHeaderVector::const_iterator i;
+	for (i = palettizedData.begin(); i != palettizedData.end(); ++i, ++index)
+	{
+		const Auction::PalettizedItemDataHeader & pal = *i;
+
+		Auction::ItemDataHeader & header = m_auctionData [index];
+
+		header.itemId                = pal.itemId;
+		header.itemName              = wideStringPalette[pal.itemNameKey];
+		header.highBid               = pal.highBid;
+		header.timer                 = pal.timer;
+		header.buyNowPrice           = pal.buyNowPrice;
+		header.location              = stringPalette[pal.locationKey];
+		header.ownerId               = pal.ownerId;
+		header.ownerName             = stringPalette[pal.ownerNameKey];
+		header.highBidderId          = pal.highBidderId;
+		header.highBidderName        = stringPalette[pal.highBidderNameKey];
+		header.maxProxyBid           = pal.maxProxyBid;
+		header.myBid                 = pal.myBid;
+		header.itemType              = pal.itemType;
+		header.resourceContainerClassCrc = pal.resourceContainerClassCrc;
+		header.flags                 = pal.flags;
+		header.entranceCharge        = pal.entranceCharge;
+	}
+}
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+
+	void get(ReadIterator &source, Auction::PalettizedItemDataHeader &target)
+	{
+		get(source, target.itemId);
+		get(source, target.itemNameKey);
+		get(source, target.highBid);
+		get(source, target.timer);
+		get(source, target.buyNowPrice);
+		get(source, target.locationKey);
+		get(source, target.ownerId);
+		get(source, target.ownerNameKey);
+		get(source, target.highBidderId);
+		get(source, target.highBidderNameKey);
+		get(source, target.maxProxyBid);
+		get(source, target.myBid);
+		get(source, target.itemType);
+		get(source, target.resourceContainerClassCrc);
+		get(source, target.flags);
+		get(source, target.entranceCharge);
+	}
+
+	void put(ByteStream &target, Auction::PalettizedItemDataHeader const &source)
+	{
+		put(target, source.itemId);
+		put(target, source.itemNameKey);
+		put(target, source.highBid);
+		put(target, source.timer);
+		put(target, source.buyNowPrice);
+		put(target, source.locationKey);
+		put(target, source.ownerId);
+		put(target, source.ownerNameKey);
+		put(target, source.highBidderId);
+		put(target, source.highBidderNameKey);
+		put(target, source.maxProxyBid);
+		put(target, source.myBid);
+		put(target, source.itemType);
+		put(target, source.resourceContainerClassCrc);
+		put(target, source.flags);
+		put(target, source.entranceCharge);
+	}
+
+}
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersResponseMessage.h
new file mode 100644
index 00000000..21b43a0c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersResponseMessage.h
@@ -0,0 +1,110 @@
+// ======================================================================
+//
+// AuctionQueryHeadersResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AuctionQueryHeadersResponseMessage_H
+#define	_AuctionQueryHeadersResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/AuctionData.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include "Unicode.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+class AuctionQueryHeadersResponseMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	typedef stdvector<Auction::ItemDataHeader>::fwd           AuctionHeaderVector;
+	typedef stdvector<Auction::PalettizedItemDataHeader>::fwd PalettizedAuctionHeaderVector;
+
+	AuctionQueryHeadersResponseMessage(int requestId, int typeFlag, AuctionHeaderVector const &auctionData, uint16 queryOffset, bool hasMorePages);
+	explicit AuctionQueryHeadersResponseMessage(Archive::ReadIterator &source);
+
+	~AuctionQueryHeadersResponseMessage();
+
+public: // methods
+
+	int                         getRequestId    () const;
+	int                         getTypeFlag     () const;
+	AuctionHeaderVector const & getAuctionData  () const;
+	uint16                      getQueryOffset  () const;
+	bool                        getHasMorePages () const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<int>                   m_requestId;
+	Archive::AutoVariable<int>                   m_typeFlag;
+	Archive::AutoArray<std::string>              m_stringPalette;
+	Archive::AutoArray<Unicode::String>          m_wideStringPalette;
+	Archive::AutoArray<Auction::PalettizedItemDataHeader>  m_palettizedAuctionData;
+	std::vector<Auction::ItemDataHeader>         m_auctionData;
+	Archive::AutoVariable<uint16>                m_queryOffset;
+	Archive::AutoVariable<bool>                  m_hasMorePages;
+
+	void                        palettizeAuctionData();
+	void                        decodeAuctionData();
+	uint16                      getPaletteIndex(const std::string &str);
+	uint16                      getPaletteIndex(const Unicode::String &str);
+};
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryHeadersResponseMessage::getRequestId() const
+{
+	return m_requestId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryHeadersResponseMessage::getTypeFlag() const
+{
+	return m_typeFlag.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline AuctionQueryHeadersResponseMessage::AuctionHeaderVector const & AuctionQueryHeadersResponseMessage::getAuctionData() const
+{
+	return m_auctionData;
+}
+
+// ----------------------------------------------------------------------
+
+inline uint16 AuctionQueryHeadersResponseMessage::getQueryOffset() const
+{
+	return m_queryOffset.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool AuctionQueryHeadersResponseMessage::getHasMorePages() const
+{
+	return m_hasMorePages.get();
+}
+
+// ----------------------------------------------------------------------
+
+namespace Archive
+{
+
+	void get(ReadIterator &source, Auction::PalettizedItemDataHeader &target);
+	void put(ByteStream &target, Auction::PalettizedItemDataHeader const &source);
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _AuctionQueryHeadersResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryMessage.cpp
new file mode 100644
index 00000000..1a2cfd9b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryMessage.cpp
@@ -0,0 +1,44 @@
+// ======================================================================
+//
+// AuctionQueryMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/AuctionQueryMessage.h"
+
+// ======================================================================
+
+AuctionQueryMessage::AuctionQueryMessage(NetworkId containerId, int requestId, int itemType):
+	GameNetworkMessage("AuctionQueryMessage"),
+	m_containerId(containerId),
+	m_requestId(requestId),
+	m_itemType(itemType)
+{
+	AutoByteStream::addVariable(m_containerId);
+	AutoByteStream::addVariable(m_requestId);
+	AutoByteStream::addVariable(m_itemType);
+}
+
+// ======================================================================
+
+AuctionQueryMessage::AuctionQueryMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("AuctionQueryMessage"),
+	m_containerId(),
+	m_requestId(),
+	m_itemType()
+{
+	AutoByteStream::addVariable(m_containerId);
+	AutoByteStream::addVariable(m_requestId);
+	AutoByteStream::addVariable(m_itemType);
+
+	unpack(source);
+}
+
+// ======================================================================
+
+AuctionQueryMessage::~AuctionQueryMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryMessage.h
new file mode 100644
index 00000000..93e1a500
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryMessage.h
@@ -0,0 +1,68 @@
+// ======================================================================
+//
+// AuctionQueryMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AuctionQueryMessage_H
+#define	_AuctionQueryMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class AuctionQueryMessage : public GameNetworkMessage
+{
+public:
+
+	AuctionQueryMessage(NetworkId containerId, int requestId, int type);
+	explicit AuctionQueryMessage(Archive::ReadIterator &source);
+
+	~AuctionQueryMessage();
+
+public: // methods
+
+	NetworkId                        getContainerId() const;
+	int                              getRequestId() const;
+	int                              getItemType() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId> m_containerId;   //the container to query
+	Archive::AutoVariable<int>       m_requestId;     //sequence number
+	Archive::AutoVariable<int>       m_itemType;      //item category
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId AuctionQueryMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryMessage::getRequestId() const
+{
+	return m_requestId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryMessage::getItemType() const
+{
+	return m_itemType.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _AuctionQueryMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.cpp
new file mode 100644
index 00000000..82247331
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.cpp
@@ -0,0 +1,47 @@
+// ======================================================================
+//
+// AuctionQueryResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/AuctionQueryResponseMessage.h"
+
+// ======================================================================
+
+AuctionQueryResponseMessage::AuctionQueryResponseMessage(int requestId, int typeFlag, AuctionDataVector const &auctionData) :
+	GameNetworkMessage("AuctionQueryResponseMessage"),
+	m_requestId(requestId),
+	m_typeFlag(typeFlag),
+	m_auctionData()
+{
+	m_auctionData.set(auctionData);
+	AutoByteStream::addVariable(m_requestId);
+	AutoByteStream::addVariable(m_typeFlag);
+	AutoByteStream::addVariable(m_auctionData);
+}
+
+// ----------------------------------------------------------------------
+
+AuctionQueryResponseMessage::AuctionQueryResponseMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("AuctionQueryResponseMessage"),
+	m_requestId(),
+	m_typeFlag(),
+	m_auctionData()
+{
+	AutoByteStream::addVariable(m_requestId);
+	AutoByteStream::addVariable(m_typeFlag);
+	AutoByteStream::addVariable(m_auctionData);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+AuctionQueryResponseMessage::~AuctionQueryResponseMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.h
new file mode 100644
index 00000000..bc251b40
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.h
@@ -0,0 +1,131 @@
+// ======================================================================
+//
+// AuctionQueryResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AuctionQueryResponseMessage_H
+#define	_AuctionQueryResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+struct AuctionQueryResponse_AuctionData
+{
+	int64 auctionId;
+	std::string location;
+	int64 ownerId;
+	int32 minBid;
+	int32 timer;
+	int64 itemId;
+	int32 soldFlag;
+	int64 highBidderId;
+	int32 itemType;
+	int32 resourceContainerClassCrc;
+	int16 itemQuantity;
+	int32 itemTimer;
+	int32 highBid;
+	int32 highBidMaxProxy;
+};
+
+class AuctionQueryResponseMessage : public GameNetworkMessage
+{
+public:
+	typedef AuctionQueryResponse_AuctionData AuctionData;
+	typedef stdvector<AuctionData>::fwd AuctionDataVector;
+
+	AuctionQueryResponseMessage(int requestId, int typeFlag, AuctionDataVector const &auctionData);
+	explicit AuctionQueryResponseMessage(Archive::ReadIterator &source);
+
+	~AuctionQueryResponseMessage();
+
+public: // methods
+
+	int                       getRequestId() const;
+	int                       getTypeFlag() const;
+	AuctionDataVector const & getAuctionData() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<int>       m_requestId;
+	Archive::AutoVariable<int>       m_typeFlag;
+	Archive::AutoArray<AuctionData>  m_auctionData;
+};
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryResponseMessage::getRequestId() const
+{
+	return m_requestId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int AuctionQueryResponseMessage::getTypeFlag() const
+{
+	return m_typeFlag.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline AuctionQueryResponseMessage::AuctionDataVector const & AuctionQueryResponseMessage::getAuctionData() const
+{
+	return m_auctionData.get();
+}
+
+// ----------------------------------------------------------------------
+
+namespace Archive
+{
+
+	inline void get(ReadIterator &source, AuctionQueryResponse_AuctionData &target)
+	{
+		get(source, target.auctionId);
+		get(source, target.location);
+		get(source, target.ownerId);
+		get(source, target.minBid);
+		get(source, target.timer);
+		get(source, target.itemId);
+		get(source, target.soldFlag);
+		get(source, target.highBidderId);
+		get(source, target.itemType);
+		get(source, target.resourceContainerClassCrc);
+		get(source, target.itemQuantity);
+		get(source, target.itemTimer);
+		get(source, target.highBid);
+		get(source, target.highBidMaxProxy);
+	}
+
+	inline void put(ByteStream &target, AuctionQueryResponse_AuctionData const &source)
+	{
+		put(target, source.auctionId);
+		put(target, source.location);
+		put(target, source.ownerId);
+		put(target, source.minBid);
+		put(target, source.timer);
+		put(target, source.itemId);
+		put(target, source.soldFlag);
+		put(target, source.highBidderId);
+		put(target, source.itemType);
+		put(target, source.resourceContainerClassCrc);
+		put(target, source.itemQuantity);
+		put(target, source.itemTimer);
+		put(target, source.highBid);
+		put(target, source.highBidMaxProxy);
+	}
+
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _AuctionQueryResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionMessage.cpp
new file mode 100644
index 00000000..9ba8d92d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionMessage.cpp
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// BidAuctionMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/BidAuctionMessage.h"
+
+// ======================================================================
+
+BidAuctionMessage::BidAuctionMessage(NetworkId itemId, int bid, int maxProxyBid) :
+	GameNetworkMessage("BidAuctionMessage"),
+	m_itemId(itemId),
+	m_bid(bid),
+	m_maxProxyBid(maxProxyBid)
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_bid);
+	AutoByteStream::addVariable(m_maxProxyBid);
+}
+
+// ======================================================================
+
+BidAuctionMessage::BidAuctionMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("BidAuctionMessage"),
+	m_itemId(),
+	m_bid(),
+	m_maxProxyBid()
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_bid);
+	AutoByteStream::addVariable(m_maxProxyBid);
+	unpack(source);
+}
+
+// ======================================================================
+
+BidAuctionMessage::~BidAuctionMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionMessage.h
new file mode 100644
index 00000000..ff1c0d81
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionMessage.h
@@ -0,0 +1,68 @@
+// ======================================================================
+//
+// BidAuctionMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_BidAuctionMessage_H
+#define	_BidAuctionMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class BidAuctionMessage : public GameNetworkMessage
+{
+public:
+
+	BidAuctionMessage(NetworkId itemId, int bid, int maxProxyBid );
+	explicit BidAuctionMessage(Archive::ReadIterator &source);
+
+	~BidAuctionMessage();
+
+public: // methods
+
+	NetworkId                        getItemId() const;
+	int                              getBid() const;
+	int                              getMaxProxyBid() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId> m_itemId;        //the item to be auctioned
+	Archive::AutoVariable<int>       m_bid;           //the player bid
+	Archive::AutoVariable<int>       m_maxProxyBid;   //the maximum proxy bid
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId BidAuctionMessage::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int BidAuctionMessage::getBid() const
+{
+	return m_bid.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int BidAuctionMessage::getMaxProxyBid() const
+{
+	return m_maxProxyBid.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _BidAuctionMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionResponseMessage.cpp
new file mode 100644
index 00000000..c5877a6f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionResponseMessage.cpp
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// BidAuctionResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/BidAuctionResponseMessage.h"
+
+// ======================================================================
+
+const char * const BidAuctionResponseMessage::MessageType = "BidAuctionResponseMessage";
+
+//----------------------------------------------------------------------
+
+BidAuctionResponseMessage::BidAuctionResponseMessage(NetworkId itemId, AuctionResult result) :
+	GameNetworkMessage(MessageType),
+	m_itemId(itemId),
+	m_result(result)
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_result);
+}
+
+// ======================================================================
+
+BidAuctionResponseMessage::BidAuctionResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage(MessageType),
+	m_itemId(),
+	m_result()
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_result);
+	unpack(source);
+}
+
+// ======================================================================
+
+BidAuctionResponseMessage::~BidAuctionResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionResponseMessage.h
new file mode 100644
index 00000000..c406b86e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BidAuctionResponseMessage.h
@@ -0,0 +1,63 @@
+// ======================================================================
+//
+// BidAuctionResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_BidAuctionResponseMessage_H
+#define	_BidAuctionResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/AuctionErrorCodes.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class BidAuctionResponseMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	BidAuctionResponseMessage(NetworkId itemId, AuctionResult result);
+	explicit BidAuctionResponseMessage(Archive::ReadIterator &source);
+
+	~BidAuctionResponseMessage();
+
+public: // methods
+
+	NetworkId                        getItemId() const;
+	AuctionResult                    getResult() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId> m_itemId;        //the item to be auctioned
+	Archive::AutoVariable<int>       m_result;        //the auction container
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId BidAuctionResponseMessage::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline AuctionResult BidAuctionResponseMessage::getResult() const
+{
+	return static_cast<AuctionResult>(m_result.get());
+}
+
+
+// ----------------------------------------------------------------------
+
+#endif // _BidAuctionResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.cpp
new file mode 100644
index 00000000..5398712b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.cpp
@@ -0,0 +1,146 @@
+// BuffBuilderChangeMessage.cpp
+// Copyright 2006, Sony Online Entertainment Inc., all rights reserved. 
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/BuffBuilderChangeMessage.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(BuffBuilderChangeMessage, CM_buffBuilderChange);
+
+//-----------------------------------------------------------------------
+
+BuffBuilderChangeMessage::BuffBuilderChangeMessage() :
+MessageQueue::Data(),
+m_bufferId(),
+m_recipientId(),
+m_startingTime(0),
+m_bufferRequiredCredits(0),
+m_accepted(false),
+m_origin(O_UNKNOWN),
+m_buffComponents()
+{
+}
+
+//-----------------------------------------------------------------------
+
+BuffBuilderChangeMessage & BuffBuilderChangeMessage::operator=(const BuffBuilderChangeMessage & rhs)
+{
+	if (this == &rhs)
+		return *this;
+
+	m_bufferId = rhs.m_bufferId;
+	m_recipientId = rhs.m_recipientId;
+	m_startingTime = rhs.m_startingTime;
+	m_bufferRequiredCredits = rhs.m_bufferRequiredCredits;
+	m_accepted = rhs.m_accepted;
+	m_origin = rhs.m_origin;
+	m_buffComponents = rhs.m_buffComponents;
+
+	return *this;
+}
+
+//-----------------------------------------------------------------------
+
+void BuffBuilderChangeMessage::pack(MessageQueue::Data const * const data, Archive::ByteStream & target)
+{
+	const BuffBuilderChangeMessage* const msg = safe_cast<const BuffBuilderChangeMessage*> (data);
+
+	if (msg)
+	{
+		Archive::put(target, msg->getBufferId());
+		Archive::put(target, msg->getRecipientId());
+		Archive::put(target, msg->getStartingTime());
+		Archive::put(target, msg->getBufferRequiredCredits());
+		Archive::put(target, msg->getAccepted());
+		Archive::put(target, msg->getOrigin());
+
+		std::map<std::string, std::pair<int,int> > const & components = msg->getBuffComponents();
+		int size = components.size();
+		Archive::put(target, size);
+		for(std::map<std::string, std::pair<int,int> >::const_iterator j = components.begin(); j != components.end(); ++j)
+		{
+			Archive::put(target, j->first);
+			Archive::put(target, j->second.first);
+			Archive::put(target, j->second.second);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* BuffBuilderChangeMessage::unpack(Archive::ReadIterator & source)
+{
+	BuffBuilderChangeMessage * msg = new BuffBuilderChangeMessage;
+
+	NetworkId tempId;
+	bool tempBool = false;
+	std::string tempStr;
+	int tempInt = 0;
+	time_t tempTime = 0;
+
+	Archive::get(source, tempId);
+	msg->setBufferId(tempId);
+	Archive::get(source, tempId);
+	msg->setRecipientId(tempId);
+	Archive::get(source, tempTime);
+	msg->setStartingTime(tempTime);
+	Archive::get(source, tempInt);
+	msg->setBufferRequiredCredits(tempInt);
+	Archive::get(source, tempBool);
+	msg->setAccepted(tempBool);
+	Archive::get(source, tempInt);
+	Origin const origin = static_cast<Origin>(tempInt);
+	msg->setOrigin(origin);
+
+	int size = 0;
+	Archive::get(source, size);
+	std::string name;
+	int value = 0;
+	int expertiseModifier = 0;
+	for(int j = 0; j < size; ++j)
+	{
+		Archive::get(source, name);
+		Archive::get(source, value); // count
+		Archive::get(source, expertiseModifier);
+		for(int k = 0; k < value; ++k)
+		{
+			msg->addBuffComponent(name, expertiseModifier); 
+		}
+	}
+
+	return msg;
+}
+
+//-----------------------------------------------------------------------
+
+void BuffBuilderChangeMessage::addBuffComponent(std::string const & name, int expertiseModifier)
+{
+	int value = 1;
+	if(m_buffComponents.find(name) != m_buffComponents.end())
+	{
+		value = m_buffComponents[name].first + 1;
+	}
+
+	m_buffComponents[name].first = value;
+	m_buffComponents[name].second = expertiseModifier;
+}
+
+//-----------------------------------------------------------------------
+
+void BuffBuilderChangeMessage::setBuffComponents(std::map<std::string, std::pair<int,int> > const & buffComponents)
+{
+	m_buffComponents = buffComponents;
+}
+
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.h
new file mode 100644
index 00000000..824febe4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.h
@@ -0,0 +1,161 @@
+// BuffBuilderChangeMessage.h
+// Copyright 2006, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef	_INCLUDED_BuffBuilderChangeMessage_H
+#define	_INCLUDED_BuffBuilderChangeMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+class BuffBuilderChangeMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	enum Origin
+	{
+		O_BUFFER,
+		O_RECIPIENT,
+		O_SERVER,
+		O_UNKNOWN
+	};
+
+public:
+	BuffBuilderChangeMessage();
+	BuffBuilderChangeMessage & operator=(const BuffBuilderChangeMessage & rhs);
+
+	//accessors
+	NetworkId const & getBufferId() const;
+	NetworkId const & getRecipientId() const;
+	time_t getStartingTime() const;
+	int getBufferRequiredCredits() const;
+	bool getAccepted() const;
+	Origin getOrigin() const;
+	std::map<std::string, std::pair<int,int> > const & getBuffComponents () const;
+
+	//mutators
+	void setBufferId(NetworkId const & bufferId);
+	void setRecipientId(NetworkId const & recipientId);
+	void setStartingTime(time_t startingTime);
+	void setBufferRequiredCredits(int credits);
+	void setAccepted(bool accepted);
+	void setOrigin(Origin const & origin);
+	void addBuffComponent(std::string const & name, int expertiseModifier);
+	void setBuffComponents(std::map<std::string, std::pair<int,int> > const & indexChanges);
+
+private:
+	//disabled
+	BuffBuilderChangeMessage(BuffBuilderChangeMessage const & source);
+
+private:
+	NetworkId m_bufferId;
+	NetworkId m_recipientId;
+	time_t m_startingTime;
+	int m_bufferRequiredCredits;
+	bool m_accepted;
+	Origin m_origin;
+	std::map<std::string, std::pair<int,int> > m_buffComponents;
+};
+
+//-----------------------------------------------------------------------
+
+inline NetworkId const & BuffBuilderChangeMessage::getBufferId() const
+{
+	return m_bufferId;
+}
+
+//-----------------------------------------------------------------------
+
+inline NetworkId const & BuffBuilderChangeMessage::getRecipientId() const
+{
+	return m_recipientId;
+}
+
+//-----------------------------------------------------------------------
+
+inline time_t BuffBuilderChangeMessage::getStartingTime() const
+{
+	return m_startingTime;
+}
+
+//-----------------------------------------------------------------------
+
+inline int BuffBuilderChangeMessage::getBufferRequiredCredits() const
+{
+	return m_bufferRequiredCredits;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool BuffBuilderChangeMessage::getAccepted() const
+{
+	return m_accepted;
+}
+
+//-----------------------------------------------------------------------
+
+inline BuffBuilderChangeMessage::Origin BuffBuilderChangeMessage::getOrigin() const
+{
+	return m_origin;
+}
+
+//-----------------------------------------------------------------------
+
+inline void BuffBuilderChangeMessage::setBufferId(NetworkId const & bufferId)
+{
+	m_bufferId = bufferId;
+}
+
+//-----------------------------------------------------------------------
+
+inline void BuffBuilderChangeMessage::setRecipientId(NetworkId const & recipientId)
+{
+	m_recipientId = recipientId;
+}
+
+//-----------------------------------------------------------------------
+
+inline void BuffBuilderChangeMessage::setStartingTime(time_t const startingTime)
+{
+	m_startingTime = startingTime;
+}
+
+//-----------------------------------------------------------------------
+
+inline void BuffBuilderChangeMessage::setBufferRequiredCredits(int const credits)
+{
+	if(credits < 0)
+		m_bufferRequiredCredits = 0;
+	m_bufferRequiredCredits = credits;
+}
+
+//-----------------------------------------------------------------------
+
+inline void BuffBuilderChangeMessage::setAccepted(bool const accepted)
+{
+	m_accepted = accepted;
+}
+
+//-----------------------------------------------------------------------
+
+inline void BuffBuilderChangeMessage::setOrigin(BuffBuilderChangeMessage::Origin const & origin)
+{
+	m_origin = origin;
+}
+
+//-----------------------------------------------------------------------
+
+inline std::map<std::string, std::pair<int,int> > const & BuffBuilderChangeMessage::getBuffComponents() const
+{
+	return m_buffComponents;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_BuffBuilderChangeMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderStartMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderStartMessage.cpp
new file mode 100644
index 00000000..f951cd4a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderStartMessage.cpp
@@ -0,0 +1,55 @@
+// ======================================================================
+//
+// BuffBuilderStartMessage.cpp
+//
+// Copyright 2006 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/BuffBuilderStartMessage.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+// ======================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(BuffBuilderStartMessage, CM_buffBuilderStart);
+
+//----------------------------------------------------------------------
+
+BuffBuilderStartMessage::BuffBuilderStartMessage(NetworkId const & bufferId, NetworkId const & recipientId ) :
+MessageQueue::Data(),
+m_bufferId(bufferId),
+m_recipientId(recipientId)
+{
+}
+
+//----------------------------------------------------------------------
+
+void BuffBuilderStartMessage::pack(const MessageQueue::Data * const data, Archive::ByteStream & target)
+{
+	BuffBuilderStartMessage const * const message = safe_cast<BuffBuilderStartMessage const *> (data);
+	if(message)
+	{
+		Archive::put(target, message->getBufferId());
+		Archive::put(target, message->getRecipientId());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data * BuffBuilderStartMessage::unpack(Archive::ReadIterator & source)
+{
+	NetworkId bufferId;
+	NetworkId recipientId;
+	
+	Archive::get(source, bufferId);
+	Archive::get(source, recipientId);
+	
+	return new BuffBuilderStartMessage(bufferId, recipientId /*, terminalId, currentHoloEmote*/);
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderStartMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderStartMessage.h
new file mode 100644
index 00000000..1fcc3b40
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderStartMessage.h
@@ -0,0 +1,55 @@
+// ======================================================================
+//
+// BuffBuilderStartMessage.h
+//
+// Copyright 2006 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_BuffBuilderStartMessage_H
+#define	_BuffBuilderStartMessage_H
+
+//-----------------------------------------------------------------------
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+//-----------------------------------------------------------------------
+
+class BuffBuilderStartMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	BuffBuilderStartMessage(NetworkId const & bufferId, NetworkId const & recipientId );
+
+public:
+	NetworkId const & getBufferId() const;
+	NetworkId const & getRecipientId() const;
+
+private:
+//disabled
+	BuffBuilderStartMessage(BuffBuilderStartMessage const & source);
+
+private:
+	NetworkId m_bufferId;
+	NetworkId m_recipientId;
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & BuffBuilderStartMessage::getBufferId() const
+{
+	return m_bufferId;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & BuffBuilderStartMessage::getRecipientId() const
+{
+	return m_recipientId;
+}
+
+// ----------------------------------------------------------------------
+
+#endif 
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionMessage.cpp
new file mode 100644
index 00000000..5212f28f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionMessage.cpp
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// CancelLiveAuctionMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CancelLiveAuctionMessage.h"
+
+// ======================================================================
+
+CancelLiveAuctionMessage::CancelLiveAuctionMessage(NetworkId itemId) :
+	GameNetworkMessage("CancelLiveAuctionMessage"),
+	m_itemId(itemId)
+{
+	AutoByteStream::addVariable(m_itemId);
+}
+
+// ======================================================================
+
+CancelLiveAuctionMessage::CancelLiveAuctionMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("CancelLiveAuctionMessage"),
+	m_itemId()
+{
+	AutoByteStream::addVariable(m_itemId);
+	unpack(source);
+}
+
+// ======================================================================
+
+CancelLiveAuctionMessage::~CancelLiveAuctionMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionMessage.h
new file mode 100644
index 00000000..329a00ce
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionMessage.h
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// CancelLiveAuctionMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_CancelLiveAuctionMessage_H
+#define	_CancelLiveAuctionMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class CancelLiveAuctionMessage : public GameNetworkMessage
+{
+public:
+
+	CancelLiveAuctionMessage(NetworkId itemId);
+	explicit CancelLiveAuctionMessage(Archive::ReadIterator &source);
+
+	~CancelLiveAuctionMessage();
+
+public: // methods
+
+	NetworkId                        getItemId() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId> m_itemId;        //the item to be auctioned
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId CancelLiveAuctionMessage::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _CancelLiveAuctionMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionResponseMessage.cpp
new file mode 100644
index 00000000..779f2e75
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionResponseMessage.cpp
@@ -0,0 +1,47 @@
+// ======================================================================
+//
+// CancelLiveAuctionResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CancelLiveAuctionResponseMessage.h"
+
+// ======================================================================
+
+const char * const CancelLiveAuctionResponseMessage::MessageType = "CancelLiveAuctionResponseMessage";
+
+//----------------------------------------------------------------------
+
+CancelLiveAuctionResponseMessage::CancelLiveAuctionResponseMessage(NetworkId itemId, AuctionResult result, bool vendorRefusal) :
+	GameNetworkMessage(MessageType),
+	m_itemId(itemId),
+	m_result(result),
+	m_vendorRefusal(vendorRefusal)
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_vendorRefusal);
+}
+
+// ======================================================================
+
+CancelLiveAuctionResponseMessage::CancelLiveAuctionResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage(MessageType),
+	m_itemId(),
+	m_result(),
+	m_vendorRefusal()
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_vendorRefusal);
+	unpack(source);
+}
+
+// ======================================================================
+
+CancelLiveAuctionResponseMessage::~CancelLiveAuctionResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionResponseMessage.h
new file mode 100644
index 00000000..6e711ba3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CancelLiveAuctionResponseMessage.h
@@ -0,0 +1,72 @@
+// ======================================================================
+//
+// CancelLiveAuctionResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_CancelLiveAuctionResponseMessage_H
+#define	_CancelLiveAuctionResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/AuctionErrorCodes.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class CancelLiveAuctionResponseMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	CancelLiveAuctionResponseMessage(NetworkId itemId, AuctionResult result, bool vendorRefusal = false);
+	explicit CancelLiveAuctionResponseMessage(Archive::ReadIterator &source);
+
+	~CancelLiveAuctionResponseMessage();
+
+public: // methods
+
+	NetworkId                        getItemId() const;
+	AuctionResult                    getResult() const;
+	bool                             isVendorRefusal() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId> m_itemId;        //the item to be auctioned
+	Archive::AutoVariable<int>       m_result;        //the auction container
+	Archive::AutoVariable<bool>      m_vendorRefusal; 
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId CancelLiveAuctionResponseMessage::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline AuctionResult CancelLiveAuctionResponseMessage::getResult() const
+{
+	return static_cast<AuctionResult>(m_result.get());
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CancelLiveAuctionResponseMessage::isVendorRefusal() const
+{
+	return m_vendorRefusal.get();
+}
+
+
+// ----------------------------------------------------------------------
+
+#endif // _CancelLiveAuctionResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CharacterSheetResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CharacterSheetResponseMessage.cpp
new file mode 100644
index 00000000..59576c7e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CharacterSheetResponseMessage.cpp
@@ -0,0 +1,142 @@
+// ======================================================================
+//
+// CharacterSheetResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CharacterSheetResponseMessage.h"
+
+// ======================================================================
+
+const char* const CharacterSheetResponseMessage::cms_name = "CharacterSheetResponseMessage";
+
+// ======================================================================
+
+CharacterSheetResponseMessage::CharacterSheetResponseMessage(int bornDate, int played, const Vector& bindLoc, 
+                                                             const std::string& bindPlanet, const Vector& bankLoc, 
+                                                             const std::string& bankPlanet, const Vector& residenceLoc, 
+                                                             const std::string& residencePlanet, const std::string& citizensOf,
+                                                             const Unicode::String& spouseName, int lotsUsed)
+: GameNetworkMessage(cms_name),
+  m_bornDate(bornDate),
+  m_played(played),
+  m_bindLocation(bindLoc),
+  m_bindPlanet(bindPlanet),
+  m_bankLocation(bankLoc),
+  m_bankPlanet(bankPlanet),
+  m_residenceLocation(residenceLoc),
+  m_residencePlanet(residencePlanet),
+  m_citizensOf(citizensOf),
+  m_spouseName(spouseName),
+  m_lotsUsed(lotsUsed)
+{
+	AutoByteStream::addVariable(m_bornDate);
+	AutoByteStream::addVariable(m_played);
+	AutoByteStream::addVariable(m_bindLocation);
+	AutoByteStream::addVariable(m_bindPlanet);
+	AutoByteStream::addVariable(m_bankLocation);
+	AutoByteStream::addVariable(m_bankPlanet);
+	AutoByteStream::addVariable(m_residenceLocation);
+	AutoByteStream::addVariable(m_residencePlanet);
+	AutoByteStream::addVariable(m_citizensOf);
+	AutoByteStream::addVariable(m_spouseName);
+	AutoByteStream::addVariable(m_lotsUsed);
+}
+
+// ======================================================================
+
+CharacterSheetResponseMessage::CharacterSheetResponseMessage(Archive::ReadIterator &source)
+: GameNetworkMessage(cms_name),
+  m_bornDate(0),
+  m_played(0),
+  m_bindLocation(),
+  m_bindPlanet(),
+  m_bankLocation(),
+  m_bankPlanet(),
+  m_residenceLocation(),
+  m_residencePlanet(),
+  m_citizensOf(),
+  m_spouseName(),
+  m_lotsUsed(0)
+{
+	AutoByteStream::addVariable(m_bornDate);
+	AutoByteStream::addVariable(m_played);
+	AutoByteStream::addVariable(m_bindLocation);
+	AutoByteStream::addVariable(m_bindPlanet);
+	AutoByteStream::addVariable(m_bankLocation);
+	AutoByteStream::addVariable(m_bankPlanet);
+	AutoByteStream::addVariable(m_residenceLocation);
+	AutoByteStream::addVariable(m_residencePlanet);
+	AutoByteStream::addVariable(m_citizensOf);
+	AutoByteStream::addVariable(m_spouseName);
+	AutoByteStream::addVariable(m_lotsUsed);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+CharacterSheetResponseMessage::~CharacterSheetResponseMessage()
+{
+}
+
+
+// ----------------------------------------------------------------------
+
+const Vector&          CharacterSheetResponseMessage::getBindLoc         () const
+{
+	return m_bindLocation.get();
+}
+
+// ----------------------------------------------------------------------
+
+const std::string&     CharacterSheetResponseMessage::getBindPlanet      () const
+{
+	return m_bindPlanet.get();
+}
+
+// ----------------------------------------------------------------------
+
+const Vector&          CharacterSheetResponseMessage::getBankLoc         () const
+{
+	return m_bankLocation.get();
+}
+
+// ----------------------------------------------------------------------
+
+const std::string&     CharacterSheetResponseMessage::getResidencePlanet () const
+{
+	return m_residencePlanet.get();
+}
+
+// ----------------------------------------------------------------------
+
+const std::string&     CharacterSheetResponseMessage::getCitizensOf      () const
+{
+	return m_citizensOf.get();
+}
+
+// ----------------------------------------------------------------------
+
+const Vector&          CharacterSheetResponseMessage::getResidenceLoc    () const
+{
+	return m_residenceLocation.get();
+}
+
+// ----------------------------------------------------------------------
+
+const std::string&     CharacterSheetResponseMessage::getBankPlanet      () const
+{
+	return m_bankPlanet.get();
+}
+
+// ----------------------------------------------------------------------
+
+const Unicode::String& CharacterSheetResponseMessage::getSpouseName      () const
+{
+	return m_spouseName.get();
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CharacterSheetResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CharacterSheetResponseMessage.h
new file mode 100644
index 00000000..cfc9e6be
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CharacterSheetResponseMessage.h
@@ -0,0 +1,87 @@
+// ======================================================================
+//
+// CharacterSheetResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_CharacterSheetResponseMessage_H
+#define	_CharacterSheetResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include "sharedMath/Vector.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+//-----------------------------------------------------------------------
+
+class CharacterSheetResponseMessage : public GameNetworkMessage
+{
+public:
+	CharacterSheetResponseMessage (int bornDate, int played, const Vector& bindLoc, 
+	                              const std::string& bindPlanet, const Vector& bankLoc, 
+	                              const std::string& bankPlanet,  const Vector& residenceLoc, 
+	                              const std::string& residencePlanet, const std::string& citizensOf,
+	                              const Unicode::String& spouseName, int lotsUsed);
+	explicit CharacterSheetResponseMessage(Archive::ReadIterator &source);
+	~CharacterSheetResponseMessage();
+
+public: // methods
+	int                    getBornDate           () const;
+	int                    getPlayed             () const;
+	const Vector&          getBindLoc            () const;
+	const std::string&     getBindPlanet         () const;
+	const Vector&          getBankLoc            () const;
+	const std::string&     getBankPlanet         () const;
+	const Vector&          getResidenceLoc       () const;
+	const std::string&     getResidencePlanet    () const;
+	const std::string&     getCitizensOf         () const;
+	const Unicode::String& getSpouseName         () const;
+	int                    getLotsUsed           () const;
+
+public:
+	static const char* const cms_name;
+
+private: 
+	Archive::AutoVariable<int>             m_bornDate;
+	Archive::AutoVariable<int>             m_played;
+	Archive::AutoVariable<Vector>          m_bindLocation;
+	Archive::AutoVariable<std::string>     m_bindPlanet;
+	Archive::AutoVariable<Vector>          m_bankLocation;
+	Archive::AutoVariable<std::string>     m_bankPlanet;
+	Archive::AutoVariable<Vector>          m_residenceLocation;
+	Archive::AutoVariable<std::string>     m_residencePlanet;
+	Archive::AutoVariable<std::string>     m_citizensOf;
+	Archive::AutoVariable<Unicode::String> m_spouseName;
+	Archive::AutoVariable<int>             m_lotsUsed;
+};
+
+// ----------------------------------------------------------------------
+
+inline int                    CharacterSheetResponseMessage::getBornDate        () const
+{
+	return m_bornDate.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int                    CharacterSheetResponseMessage::getPlayed          () const
+{
+	return m_played.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int                    CharacterSheetResponseMessage::getLotsUsed        () const
+{
+	return m_lotsUsed.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _CharacterSheetResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientCentralMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientCentralMessages.cpp
new file mode 100644
index 00000000..23732e08
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientCentralMessages.cpp
@@ -0,0 +1,420 @@
+// ClientCentralMessages.cpp
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "Archive/ByteStream.h"
+#include "sharedFoundation/ConfigFile.h"
+#include "sharedNetworkMessages/ClientCentralMessages.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+//-- todo add SetupSharedNetworkMessages.* and ConfigSharedNetworkMessages.*
+#define ConfigVersion ConfigFile::getKeyString("SharedNetworkMessages", "version", 0)
+
+ClientIdMsg::ClientIdMsg(const unsigned char * const newToken, const uint16 newTokenSize, uint32 gameBitsToClear) :
+GameNetworkMessage("ClientIdMsg"),
+m_gameBitsToClear(gameBitsToClear),
+token(),
+version(ConfigVersion ? ConfigVersion : NetworkVersionId),  //-- todo production build should not allow this
+tokenData(0)
+{
+	WARNING(ConfigVersion, ("Network version override detected: %s", ConfigVersion));
+
+	tokenData = new unsigned char[newTokenSize];
+	memcpy(tokenData, newToken, newTokenSize);
+
+	std::vector<unsigned char> a;
+	for(unsigned int i = 0; i < newTokenSize; ++i)
+	{
+		a.push_back(newToken[i]);
+	}
+	token.set(a);
+	addVariable(m_gameBitsToClear);
+	addVariable(token);
+	addVariable(version);
+}
+
+//-----------------------------------------------------------------------
+
+ClientIdMsg::ClientIdMsg(Archive::ReadIterator & source) :
+GameNetworkMessage("ClientIdMsg"),
+m_gameBitsToClear(0),
+token(),
+version(),
+tokenData(0)
+{
+	addVariable(m_gameBitsToClear);
+	addVariable(token);
+	addVariable(version);
+	AutoByteStream::unpack(source);
+	unsigned int tokenSize = token.get().size();
+	tokenData = new unsigned char[tokenSize];
+	const std::vector<unsigned char> & a = token.get();
+	for(unsigned int i = 0; i < tokenSize; i ++)
+	{
+		tokenData[i] = a[i];
+	}
+}
+
+//-----------------------------------------------------------------------
+
+ClientIdMsg::~ClientIdMsg()
+{
+	delete[] tokenData;
+}
+
+// ======================================================================
+
+EnumerateCharacterId::EnumerateCharacterId(const std::vector<Chardata> &data) :
+		GameNetworkMessage("EnumerateCharacterId"),
+		m_data()
+{
+	m_data.set(data);
+	addVariable(m_data);
+}
+
+// ----------------------------------------------------------------------
+
+EnumerateCharacterId::EnumerateCharacterId(Archive::ReadIterator & source) :
+		GameNetworkMessage("EnumerateCharacterId"),
+		m_data()
+{				
+	addVariable(m_data);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+EnumerateCharacterId::~EnumerateCharacterId()
+{
+}
+
+// ----------------------------------------------------------------------
+
+EnumerateCharacterId_Chardata::EnumerateCharacterId_Chardata()
+{
+}
+
+// ----------------------------------------------------------------------
+
+EnumerateCharacterId_Chardata::EnumerateCharacterId_Chardata(const Unicode::String &name, int objectTemplateId, const NetworkId &networkId, uint32 clusterId, CharacterType characterType) :
+		m_name(name),
+		m_objectTemplateId(objectTemplateId),
+		m_networkId(networkId),
+		m_clusterId(clusterId),
+		m_characterType(characterType)
+{
+}
+
+// ----------------------------------------------------------------------
+
+const std::vector<EnumerateCharacterId::Chardata> &EnumerateCharacterId::getData() const
+{
+	return m_data.get();
+}		
+
+// ======================================================================
+
+SelectCharacter::SelectCharacter(const NetworkId &id) :
+		GameNetworkMessage("SelectCharacter"),
+		m_id(id)
+{											
+	addVariable(m_id);
+}
+
+//-----------------------------------------------------------------------
+
+SelectCharacter::SelectCharacter(Archive::ReadIterator & source) :
+		GameNetworkMessage("SelectCharacter"),
+		m_id()
+{											
+	addVariable(m_id);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+SelectCharacter::~SelectCharacter()
+{
+}
+
+//-----------------------------------------------------------------------
+
+
+ClientCreateCharacter::ClientCreateCharacter(const Unicode::String & characterName, const std::string & templateName, float scaleFactor, const std::string & startingLocation, const std::string& customAppearanceData, 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) :
+GameNetworkMessage      ("ClientCreateCharacter"),
+m_appearanceData        (customAppearanceData),
+m_characterName         (characterName),
+m_templateName          (templateName),
+m_startingLocation      (startingLocation),
+m_hairTemplateName      (hairTemplateName),
+m_hairAppearanceData    (hairAppearanceData),
+m_profession            (profession),
+m_jedi                  (jedi),
+m_scaleFactor           (scaleFactor),
+m_biography             (biography),
+m_useNewbieTutorial     (useNewbieTutorial),
+m_skillTemplate         (skillTemplate),
+m_workingSkill          (workingSkill)
+{
+	addVariable(m_appearanceData);
+	addVariable(m_characterName);
+	addVariable(m_templateName);
+	addVariable(m_startingLocation);
+	addVariable(m_hairTemplateName);
+	addVariable(m_hairAppearanceData);
+	addVariable(m_profession);
+	addVariable(m_jedi);
+	addVariable(m_scaleFactor);
+	addVariable(m_biography);
+	addVariable(m_useNewbieTutorial);
+	addVariable(m_skillTemplate);
+	addVariable(m_workingSkill);
+}
+
+//-----------------------------------------------------------------------
+
+ClientCreateCharacter::ClientCreateCharacter(Archive::ReadIterator & source) :
+GameNetworkMessage      ("ClientCreateCharacter"),
+m_appearanceData        (),
+m_characterName         (),
+m_templateName          (),
+m_startingLocation      (),
+m_hairTemplateName      (),
+m_hairAppearanceData    (),
+m_profession            (),
+m_jedi                  (),
+m_scaleFactor           (1.0f),
+m_biography             (),
+m_useNewbieTutorial     (false),
+m_skillTemplate         (),
+m_workingSkill          ()
+{													
+	addVariable(m_appearanceData);
+	addVariable(m_characterName);
+	addVariable(m_templateName);
+	addVariable(m_startingLocation);
+	addVariable(m_hairTemplateName);
+	addVariable(m_hairAppearanceData);
+	addVariable(m_profession);
+	addVariable(m_jedi);
+	addVariable(m_scaleFactor);
+	addVariable(m_biography);
+	addVariable(m_useNewbieTutorial);
+	addVariable(m_skillTemplate);
+	addVariable(m_workingSkill);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ClientCreateCharacter::~ClientCreateCharacter()
+{
+}
+
+//----------------------------------------------------------------------
+
+const float ClientCreateCharacter::getScaleFactor        () const
+{
+	return m_scaleFactor.get ();
+}
+
+//-----------------------------------------------------------------------
+
+const char * const ClientCreateCharacterSuccess::MessageType = "ClientCreateCharacterSuccess";
+
+//----------------------------------------------------------------------
+
+ClientCreateCharacterSuccess::ClientCreateCharacterSuccess (const NetworkId & networkId) :
+GameNetworkMessage (ClientCreateCharacterSuccess::MessageType),
+m_networkId        (networkId)
+{
+	addVariable(m_networkId);
+}
+
+//-----------------------------------------------------------------------
+
+ClientCreateCharacterSuccess::ClientCreateCharacterSuccess(Archive::ReadIterator & source) :
+GameNetworkMessage (ClientCreateCharacterSuccess::MessageType),
+m_networkId        ()
+{
+	addVariable(m_networkId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ClientCreateCharacterSuccess::~ClientCreateCharacterSuccess()
+{
+}
+
+//-----------------------------------------------------------------------
+
+ClientCreateCharacterFailed::ClientCreateCharacterFailed(const Unicode::String &name, const StringId &errorMessage) :
+GameNetworkMessage("ClientCreateCharacterFailed"),
+m_name(name),
+m_errorMessage(errorMessage)
+{
+	addVariable(m_name);
+	addVariable(m_errorMessage);
+}
+
+//-----------------------------------------------------------------------
+
+ClientCreateCharacterFailed::ClientCreateCharacterFailed(Archive::ReadIterator & source) :
+GameNetworkMessage("ClientCreateCharacterFailed")
+{
+	addVariable(m_name);
+	addVariable(m_errorMessage);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ClientCreateCharacterFailed::~ClientCreateCharacterFailed()
+{
+}
+
+//-----------------------------------------------------------------------
+
+RefreshCharacterList::RefreshCharacterList() :
+GameNetworkMessage("RefreshCharacterList")
+{
+}
+
+//-----------------------------------------------------------------------
+
+RefreshCharacterList::RefreshCharacterList(Archive::ReadIterator & source) :
+GameNetworkMessage("RefreshCharacterList")
+{
+	UNREF(source);
+}
+
+//-----------------------------------------------------------------------
+
+RefreshCharacterList::~RefreshCharacterList()
+{
+}
+
+//-----------------------------------------------------------------------
+
+ClientRandomNameRequest::ClientRandomNameRequest(const std::string & creatureTemplate) :
+GameNetworkMessage("ClientRandomNameRequest"),
+m_creatureTemplate(creatureTemplate)
+{
+	addVariable(m_creatureTemplate);
+}
+
+//-----------------------------------------------------------------------
+
+ClientRandomNameRequest::ClientRandomNameRequest(Archive::ReadIterator & source) :
+GameNetworkMessage("ClientRandomNameRequest"),
+m_creatureTemplate()
+{
+	addVariable(m_creatureTemplate);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ClientRandomNameRequest::~ClientRandomNameRequest()
+{
+}
+
+//-----------------------------------------------------------------------
+
+ClientVerifyAndLockNameRequest::ClientVerifyAndLockNameRequest(const std::string & templateName, const Unicode::String & characterName) :
+GameNetworkMessage("ClientVerifyAndLockNameRequest"),
+m_templateName(templateName),
+m_characterName(characterName)
+{
+	addVariable(m_templateName);
+	addVariable(m_characterName);
+}
+
+//-----------------------------------------------------------------------
+
+ClientVerifyAndLockNameRequest::ClientVerifyAndLockNameRequest(Archive::ReadIterator & source) :
+GameNetworkMessage("ClientVerifyAndLockNameRequest"),
+m_templateName(),
+m_characterName()
+{
+	addVariable(m_templateName);
+	addVariable(m_characterName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ClientVerifyAndLockNameRequest::~ClientVerifyAndLockNameRequest()
+{
+}
+
+//-----------------------------------------------------------------------
+
+ClientRandomNameResponse::ClientRandomNameResponse(const std::string & creatureTemplate, const Unicode::String &name, const StringId &errorMessage) :
+GameNetworkMessage("ClientRandomNameResponse"),
+m_creatureTemplate(creatureTemplate),
+m_name(name),
+m_errorMessage(errorMessage)
+{
+	addVariable(m_creatureTemplate);
+	addVariable(m_name);
+	addVariable(m_errorMessage);
+}
+
+//-----------------------------------------------------------------------
+
+ClientRandomNameResponse::ClientRandomNameResponse(Archive::ReadIterator & source) :
+GameNetworkMessage("ClientRandomNameResponse"),
+m_creatureTemplate(),
+m_name(),
+m_errorMessage()
+{
+	addVariable(m_creatureTemplate);
+	addVariable(m_name);
+	addVariable(m_errorMessage);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ClientRandomNameResponse::~ClientRandomNameResponse()
+{
+}
+
+//-----------------------------------------------------------------------
+
+ClientVerifyAndLockNameResponse::ClientVerifyAndLockNameResponse(const Unicode::String &characterName, const StringId &errorMessage) :
+GameNetworkMessage("ClientVerifyAndLockNameResponse"),
+m_characterName(characterName),
+m_errorMessage(errorMessage)
+{
+	addVariable(m_characterName);
+	addVariable(m_errorMessage);
+}
+
+//-----------------------------------------------------------------------
+
+ClientVerifyAndLockNameResponse::ClientVerifyAndLockNameResponse(Archive::ReadIterator & source) :
+GameNetworkMessage("ClientVerifyAndLockNameResponse"),
+m_characterName(),
+m_errorMessage()
+{
+	addVariable(m_characterName);
+	addVariable(m_errorMessage);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ClientVerifyAndLockNameResponse::~ClientVerifyAndLockNameResponse()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientCentralMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientCentralMessages.h
new file mode 100644
index 00000000..94359452
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientCentralMessages.h
@@ -0,0 +1,495 @@
+// ClientCentralMessages.h
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ClientCentralMessages_H
+#define	_INCLUDED_ClientCentralMessages_H
+
+//-----------------------------------------------------------------------
+
+#include "StringId.h"
+#include "Unicode.h"
+#include "localizationArchive/StringIdArchive.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+class ClientIdMsg : public GameNetworkMessage
+{
+public:
+	ClientIdMsg(const unsigned char * const newToken, const uint16 newTokenSize, uint32 gameBitsToClear);
+	explicit ClientIdMsg(Archive::ReadIterator & source);
+	~ClientIdMsg();
+	const uint32                getGameBitsToClear() const;
+	const unsigned char * const getToken     (void) const;
+	const std::string &         getVersion   () const;
+	const uint16                getTokenSize (void) const;
+
+private:
+	Archive::AutoVariable<uint32>        m_gameBitsToClear;
+	Archive::AutoArray<unsigned char>    token;
+	Archive::AutoVariable<std::string>   version;
+	unsigned char *                      tokenData;
+
+	ClientIdMsg();
+	ClientIdMsg(const ClientIdMsg&);
+	ClientIdMsg& operator= (const ClientIdMsg&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const uint32 ClientIdMsg::getGameBitsToClear() const
+{
+	return m_gameBitsToClear.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned char * const ClientIdMsg::getToken(void) const
+{
+	return tokenData;
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ClientIdMsg::getVersion() const
+{
+	return version.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint16 ClientIdMsg::getTokenSize(void) const
+{
+	const std::vector<unsigned char> & t = token.get();
+	return static_cast<uint16>(t.size());
+}
+
+//-----------------------------------------------------------------------
+
+struct EnumerateCharacterId_Chardata
+{
+	enum CharacterType {CT_normal=1,CT_jedi=2,CT_spectral=3};
+		
+	Unicode::String m_name;
+	int m_objectTemplateId;
+	NetworkId m_networkId;
+	uint32 m_clusterId;
+	int m_characterType;
+
+	EnumerateCharacterId_Chardata();
+	EnumerateCharacterId_Chardata(const Unicode::String &name, int objectTemplateId, const NetworkId &networkId, uint32 clusterId, CharacterType characterType);
+};
+
+//-----------------------------------------------------------------------
+
+class EnumerateCharacterId : public GameNetworkMessage
+{
+  public:
+	typedef EnumerateCharacterId_Chardata Chardata;
+
+  public:
+	explicit EnumerateCharacterId(const std::vector<Chardata> &data);
+	explicit EnumerateCharacterId(Archive::ReadIterator & source);
+	~EnumerateCharacterId();
+	
+	const std::vector<Chardata> &getData() const;
+	void addCharacter(const Unicode::String &name, const std::string &objectTemplate, const NetworkId &networkId);
+	
+  private:
+	Archive::AutoArray<Chardata> m_data;
+
+	EnumerateCharacterId();
+	EnumerateCharacterId(const EnumerateCharacterId&);
+	EnumerateCharacterId& operator= (const EnumerateCharacterId&);
+};
+
+// ----------------------------------------------------------------------
+
+namespace Archive
+{
+	inline void get(ReadIterator & source, EnumerateCharacterId_Chardata &c)
+	{
+		get(source,c.m_name);
+		get(source,c.m_objectTemplateId);
+		get(source,c.m_networkId);
+		get(source,c.m_clusterId);
+		get(source,c.m_characterType);
+	}
+
+	inline void put(ByteStream & target, EnumerateCharacterId_Chardata const &c)
+	{
+		put(target,c.m_name);
+		put(target,c.m_objectTemplateId);
+		put(target,c.m_networkId);
+		put(target,c.m_clusterId);
+		put(target,c.m_characterType);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+class SelectCharacter : public GameNetworkMessage
+{
+public:
+	explicit SelectCharacter(const NetworkId &id);
+	explicit SelectCharacter(Archive::ReadIterator & source);
+	~SelectCharacter();
+
+	const NetworkId & getId (void) const;
+
+private:
+	Archive::AutoVariable<NetworkId> m_id;
+
+	SelectCharacter();
+	SelectCharacter(const SelectCharacter&);
+	SelectCharacter& operator= (const SelectCharacter&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & SelectCharacter::getId(void) const
+{
+	return m_id.get();
+}
+
+//-----------------------------------------------------------------------
+
+class ClientCreateCharacter : public GameNetworkMessage
+{
+public:
+	ClientCreateCharacter(const Unicode::String & characterName, const std::string & templateName, float scaleFactor, const std::string & startingLocation, const std::string& customAppearanceData, 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);
+	explicit ClientCreateCharacter(Archive::ReadIterator & source);
+	~ClientCreateCharacter();
+
+	const float             getScaleFactor        () const;
+	const std::string &     getAppearanceData     () const;
+	const Unicode::String & getCharacterName      () const;
+	const std::string &     getStartingLocation   () const;
+	const std::string &     getTemplateName       () const;
+	const std::string &     getHairTemplateName   () const;
+	const std::string &     getHairAppearanceData () 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;
+
+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<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;
+
+	                       ClientCreateCharacter  ();
+	                       ClientCreateCharacter  (const ClientCreateCharacter&);
+	ClientCreateCharacter& operator=              (const ClientCreateCharacter&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ClientCreateCharacter::getAppearanceData(void) const
+{
+	return m_appearanceData.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & ClientCreateCharacter::getCharacterName(void) const
+{
+	return m_characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ClientCreateCharacter::getStartingLocation(void) const
+{
+	return m_startingLocation.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ClientCreateCharacter::getTemplateName(void) const
+{
+	return m_templateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string &  ClientCreateCharacter::getHairTemplateName(void) const
+{
+	return m_hairTemplateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string &  ClientCreateCharacter::getHairAppearanceData(void) const
+{
+	return m_hairAppearanceData.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string &  ClientCreateCharacter::getProfession(void) const
+{
+	return m_profession.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ClientCreateCharacter::getJedi(void) const
+{
+	return m_jedi.get();
+}
+
+//----------------------------------------------------------------------
+
+inline const Unicode::String & ClientCreateCharacter::getBiography() const
+{
+	return m_biography.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline const bool ClientCreateCharacter::getUseNewbieTutorial() const
+{
+	return m_useNewbieTutorial.get();
+}
+
+//----------------------------------------------------------------------
+
+inline const std::string &  ClientCreateCharacter::getSkillTemplate(void) const
+{
+	return m_skillTemplate.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string &  ClientCreateCharacter::getWorkingSkill(void) const
+{
+	return m_workingSkill.get();
+}
+
+//-----------------------------------------------------------------------
+
+class ClientCreateCharacterSuccess : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	explicit ClientCreateCharacterSuccess (const NetworkId & networkID);
+	explicit ClientCreateCharacterSuccess(Archive::ReadIterator & source);
+	~ClientCreateCharacterSuccess();
+
+	const NetworkId & getNetworkId () const;
+
+private:
+	ClientCreateCharacterSuccess(const ClientCreateCharacterSuccess & source);
+	ClientCreateCharacterSuccess & operator = (const ClientCreateCharacterSuccess & rhs);
+
+	Archive::AutoVariable<NetworkId> m_networkId;
+};
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & ClientCreateCharacterSuccess::getNetworkId () const
+{
+	return m_networkId.get ();
+}
+
+//-----------------------------------------------------------------------
+
+class ClientCreateCharacterFailed : public GameNetworkMessage
+{
+public:
+	ClientCreateCharacterFailed(const Unicode::String &name, const StringId &errorMessage);
+	explicit ClientCreateCharacterFailed(Archive::ReadIterator & source);
+
+	const Unicode::String &getName() const;
+	const StringId &getErrorMessage() const;
+
+	~ClientCreateCharacterFailed();
+private:
+	Archive::AutoVariable<Unicode::String> m_name;
+	Archive::AutoVariable<StringId> m_errorMessage;
+	ClientCreateCharacterFailed(const ClientCreateCharacterFailed & source);
+	ClientCreateCharacterFailed & operator = (const ClientCreateCharacterFailed & rhs);
+};
+
+//--------------------------------------------------------------------
+
+inline const Unicode::String &ClientCreateCharacterFailed::getName() const
+{
+	return m_name.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const StringId &ClientCreateCharacterFailed::getErrorMessage() const
+{
+	return m_errorMessage.get();
+}
+
+//-----------------------------------------------------------------------
+
+class RefreshCharacterList : public GameNetworkMessage
+{
+public:
+	RefreshCharacterList();
+	explicit RefreshCharacterList(Archive::ReadIterator & source);
+	~RefreshCharacterList();
+
+private:
+	RefreshCharacterList(const RefreshCharacterList & source);
+	RefreshCharacterList & operator = (const RefreshCharacterList & rhs);
+};
+
+//-----------------------------------------------------------------------
+
+class ClientRandomNameRequest: public GameNetworkMessage
+{
+public:
+	explicit ClientRandomNameRequest(const std::string &creatureTemplate);
+	explicit ClientRandomNameRequest(Archive::ReadIterator & source);
+	~ClientRandomNameRequest();
+
+	const std::string &getCreatureTemplate() const;
+private:
+	Archive::AutoVariable<std::string> m_creatureTemplate;
+
+	ClientRandomNameRequest(const ClientRandomNameRequest & source);
+	ClientRandomNameRequest & operator = (const ClientRandomNameRequest & other);
+};
+
+//--------------------------------------------------------------------
+
+inline const std::string &ClientRandomNameRequest::getCreatureTemplate() const
+{
+	return m_creatureTemplate.get();
+}
+
+//-----------------------------------------------------------------------
+
+class ClientVerifyAndLockNameRequest: public GameNetworkMessage
+{
+public:
+	explicit ClientVerifyAndLockNameRequest(const std::string& templateName, const Unicode::String& characterName);
+	explicit ClientVerifyAndLockNameRequest(Archive::ReadIterator& source);
+	~ClientVerifyAndLockNameRequest();
+
+	const std::string&                      getTemplateName() const;
+	const Unicode::String&                  getCharacterName() const;
+private:
+	Archive::AutoVariable<std::string>      m_templateName;
+	Archive::AutoVariable<Unicode::String>  m_characterName;
+
+	ClientVerifyAndLockNameRequest(const ClientVerifyAndLockNameRequest& source);
+	ClientVerifyAndLockNameRequest & operator = (const ClientVerifyAndLockNameRequest& other);
+};
+
+//--------------------------------------------------------------------
+
+inline const std::string& ClientVerifyAndLockNameRequest::getTemplateName() const
+{
+	return m_templateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String& ClientVerifyAndLockNameRequest::getCharacterName() const
+{
+	return m_characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+class ClientRandomNameResponse: public GameNetworkMessage
+{
+public:
+	explicit ClientRandomNameResponse(const std::string& creatureTemplate, const Unicode::String& name, const StringId& errorMessage);
+	explicit ClientRandomNameResponse(Archive::ReadIterator& source);
+	~ClientRandomNameResponse();
+
+	const std::string&                      getCreatureTemplate() const;
+	const Unicode::String&                  getName() const;
+	const StringId&                         getErrorMessage() const;
+private:
+	Archive::AutoVariable<std::string>      m_creatureTemplate;
+	Archive::AutoVariable<Unicode::String>  m_name;
+	Archive::AutoVariable<StringId>         m_errorMessage;
+
+	ClientRandomNameResponse(const ClientRandomNameRequest& source);
+	ClientRandomNameResponse & operator = (const ClientRandomNameRequest& other);
+};
+
+//--------------------------------------------------------------------
+
+inline const std::string& ClientRandomNameResponse::getCreatureTemplate() const
+{
+	return m_creatureTemplate.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const Unicode::String& ClientRandomNameResponse::getName() const
+{
+	return m_name.get();
+}
+
+//--------------------------------------------------------------------
+
+inline const StringId& ClientRandomNameResponse::getErrorMessage() const
+{
+	return m_errorMessage.get();
+}
+
+//--------------------------------------------------------------------
+
+class ClientVerifyAndLockNameResponse: public GameNetworkMessage
+{
+public:
+	explicit ClientVerifyAndLockNameResponse(const Unicode::String& characterName, const StringId& errorMessage);
+	explicit ClientVerifyAndLockNameResponse(Archive::ReadIterator& source);
+	~ClientVerifyAndLockNameResponse();
+
+	const Unicode::String&                  getCharacterName() const;
+	const StringId&                         getErrorMessage() const;
+private:
+	Archive::AutoVariable<Unicode::String>  m_characterName;
+	Archive::AutoVariable<StringId>         m_errorMessage;
+
+	ClientVerifyAndLockNameResponse(const ClientVerifyAndLockNameResponse& source);
+	ClientVerifyAndLockNameResponse & operator = (const ClientVerifyAndLockNameResponse& other);
+};
+
+//--------------------------------------------------------------------
+
+inline const Unicode::String& ClientVerifyAndLockNameResponse::getCharacterName() const
+{
+	return m_characterName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const StringId& ClientVerifyAndLockNameResponse::getErrorMessage() const
+{
+	return m_errorMessage.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ClientCentralMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.cpp
new file mode 100644
index 00000000..bddc6432
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.cpp
@@ -0,0 +1,954 @@
+// ======================================================================
+//
+// ClientEffectMessages.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ClientEffectMessages.h"
+
+#include "Archive/AutoByteStream.h"
+#include "Archive/ByteStream.h"
+#include "UnicodeUtils.h"
+#include "sharedFoundation/NetworkId.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+const char * const PlayClientEffectObjectMessage::MESSAGE_TYPE = "PlayClientEffectObjectMessage";
+const char * const PlayClientEffectObjectTransformMessage::MESSAGE_TYPE = "PlayClientEffectObjectTransformMessage";
+const char * const PlayClientEffectLocMessage::MESSAGE_TYPE    = "PlayClientEffectLocMessage";
+const char * const StopClientEffectObjectByLabelMessage::MESSAGE_TYPE     = "StopClientEffectObjectByLabelMessage";
+const char * const PlayClientEventObjectMessage::MESSAGE_TYPE  = "PlayClientEventObjectMessage";
+const char * const PlayClientEventObjectTransformMessage::MESSAGE_TYPE = "PlayClientEventObjectTransformMessage";
+const char * const PlayClientEventLocMessage::MESSAGE_TYPE     = "PlayClientEventLocMessage";
+const char * const CreateClientProjectileMessage::MESSAGE_TYPE = "CreateClientProjectileMessage";
+const char * const CreateClientProjectileObjectToObjectMessage::MESSAGE_TYPE = "CreateClientProjectileObjectToObjectMessage";
+const char * const CreateClientProjectileLocationToObjectMessage::MESSAGE_TYPE = "CreateClientProjectileLocationToObjectMessage";
+const char * const CreateClientProjectileObjectToLocationMessage::MESSAGE_TYPE = "CreateClientProjectileObjectToLocationMessage";
+
+// ======================================================================
+
+PlayClientEffectObjectMessage::PlayClientEffectObjectMessage(const NetworkId& id, const std::string& effectName, const std::string& hardpoint, const std::string& label)
+: GameNetworkMessage(MESSAGE_TYPE),
+  m_effectName(effectName),
+  m_hardpoint(hardpoint),
+  m_objectId(id),
+  m_label(label)
+{
+	addVariable(m_effectName);
+	addVariable(m_hardpoint);
+	addVariable(m_objectId);
+	addVariable(m_label);
+}
+
+//-----------------------------------------------------------------------
+
+PlayClientEffectObjectMessage::PlayClientEffectObjectMessage(Archive::ReadIterator& source)
+: GameNetworkMessage(MESSAGE_TYPE),
+  m_effectName(),
+  m_hardpoint(),
+  m_objectId(),
+  m_label()
+{
+	addVariable (m_effectName);
+	addVariable (m_hardpoint);
+	addVariable (m_objectId);
+	addVariable (m_label);
+	unpack (source);
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId&        PlayClientEffectObjectMessage::getObjectId() const
+{
+	return m_objectId.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string&      PlayClientEffectObjectMessage::getEffectName() const
+{
+	return m_effectName.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string&      PlayClientEffectObjectMessage::getHardpoint() const
+{
+	return m_hardpoint.get();
+}
+
+const std::string&      PlayClientEffectObjectMessage::getLabel() const
+{
+	return m_label.get();
+}
+
+//----------------------------------------------------------------------
+//-- PlayClientEffectObjectTransformMessage
+//----------------------------------------------------------------------
+
+PlayClientEffectObjectTransformMessage::PlayClientEffectObjectTransformMessage(const NetworkId& id,
+																			   const std::string& effectName,
+																			   Transform const & transform,
+																			   const std::string& label) :
+GameNetworkMessage(MESSAGE_TYPE),
+m_effectName(effectName),
+m_transform(transform),
+m_objectId(id),
+m_label(label)
+{
+	addVariable(m_effectName);
+	addVariable(m_transform);
+	addVariable(m_objectId);
+	addVariable(m_label);
+}
+
+//----------------------------------------------------------------------
+
+PlayClientEffectObjectTransformMessage::PlayClientEffectObjectTransformMessage (Archive::ReadIterator& source) :
+GameNetworkMessage(MESSAGE_TYPE),
+m_effectName(),
+m_transform(),
+m_objectId(),
+m_label()
+{
+	addVariable(m_effectName);
+	addVariable(m_transform);
+	addVariable(m_objectId);
+	addVariable(m_label);
+	unpack(source);
+}
+
+//----------------------------------------------------------------------
+
+NetworkId const & PlayClientEffectObjectTransformMessage::getObjectId() const
+{
+	return m_objectId.get();
+}
+
+//----------------------------------------------------------------------
+
+std::string const & PlayClientEffectObjectTransformMessage::getEffectName() const
+{
+	return m_effectName.get();
+}
+
+//----------------------------------------------------------------------
+
+Transform const & PlayClientEffectObjectTransformMessage::getTransform() const
+{
+	return m_transform.get();
+}
+
+//----------------------------------------------------------------------
+
+const std::string & PlayClientEffectObjectTransformMessage::getLabel() const
+{
+	return m_label.get();
+}
+
+// ======================================================================
+
+PlayClientEffectLocMessage::PlayClientEffectLocMessage(const std::string& effectName, const Vector& location, const std::string planet, const NetworkId & cell, float terrainDelta, const std::string& label)
+: GameNetworkMessage(MESSAGE_TYPE),
+  m_effectName(effectName),
+  m_planet(planet),
+  m_locationX(location.x),
+  m_locationY(location.y),
+  m_locationZ(location.z),
+  m_cell(cell),
+  m_terrainDelta(terrainDelta),
+  m_label(label)
+{
+	addVariable(m_effectName);
+	addVariable(m_planet);
+	addVariable(m_locationX);
+	addVariable(m_locationY);
+	addVariable(m_locationZ);
+	addVariable(m_cell);
+	addVariable(m_terrainDelta);
+	addVariable(m_label);
+}
+
+//-----------------------------------------------------------------------
+
+PlayClientEffectLocMessage::PlayClientEffectLocMessage(Archive::ReadIterator& source)
+: GameNetworkMessage(MESSAGE_TYPE),
+  m_effectName(),
+  m_planet(),
+  m_locationX(),
+  m_locationY(),
+  m_locationZ(),
+  m_cell(),
+  m_terrainDelta(),
+  m_label()
+{
+	addVariable (m_effectName);
+	addVariable (m_planet);
+	addVariable (m_locationX);
+	addVariable (m_locationY);
+	addVariable (m_locationZ);
+	addVariable (m_cell);
+	addVariable (m_terrainDelta);
+	addVariable (m_label);
+	unpack (source);
+}
+
+//-----------------------------------------------------------------------
+
+const std::string&      PlayClientEffectLocMessage::getEffectName() const
+{
+	return m_effectName.get();
+}
+
+//-----------------------------------------------------------------------
+
+Vector                  PlayClientEffectLocMessage::getLocation() const
+{
+	return Vector(m_locationX.get(), m_locationY.get(), m_locationZ.get());
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId &      PlayClientEffectLocMessage::getCell() const
+{
+	return m_cell.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string&      PlayClientEffectLocMessage::getPlanet() const
+{
+	return m_planet.get();
+}
+
+//-----------------------------------------------------------------------
+
+float                   PlayClientEffectLocMessage::getTerrainDelta() const
+{
+	return m_terrainDelta.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string&      PlayClientEffectLocMessage::getLabel() const
+{
+	return m_label.get();
+}
+
+// ======================================================================
+
+PlayClientEventObjectMessage::PlayClientEventObjectMessage(const NetworkId& id, const std::string& eventName, const std::string& hardpoint)
+: GameNetworkMessage(MESSAGE_TYPE),
+  m_eventName(eventName),
+  m_hardpoint(hardpoint),
+  m_objectId(id)
+{
+	addVariable(m_eventName);
+	addVariable(m_hardpoint);
+	addVariable(m_objectId);
+}
+
+//-----------------------------------------------------------------------
+
+PlayClientEventObjectMessage::PlayClientEventObjectMessage(Archive::ReadIterator& source)
+: GameNetworkMessage(MESSAGE_TYPE),
+  m_eventName(),
+  m_hardpoint(),
+  m_objectId()
+{
+	addVariable (m_eventName);
+	addVariable (m_hardpoint);
+	addVariable (m_objectId);
+	unpack (source);
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId&        PlayClientEventObjectMessage::getObjectId() const
+{
+	return m_objectId.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string&      PlayClientEventObjectMessage::getEventName() const
+{
+	return m_eventName.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string&      PlayClientEventObjectMessage::getHardpoint() const
+{
+	return m_hardpoint.get();
+}
+
+//----------------------------------------------------------------------
+//-- PlayClientEventObjectTransformMessage
+//----------------------------------------------------------------------
+
+PlayClientEventObjectTransformMessage::PlayClientEventObjectTransformMessage(const NetworkId& id,
+																			   const std::string& eventName,
+																			   Transform const & transform) :
+GameNetworkMessage(MESSAGE_TYPE),
+m_eventName(eventName),
+m_transform(transform),
+m_objectId(id)
+{
+	addVariable(m_eventName);
+	addVariable(m_transform);
+	addVariable(m_objectId);
+}
+
+//----------------------------------------------------------------------
+
+PlayClientEventObjectTransformMessage::PlayClientEventObjectTransformMessage (Archive::ReadIterator& source) :
+GameNetworkMessage(MESSAGE_TYPE),
+m_eventName(),
+m_transform(),
+m_objectId()
+{
+	addVariable(m_eventName);
+	addVariable(m_transform);
+	addVariable(m_objectId);
+	unpack(source);
+}
+
+//----------------------------------------------------------------------
+
+NetworkId const & PlayClientEventObjectTransformMessage::getObjectId() const
+{
+	return m_objectId.get();
+}
+
+//----------------------------------------------------------------------
+
+std::string const & PlayClientEventObjectTransformMessage::getEventName() const
+{
+	return m_eventName.get();
+}
+
+//----------------------------------------------------------------------
+
+Transform const & PlayClientEventObjectTransformMessage::getTransform() const
+{
+	return m_transform.get();
+}
+
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
+// ======================================================================
+
+PlayClientEventLocMessage::PlayClientEventLocMessage(const std::string& eventSource, const std::string& eventDest, const Vector& location, const std::string planet, const NetworkId & cell, float terrainDelta)
+: GameNetworkMessage(MESSAGE_TYPE),
+  m_eventSourceName(eventSource),
+  m_eventDestName(eventDest),
+  m_planet(planet),
+  m_locationX(location.x),
+  m_locationY(location.y),
+  m_locationZ(location.z),
+  m_cell(cell),
+  m_terrainDelta(terrainDelta)
+{
+	addVariable(m_eventSourceName);
+	addVariable(m_eventDestName);
+	addVariable(m_planet);
+	addVariable(m_locationX);
+	addVariable(m_locationY);
+	addVariable(m_locationZ);
+	addVariable(m_cell);
+	addVariable(m_terrainDelta);
+}
+
+//-----------------------------------------------------------------------
+
+PlayClientEventLocMessage::PlayClientEventLocMessage(Archive::ReadIterator& source)
+: GameNetworkMessage(MESSAGE_TYPE),
+  m_eventSourceName(),
+  m_eventDestName(),
+  m_planet(),
+  m_locationX(),
+  m_locationY(),
+  m_locationZ(),
+  m_cell(),
+  m_terrainDelta()
+{
+	addVariable (m_eventSourceName);
+	addVariable (m_eventDestName);
+	addVariable (m_planet);
+	addVariable (m_locationX);
+	addVariable (m_locationY);
+	addVariable (m_locationZ);
+	addVariable (m_cell);
+	addVariable (m_terrainDelta);
+	unpack (source);
+}
+
+//-----------------------------------------------------------------------
+
+const std::string&      PlayClientEventLocMessage::getEventSourceName() const
+{
+	return m_eventSourceName.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string&      PlayClientEventLocMessage::getEventDestName() const
+{
+	return m_eventDestName.get();
+}
+
+//-----------------------------------------------------------------------
+
+Vector                  PlayClientEventLocMessage::getLocation() const
+{
+	return Vector(m_locationX.get(), m_locationY.get(), m_locationZ.get());
+}
+
+//-----------------------------------------------------------------------
+
+const std::string&      PlayClientEventLocMessage::getPlanet() const
+{
+	return m_planet.get();
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId &      PlayClientEventLocMessage::getCell() const
+{
+	return m_cell.get();
+}
+
+//-----------------------------------------------------------------------
+
+float                  PlayClientEventLocMessage::getTerrainDelta() const
+{
+	return m_terrainDelta.get();
+}
+
+//-----------------------------------------------------------------------
+
+StopClientEffectObjectByLabelMessage::StopClientEffectObjectByLabelMessage(const NetworkId& id, const std::string& label, const bool softTerminate)
+: GameNetworkMessage(MESSAGE_TYPE),
+  m_objectId(id),
+  m_label(label),
+  m_softTerminate(softTerminate)
+{
+	addVariable(m_objectId);
+	addVariable(m_label);
+	addVariable (m_softTerminate);
+}
+
+//-----------------------------------------------------------------------
+
+StopClientEffectObjectByLabelMessage::StopClientEffectObjectByLabelMessage(Archive::ReadIterator& source)
+: GameNetworkMessage(MESSAGE_TYPE),
+  m_objectId(),
+  m_label(),
+  m_softTerminate()
+{
+	addVariable (m_objectId);
+	addVariable (m_label);
+	addVariable (m_softTerminate);
+	unpack (source);
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId&        StopClientEffectObjectByLabelMessage::getObjectId() const
+{
+	return m_objectId.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string&      StopClientEffectObjectByLabelMessage::getLabel() const
+{
+	return m_label.get();
+}
+
+//-----------------------------------------------------------------------
+
+const bool              StopClientEffectObjectByLabelMessage::getSoftTerminate() const
+{
+	return m_softTerminate.get();
+}
+
+// ======================================================================
+
+CreateClientProjectileMessage::CreateClientProjectileMessage(const std::string & weaponObjectTemplateName, Vector const & start,
+	NetworkId const & startCell, Vector const & end, float speed, float expiration, bool trail, uint32 trailArgb)
+: GameNetworkMessage(MESSAGE_TYPE),
+m_weaponObjectTemplateName(weaponObjectTemplateName),
+m_startX(start.x),
+m_startY(start.y),
+m_startZ(start.z),
+m_startCell(startCell),
+m_endX(end.x),
+m_endY(end.y),
+m_endZ(end.z),
+m_speed(speed),
+m_expiration(expiration),
+m_trail(trail),
+m_trailArgb(trailArgb)
+{
+	addVariable(m_weaponObjectTemplateName);
+	addVariable(m_startX);
+	addVariable(m_startY);
+	addVariable(m_startZ);
+	addVariable(m_startCell);
+	addVariable(m_endX);
+	addVariable(m_endY);
+	addVariable(m_endZ);
+	addVariable(m_speed);
+	addVariable(m_expiration);
+	addVariable(m_trail);
+	addVariable(m_trailArgb);
+}
+
+//-----------------------------------------------------------------------
+
+CreateClientProjectileMessage::CreateClientProjectileMessage(Archive::ReadIterator& source)
+: GameNetworkMessage(MESSAGE_TYPE),
+m_weaponObjectTemplateName(),
+m_startX(),
+m_startY(),
+m_startZ(),
+m_startCell(),
+m_endX(),
+m_endY(),
+m_endZ(),
+m_speed(),
+m_expiration(),
+m_trail(),
+m_trailArgb()
+{
+	addVariable(m_weaponObjectTemplateName);
+	addVariable(m_startX);
+	addVariable(m_startY);
+	addVariable(m_startZ);
+	addVariable(m_startCell);
+	addVariable(m_endX);
+	addVariable(m_endY);
+	addVariable(m_endZ);
+	addVariable(m_speed);
+	addVariable(m_expiration);
+	addVariable(m_trail);
+	addVariable(m_trailArgb);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+std::string const & CreateClientProjectileMessage::getWeaponObjectTemplateName() const
+{
+	return m_weaponObjectTemplateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+Vector CreateClientProjectileMessage::getStartLocation() const
+{
+	return Vector(m_startX.get(), m_startY.get(), m_startZ.get());
+}
+
+//-----------------------------------------------------------------------
+
+Vector CreateClientProjectileMessage::getEndLocation() const
+{
+	return Vector(m_endX.get(), m_endY.get(), m_endZ.get());
+}
+
+//-----------------------------------------------------------------------
+
+NetworkId const & CreateClientProjectileMessage::getStartCell() const
+{
+	return m_startCell.get();
+}
+
+//-----------------------------------------------------------------------
+
+float CreateClientProjectileMessage::getSpeed() const
+{
+	return m_speed.get();
+}
+
+//-----------------------------------------------------------------------
+
+float CreateClientProjectileMessage::getExpiration() const
+{
+	return m_expiration.get();
+}
+
+//-----------------------------------------------------------------------
+
+bool CreateClientProjectileMessage::getTrail() const
+{
+	return m_trail.get();
+}
+
+//-----------------------------------------------------------------------
+
+uint32 CreateClientProjectileMessage::getTrailArgb() const
+{
+	return m_trailArgb.get();
+}
+
+//-----------------------------------------------------------------------
+
+CreateClientProjectileObjectToObjectMessage::CreateClientProjectileObjectToObjectMessage(const std::string& weaponObjectTemplateName, NetworkId const & source, std::string const & sourceHardpoint, NetworkId const & startCell, NetworkId const & target, std::string const & targetHardpoint, float speed, float expiration, bool trail, uint32 trailArgb):
+GameNetworkMessage(MESSAGE_TYPE),
+m_weaponObjectTemplateName (weaponObjectTemplateName),
+m_sourceId (source),
+m_sourceHardpoint (sourceHardpoint),
+m_startCell (startCell),
+m_targetId (target),
+m_targetHardpoint (targetHardpoint),
+m_speed (speed),
+m_expiration (expiration),
+m_trail (trail),
+m_trailArgb (trailArgb)
+{
+	addVariable(m_weaponObjectTemplateName);
+	addVariable(m_sourceId);
+	addVariable(m_sourceHardpoint);
+	addVariable(m_targetId);
+	addVariable(m_targetHardpoint);
+	addVariable(m_startCell);
+	addVariable(m_speed);
+	addVariable(m_expiration);
+	addVariable(m_trail);
+	addVariable(m_trailArgb);
+
+}
+
+//-----------------------------------------------------------------------
+
+CreateClientProjectileObjectToObjectMessage::CreateClientProjectileObjectToObjectMessage(Archive::ReadIterator& source)
+: GameNetworkMessage(MESSAGE_TYPE),
+m_weaponObjectTemplateName (),
+m_sourceId (),
+m_sourceHardpoint (),
+m_startCell (),
+m_targetId (),
+m_targetHardpoint (),
+m_speed (),
+m_expiration (),
+m_trail (),
+m_trailArgb ()
+{
+	addVariable(m_weaponObjectTemplateName);
+	addVariable(m_sourceId);
+	addVariable(m_sourceHardpoint);
+	addVariable(m_targetId);
+	addVariable(m_targetHardpoint);
+	addVariable(m_startCell);
+	addVariable(m_speed);
+	addVariable(m_expiration);
+	addVariable(m_trail);
+	addVariable(m_trailArgb);
+	unpack(source);
+}
+
+
+//-----------------------------------------------------------------------
+
+std::string const & CreateClientProjectileObjectToObjectMessage::getWeaponObjectTemplateName() const
+{
+	return m_weaponObjectTemplateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+NetworkId const & CreateClientProjectileObjectToObjectMessage::getSourceObject() const
+{
+	return m_sourceId.get();
+}
+
+//-----------------------------------------------------------------------
+
+std::string const & CreateClientProjectileObjectToObjectMessage::getSourceHardpointName() const
+{
+	return m_sourceHardpoint.get();
+}
+
+//-----------------------------------------------------------------------
+
+NetworkId const & CreateClientProjectileObjectToObjectMessage::getTargetObject() const
+{
+	return m_targetId.get();
+}
+
+//-----------------------------------------------------------------------
+
+std::string const & CreateClientProjectileObjectToObjectMessage::getTargetHardpointName() const
+{
+	return m_targetHardpoint.get();
+}
+
+//-----------------------------------------------------------------------
+
+NetworkId const & CreateClientProjectileObjectToObjectMessage::getStartCell() const
+{
+	return m_startCell.get();
+}
+
+//-----------------------------------------------------------------------
+
+float CreateClientProjectileObjectToObjectMessage::getSpeed() const
+{
+	return m_speed.get();
+}
+
+//-----------------------------------------------------------------------
+
+float CreateClientProjectileObjectToObjectMessage::getExpiration() const
+{
+	return m_expiration.get();
+}
+
+//-----------------------------------------------------------------------
+
+bool CreateClientProjectileObjectToObjectMessage::getTrail() const
+{
+	return m_trail.get();
+}
+
+//-----------------------------------------------------------------------
+
+uint32 CreateClientProjectileObjectToObjectMessage::getTrailArgb() const
+{
+	return m_trailArgb.get();
+}
+
+//-----------------------------------------------------------------------
+CreateClientProjectileLocationToObjectMessage::CreateClientProjectileLocationToObjectMessage(const std::string& weaponObjectTemplateName, Vector const & startLocation, NetworkId const & startCell, NetworkId const & target, std::string const & targetHardpoint, float speed, float expiration, bool trail, uint32 trailArgb):
+GameNetworkMessage(MESSAGE_TYPE),
+m_weaponObjectTemplateName (weaponObjectTemplateName),
+m_startLocation (startLocation),
+m_startCell (startCell),
+m_targetId (target),
+m_targetHardpoint (targetHardpoint),
+m_speed (speed),
+m_expiration (expiration),
+m_trail (trail),
+m_trailArgb (trailArgb)
+{
+	addVariable(m_weaponObjectTemplateName);
+	addVariable(m_startLocation);
+	addVariable(m_targetId);
+	addVariable(m_targetHardpoint);
+	addVariable(m_startCell);
+	addVariable(m_speed);
+	addVariable(m_expiration);
+	addVariable(m_trail);
+	addVariable(m_trailArgb);
+
+}
+
+//-----------------------------------------------------------------------
+
+CreateClientProjectileLocationToObjectMessage::CreateClientProjectileLocationToObjectMessage(Archive::ReadIterator& source)
+: GameNetworkMessage(MESSAGE_TYPE),
+m_weaponObjectTemplateName (),
+m_startLocation (),
+m_startCell (),
+m_targetId (),
+m_targetHardpoint (),
+m_speed (),
+m_expiration (),
+m_trail (),
+m_trailArgb ()
+{
+	addVariable(m_weaponObjectTemplateName);
+	addVariable(m_startLocation);
+	addVariable(m_targetId);
+	addVariable(m_targetHardpoint);
+	addVariable(m_startCell);
+	addVariable(m_speed);
+	addVariable(m_expiration);
+	addVariable(m_trail);
+	addVariable(m_trailArgb);
+	unpack(source);
+}
+
+
+//-----------------------------------------------------------------------
+
+std::string const & CreateClientProjectileLocationToObjectMessage::getWeaponObjectTemplateName() const
+{
+	return m_weaponObjectTemplateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+Vector const & CreateClientProjectileLocationToObjectMessage::getStartLocation() const
+{
+	return m_startLocation.get();
+}
+
+//-----------------------------------------------------------------------
+
+NetworkId const & CreateClientProjectileLocationToObjectMessage::getTargetObject() const
+{
+	return m_targetId.get();
+}
+
+//-----------------------------------------------------------------------
+
+std::string const & CreateClientProjectileLocationToObjectMessage::getTargetHardpointName() const
+{
+	return m_targetHardpoint.get();
+}
+
+//-----------------------------------------------------------------------
+
+NetworkId const & CreateClientProjectileLocationToObjectMessage::getStartCell() const
+{
+	return m_startCell.get();
+}
+
+//-----------------------------------------------------------------------
+
+float CreateClientProjectileLocationToObjectMessage::getSpeed() const
+{
+	return m_speed.get();
+}
+
+//-----------------------------------------------------------------------
+
+float CreateClientProjectileLocationToObjectMessage::getExpiration() const
+{
+	return m_expiration.get();
+}
+
+//-----------------------------------------------------------------------
+
+bool CreateClientProjectileLocationToObjectMessage::getTrail() const
+{
+	return m_trail.get();
+}
+
+//-----------------------------------------------------------------------
+
+uint32 CreateClientProjectileLocationToObjectMessage::getTrailArgb() const
+{
+	return m_trailArgb.get();
+}
+//-----------------------------------------------------------------------
+CreateClientProjectileObjectToLocationMessage::CreateClientProjectileObjectToLocationMessage(const std::string& weaponObjectTemplateName, NetworkId const & source, std::string const & sourceHardpoint, NetworkId const & startCell, Vector const & targetLocation, float speed, float expiration, bool trail, uint32 trailArgb):
+GameNetworkMessage(MESSAGE_TYPE),
+m_weaponObjectTemplateName (weaponObjectTemplateName),
+m_sourceId (source),
+m_sourceHardpoint (sourceHardpoint),
+m_startCell (startCell),
+m_targetLocation (targetLocation),
+m_speed (speed),
+m_expiration (expiration),
+m_trail (trail),
+m_trailArgb (trailArgb)
+{
+	addVariable(m_weaponObjectTemplateName);
+	addVariable(m_sourceId);
+	addVariable(m_sourceHardpoint);
+	addVariable(m_startCell);
+	addVariable(m_targetLocation);
+	addVariable(m_speed);
+	addVariable(m_expiration);
+	addVariable(m_trail);
+	addVariable(m_trailArgb);
+}
+
+//-----------------------------------------------------------------------
+
+CreateClientProjectileObjectToLocationMessage::CreateClientProjectileObjectToLocationMessage(Archive::ReadIterator& source)
+: GameNetworkMessage(MESSAGE_TYPE),
+m_weaponObjectTemplateName (),
+m_sourceId (),
+m_sourceHardpoint (),
+m_startCell (),
+m_targetLocation (),
+m_speed (),
+m_expiration (),
+m_trail (),
+m_trailArgb ()
+{
+	addVariable(m_weaponObjectTemplateName);
+	addVariable(m_sourceId);
+	addVariable(m_sourceHardpoint);
+	addVariable(m_startCell);
+	addVariable(m_targetLocation);
+	addVariable(m_speed);
+	addVariable(m_expiration);
+	addVariable(m_trail);
+	addVariable(m_trailArgb);
+	unpack(source);
+}
+
+
+//-----------------------------------------------------------------------
+
+std::string const & CreateClientProjectileObjectToLocationMessage::getWeaponObjectTemplateName() const
+{
+	return m_weaponObjectTemplateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+Vector const & CreateClientProjectileObjectToLocationMessage::getTargetLocation() const
+{
+	return m_targetLocation.get();
+}
+
+//-----------------------------------------------------------------------
+
+NetworkId const & CreateClientProjectileObjectToLocationMessage::getSourceObject() const
+{
+	return m_sourceId.get();
+}
+
+//-----------------------------------------------------------------------
+
+std::string const & CreateClientProjectileObjectToLocationMessage::getSourceHardpointName() const
+{
+	return m_sourceHardpoint.get();
+}
+
+//-----------------------------------------------------------------------
+
+NetworkId const & CreateClientProjectileObjectToLocationMessage::getStartCell() const
+{
+	return m_startCell.get();
+}
+
+//-----------------------------------------------------------------------
+
+float CreateClientProjectileObjectToLocationMessage::getSpeed() const
+{
+	return m_speed.get();
+}
+
+//-----------------------------------------------------------------------
+
+float CreateClientProjectileObjectToLocationMessage::getExpiration() const
+{
+	return m_expiration.get();
+}
+
+//-----------------------------------------------------------------------
+
+bool CreateClientProjectileObjectToLocationMessage::getTrail() const
+{
+	return m_trail.get();
+}
+
+//-----------------------------------------------------------------------
+
+uint32 CreateClientProjectileObjectToLocationMessage::getTrailArgb() const
+{
+	return m_trailArgb.get();
+}
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.h
new file mode 100644
index 00000000..bd4eff2e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientEffectMessages.h
@@ -0,0 +1,463 @@
+
+// ======================================================================
+//
+// ClientEffectMessages.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ClientEffectMessages_H
+#define INCLUDED_ClientEffectMessages_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/Archive.h"
+#include "Unicode.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedMath/Transform.h"
+#include "sharedMath/Vector.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+class GameInByteStream;
+class GameOutByteStream;
+
+//-----------------------------------------------------------------------
+
+/** The network message to play a client effect on a given object, and optionally on one of its hardpoints.
+ */
+class PlayClientEffectObjectMessage : public GameNetworkMessage
+{
+public:
+	PlayClientEffectObjectMessage(const NetworkId& id, 
+	                              const std::string& effectName, 
+	                              const std::string& hardpoint,
+								  const std::string& label);
+	explicit PlayClientEffectObjectMessage (Archive::ReadIterator& source);
+
+	const NetworkId&             getObjectId() const;
+	const std::string&           getEffectName() const;
+	const std::string&           getHardpoint() const;
+	const std::string&           getLabel() const;
+
+	static const char * const MESSAGE_TYPE;
+
+private:
+	//the name of the UI page to use
+	Archive::AutoVariable<std::string> m_effectName;
+	//the name of the UI page to use
+	Archive::AutoVariable<std::string> m_hardpoint;
+	//the object on which to play the effect (likely not the avatar)
+	Archive::AutoVariable<NetworkId> m_objectId;
+	//the optional label for this effect on this object which can be used to later stop this effect
+	Archive::AutoVariable<std::string> m_label;
+};
+
+//-----------------------------------------------------------------------
+
+/** The network message to play a client effect on a given object, and optionally on one of its hardpoints.
+ */
+class PlayClientEffectObjectTransformMessage : public GameNetworkMessage
+{
+public:
+	PlayClientEffectObjectTransformMessage(const NetworkId& id, 
+	                              const std::string& effectName, 
+	                              Transform const & hardpoint,
+								  const std::string& label);
+	explicit PlayClientEffectObjectTransformMessage (Archive::ReadIterator& source);
+
+	const NetworkId&             getObjectId() const;
+	const std::string&           getEffectName() const;
+	Transform const &            getTransform() const;
+	const std::string&           getLabel() const;
+
+	static const char * const MESSAGE_TYPE;
+
+private:
+	//the name of the UI page to use
+	Archive::AutoVariable<std::string> m_effectName;
+	//the name of the UI page to use
+	Archive::AutoVariable<Transform> m_transform;
+	//the object on which to play the effect (likely not the avatar)
+	Archive::AutoVariable<NetworkId> m_objectId;
+	//the optional label for this effect on this object which can be used to later stop this effect
+	Archive::AutoVariable<std::string> m_label;
+};
+
+//-----------------------------------------------------------------------
+
+/** The network message to play a client effect at a given location.
+ */
+class PlayClientEffectLocMessage : public GameNetworkMessage
+{
+public:
+	PlayClientEffectLocMessage(const std::string& effectName, 
+	                           const Vector& location, 
+	                           const std::string planet,
+	                           const NetworkId & cell,
+	                           float terrainDelta,
+							   const std::string& label);
+	explicit PlayClientEffectLocMessage (Archive::ReadIterator& source);
+
+	const std::string&        getEffectName() const;
+	Vector                    getLocation() const;
+	const std::string&        getPlanet() const;
+	const NetworkId&          getCell() const;
+	float                     getTerrainDelta() const;
+	const std::string&        getLabel() const;
+
+	static const char * const MESSAGE_TYPE;
+
+private:
+	//the name of the UI page to use
+	Archive::AutoVariable<std::string> m_effectName;
+	//effect planet
+	Archive::AutoVariable<std::string> m_planet;
+	//effect world position
+	Archive::AutoVariable<float>       m_locationX;
+	Archive::AutoVariable<float>       m_locationY;
+	Archive::AutoVariable<float>       m_locationZ;
+	//effect cell
+	Archive::AutoVariable<NetworkId>   m_cell;
+	//height above/below terrain to play the effect
+	Archive::AutoVariable<float>       m_terrainDelta;
+	//the optional label for this effect on this object which can be used to later stop this effect
+	Archive::AutoVariable<std::string> m_label;
+};
+//-----------------------------------------------------------------------
+
+/** The network message to play an event on a given object, and optionally on one of its hardpoints.
+ */
+class PlayClientEventObjectMessage : public GameNetworkMessage
+{
+public:
+	PlayClientEventObjectMessage(const NetworkId& id, 
+	                             const std::string& eventName, 
+	                             const std::string& hardpoint);
+	explicit PlayClientEventObjectMessage (Archive::ReadIterator& source);
+
+	const NetworkId&            getObjectId() const;
+	const std::string&          getEventName() const;
+	const std::string&          getHardpoint() const;
+
+	static const char * const MESSAGE_TYPE;
+
+private:
+	//the name of the UI page to use
+	Archive::AutoVariable<std::string> m_eventName;
+	//the name of the UI page to use
+	Archive::AutoVariable<std::string> m_hardpoint;
+	//the object on which to play the event (likely not the avatar)
+	Archive::AutoVariable<NetworkId>        m_objectId;
+};
+
+//-----------------------------------------------------------------------
+
+/** The network message to play a client effect on a given object, and optionally on one of its hardpoints.
+*/
+class PlayClientEventObjectTransformMessage : public GameNetworkMessage
+{
+public:
+	PlayClientEventObjectTransformMessage(const NetworkId& id, 
+		const std::string& eventName, 
+		Transform const & hardpoint);
+	explicit PlayClientEventObjectTransformMessage (Archive::ReadIterator& source);
+	
+	const NetworkId&             getObjectId() const;
+	const std::string&           getEventName() const;
+	Transform const &            getTransform() const;
+	
+	static const char * const MESSAGE_TYPE;
+	
+private:
+	//the name of the UI page to use
+	Archive::AutoVariable<std::string> m_eventName;
+	//the name of the UI page to use
+	Archive::AutoVariable<Transform> m_transform;
+	//the object on which to play the effect (likely not the avatar)
+	Archive::AutoVariable<NetworkId> m_objectId;
+};
+
+//-----------------------------------------------------------------------
+
+/** The network message to play an event at a given location.
+*/
+class PlayClientEventLocMessage : public GameNetworkMessage
+{
+public:
+	PlayClientEventLocMessage(const std::string& eventSource, 
+	                          const std::string& eventDest, 
+	                          const Vector& position, 
+	                          const std::string planet,
+	                          const NetworkId & cell,
+	                          float terrainDelta);
+	explicit PlayClientEventLocMessage(Archive::ReadIterator& source);
+
+	const std::string&       getEventSourceName() const;
+	const std::string&       getEventDestName() const;
+	Vector                   getLocation() const;
+	const std::string&       getPlanet() const;
+	const NetworkId &        getCell() const;
+	float                    getTerrainDelta() const;
+
+	static const char * const MESSAGE_TYPE;
+
+private:
+	//the name of the source event type
+	Archive::AutoVariable<std::string> m_eventSourceName;
+	//the name of the dest event type
+	Archive::AutoVariable<std::string> m_eventDestName;
+	//event planet
+	Archive::AutoVariable<std::string> m_planet;
+	//effect world position
+	Archive::AutoVariable<float>       m_locationX;
+	Archive::AutoVariable<float>       m_locationY;
+	Archive::AutoVariable<float>       m_locationZ;
+	//effect cell position
+	Archive::AutoVariable<NetworkId>   m_cell;
+	//height above/below terrain to play the effect
+	Archive::AutoVariable<float>       m_terrainDelta;
+};
+
+//-----------------------------------------------------------------------
+
+/** The network message to play a client effect on a given object, and optionally on one of its hardpoints.
+ */
+class StopClientEffectObjectByLabelMessage : public GameNetworkMessage
+{
+public:
+	StopClientEffectObjectByLabelMessage(const NetworkId& id, 
+								  const std::string& label,
+								  const bool softTerminate);
+	explicit StopClientEffectObjectByLabelMessage (Archive::ReadIterator& source);
+
+	const NetworkId&             getObjectId() const;
+	const std::string&           getLabel() const;
+	const bool                   getSoftTerminate() const;
+
+	static const char * const MESSAGE_TYPE;
+
+private:
+	//the object on which is playing the effect
+	Archive::AutoVariable<NetworkId> m_objectId;
+	//the label for of the effect to stop
+	Archive::AutoVariable<std::string> m_label;
+	//whether or not to immediately kill the effect
+	Archive::AutoVariable<bool> m_softTerminate;
+};
+
+//-----------------------------------------------------------------------
+
+/** The network message to create a client projectile.
+*/
+class CreateClientProjectileMessage : public GameNetworkMessage
+{
+public:
+	CreateClientProjectileMessage(const std::string& weaponObjectTemplateName, 
+		Vector const & start,
+		NetworkId const & startCell,
+		Vector const & end,
+		float speed,
+		float expiration,
+		bool trail,
+		uint32 trailArgb);
+	explicit CreateClientProjectileMessage(Archive::ReadIterator& source);
+
+	std::string const & getWeaponObjectTemplateName() const;
+	Vector getStartLocation() const;
+	Vector getEndLocation() const;
+	NetworkId const & getStartCell() const;
+	float getSpeed() const;
+	float getExpiration() const;
+	bool getTrail() const;
+	uint32 getTrailArgb() const;
+
+	static char const * const MESSAGE_TYPE;
+
+private:
+	Archive::AutoVariable<std::string> m_weaponObjectTemplateName;
+
+	// start position
+	Archive::AutoVariable<float>       m_startX;
+	Archive::AutoVariable<float>       m_startY;
+	Archive::AutoVariable<float>       m_startZ;
+
+	// start cell
+	Archive::AutoVariable<NetworkId>   m_startCell;
+
+	// end position
+	Archive::AutoVariable<float>       m_endX;
+	Archive::AutoVariable<float>       m_endY;
+	Archive::AutoVariable<float>       m_endZ;
+
+	// projectile parameters
+	Archive::AutoVariable<float>       m_speed;
+	Archive::AutoVariable<float>       m_expiration;
+	Archive::AutoVariable<bool>        m_trail;
+	Archive::AutoVariable<uint32>      m_trailArgb;
+};
+//-----------------------------------------------------------------------
+
+/** The network message to create an object to object client projectile.
+*/
+class CreateClientProjectileObjectToObjectMessage : public GameNetworkMessage
+{
+public:
+	CreateClientProjectileObjectToObjectMessage(const std::string& weaponObjectTemplateName, 
+		NetworkId const & source,
+		const std::string& sourceHardpoint,
+		NetworkId const & startCell,
+		NetworkId const & target,
+		const std::string& targetHardpoint,
+		float speed,
+		float expiration,
+		bool trail,
+		uint32 trailArgb);
+	explicit CreateClientProjectileObjectToObjectMessage(Archive::ReadIterator& source);
+
+	std::string const & getWeaponObjectTemplateName() const;
+	NetworkId const & getSourceObject() const;
+	std::string const & getSourceHardpointName() const;
+	NetworkId const & getTargetObject() const;
+	std::string const & getTargetHardpointName() const;
+	NetworkId const & getStartCell() const;
+	float getSpeed() const;
+	float getExpiration() const;
+	bool getTrail() const;
+	uint32 getTrailArgb() const;
+
+	static char const * const MESSAGE_TYPE;
+
+private:
+	Archive::AutoVariable<std::string> m_weaponObjectTemplateName;
+
+	// Source Object NetworkId
+	Archive::AutoVariable<NetworkId>       m_sourceId;
+
+	// Optional Source hardpoint name
+	Archive::AutoVariable<std::string>     m_sourceHardpoint;
+
+	// start cell
+	Archive::AutoVariable<NetworkId>       m_startCell;
+
+	// Target Object NetworkId
+	Archive::AutoVariable<NetworkId>       m_targetId;
+
+	// Optional Target hardpoint name
+	Archive::AutoVariable<std::string>     m_targetHardpoint;
+
+	// projectile parameters
+	Archive::AutoVariable<float>           m_speed;
+	Archive::AutoVariable<float>           m_expiration;
+	Archive::AutoVariable<bool>            m_trail;
+	Archive::AutoVariable<uint32>          m_trailArgb;
+};
+//-----------------------------------------------------------------------
+
+/** The network message to create an location to object client projectile.
+*/
+class CreateClientProjectileLocationToObjectMessage : public GameNetworkMessage
+{
+public:
+	CreateClientProjectileLocationToObjectMessage(const std::string& weaponObjectTemplateName, 
+		Vector const & startLocation,
+		NetworkId const & startCell,
+		NetworkId const & target,
+		const std::string& targetHardpoint,
+		float speed,
+		float expiration,
+		bool trail,
+		uint32 trailArgb);
+	explicit CreateClientProjectileLocationToObjectMessage(Archive::ReadIterator& source);
+
+	std::string const & getWeaponObjectTemplateName() const;
+	Vector const & getStartLocation() const;
+	NetworkId const & getTargetObject() const;
+	std::string const & getTargetHardpointName() const;
+	NetworkId const & getStartCell() const;
+
+	float getSpeed() const;
+	float getExpiration() const;
+	bool getTrail() const;
+	uint32 getTrailArgb() const;
+
+	static char const * const MESSAGE_TYPE;
+
+private:
+	Archive::AutoVariable<std::string> m_weaponObjectTemplateName;
+
+	// Source Location
+	Archive::AutoVariable<Vector>          m_startLocation;
+
+	// start cell
+	Archive::AutoVariable<NetworkId>       m_startCell;
+
+	// Target Object NetworkId
+	Archive::AutoVariable<NetworkId>       m_targetId;
+
+	// Optional Target hardpoint name
+	Archive::AutoVariable<std::string>     m_targetHardpoint;
+
+	// projectile parameters
+	Archive::AutoVariable<float>           m_speed;
+	Archive::AutoVariable<float>           m_expiration;
+	Archive::AutoVariable<bool>            m_trail;
+	Archive::AutoVariable<uint32>          m_trailArgb;
+};
+//-----------------------------------------------------------------------
+/** The network message to create an object to location client projectile.
+*/
+class CreateClientProjectileObjectToLocationMessage : public GameNetworkMessage
+{
+public:
+	CreateClientProjectileObjectToLocationMessage(const std::string& weaponObjectTemplateName, 
+		NetworkId const & source,
+		const std::string& sourceHardpoint,
+		NetworkId const & startCell,
+		Vector const & targetLocation,
+		float speed,
+		float expiration,
+		bool trail,
+		uint32 trailArgb);
+	explicit CreateClientProjectileObjectToLocationMessage(Archive::ReadIterator& source);
+
+	std::string const & getWeaponObjectTemplateName() const;
+	NetworkId const & getSourceObject() const;
+	std::string const & getSourceHardpointName() const;
+	NetworkId const & getStartCell() const;
+	Vector const & getTargetLocation() const;
+
+	float getSpeed() const;
+	float getExpiration() const;
+	bool getTrail() const;
+	uint32 getTrailArgb() const;
+
+	static char const * const MESSAGE_TYPE;
+
+private:
+	Archive::AutoVariable<std::string> m_weaponObjectTemplateName;
+
+	// Source Object NetworkId
+	Archive::AutoVariable<NetworkId>       m_sourceId;
+
+	// Optional Source hardpoint name
+	Archive::AutoVariable<std::string>     m_sourceHardpoint;
+
+	// start cell
+	Archive::AutoVariable<NetworkId>       m_startCell;
+
+	// Target Location
+	Archive::AutoVariable<Vector>          m_targetLocation;
+
+	// projectile parameters
+	Archive::AutoVariable<float>           m_speed;
+	Archive::AutoVariable<float>           m_expiration;
+	Archive::AutoVariable<bool>            m_trail;
+	Archive::AutoVariable<uint32>          m_trailArgb;
+};
+//-----------------------------------------------------------------------
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.cpp
new file mode 100644
index 00000000..b0304789
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.cpp
@@ -0,0 +1,140 @@
+// ======================================================================
+//
+// ClientMfdStatusUpdateMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/ClientMfdStatusUpdateMessage.h"
+
+//-----------------------------------------------------------------------
+
+const char * const ClientMfdStatusUpdateMessage::MESSAGE_TYPE = "ClientMfdStatusUpdateMessage";
+
+//-----------------------------------------------------------------
+
+ClientMfdStatusUpdateMessage::ClientMfdStatusUpdateMessage(const NetworkId & sourceId, const std::string & sceneName, const Vector & worldCoordinates, float updateTime, float updateDistance) :
+GameNetworkMessage (MESSAGE_TYPE),
+m_sceneName(sceneName),
+m_sourceId(sourceId),
+m_worldCoordinates(worldCoordinates),
+m_hasChanged(true),
+m_membersToUpdate(),
+m_memberUpdateTimer(updateTime),
+m_memberUpdateDistance(updateDistance * updateDistance)
+{
+	addVariable(m_sceneName);
+	addVariable(m_sourceId);
+	addVariable(m_worldCoordinates);
+}
+
+//-----------------------------------------------------------------------
+
+ClientMfdStatusUpdateMessage::ClientMfdStatusUpdateMessage(Archive::ReadIterator & source) :
+GameNetworkMessage (MESSAGE_TYPE),
+m_sceneName(),
+m_sourceId(),
+m_worldCoordinates(),
+m_hasChanged(true),
+m_membersToUpdate(),
+m_memberUpdateTimer(),
+m_memberUpdateDistance()
+{
+	addVariable(m_sceneName);
+	addVariable(m_sourceId);
+	addVariable(m_worldCoordinates);
+	unpack(source);
+}
+
+//----------------------------------------------------------------------
+
+ClientMfdStatusUpdateMessage::~ClientMfdStatusUpdateMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+std::vector<NetworkId> & ClientMfdStatusUpdateMessage::getMembersToUpdate()
+{
+	return m_membersToUpdate;
+}
+
+//-----------------------------------------------------------------------
+
+bool ClientMfdStatusUpdateMessage::getHasChanged() const
+{
+	return m_hasChanged;
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & ClientMfdStatusUpdateMessage::getSceneName() const
+{
+	return m_sceneName.get();
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId & ClientMfdStatusUpdateMessage::getSourceId() const
+{
+	return m_sourceId.get();
+}
+
+//-----------------------------------------------------------------------
+
+const Vector & ClientMfdStatusUpdateMessage::getWorldCoordinates() const
+{
+	return m_worldCoordinates.get();
+}
+
+//-----------------------------------------------------------------------
+
+void ClientMfdStatusUpdateMessage::addMemberToUpdate(const NetworkId & member)
+{
+	if(std::find(m_membersToUpdate.begin(), m_membersToUpdate.end(), member) == m_membersToUpdate.end())
+	{
+		m_membersToUpdate.push_back(member);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ClientMfdStatusUpdateMessage::setSceneName(const std::string & sceneName)
+{
+	if(sceneName != m_sceneName.get())
+	{
+		m_hasChanged = true;
+		m_sceneName.set(sceneName);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ClientMfdStatusUpdateMessage::setWorldCoordinates(const Vector & worldCoordinates)
+{
+	if(worldCoordinates.magnitudeBetweenSquared(m_worldCoordinates.get()) > m_memberUpdateDistance)
+	{
+		m_hasChanged = true;
+		m_worldCoordinates.set(worldCoordinates);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+void ClientMfdStatusUpdateMessage::setHasChanged(bool hasChanged)
+{
+	m_hasChanged = hasChanged;
+}
+
+//-----------------------------------------------------------------------
+
+bool ClientMfdStatusUpdateMessage::updateMemberUpdateTimer(float t)
+{
+	return m_memberUpdateTimer.updateZero(t);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.h
new file mode 100644
index 00000000..f241deb5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientMfdStatusUpdateMessage.h
@@ -0,0 +1,58 @@
+
+// ======================================================================
+//
+// ClientMfdStatusUpdateMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ClientMfdStatusUpdateMessage_H
+#define INCLUDED_ClientMfdStatusUpdateMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedMath/Vector.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/Timer.h"
+#include <vector>
+//-----------------------------------------------------------------------
+
+class ClientMfdStatusUpdateMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MESSAGE_TYPE;
+
+	ClientMfdStatusUpdateMessage (const NetworkId & sourceId, const std::string & sceneName, const Vector & worldCoordinates, float memberUpdateTimer, float memberUpdateDistance);
+	explicit   ClientMfdStatusUpdateMessage (Archive::ReadIterator & source);
+	virtual   ~ClientMfdStatusUpdateMessage ();
+
+	bool                 getHasChanged        () const;
+	std::vector<NetworkId> &  getMembersToUpdate();
+	const std::string &  getSceneName         () const;
+	const NetworkId &    getSourceId          () const;
+	const Vector &       getWorldCoordinates  () const;
+	
+	void                 addMemberToUpdate    (const NetworkId & memberId);
+	void                 setSceneName         (const std::string & sceneName);
+	void                 setWorldCoordinates  (const Vector & worldCoordinates);
+	void                 setHasChanged        (bool hasChanged);
+	bool                 updateMemberUpdateTimer(float elapsedTimeSeconds);
+	
+private:
+	Archive::AutoVariable<std::string>  m_sceneName;
+	Archive::AutoVariable<NetworkId>    m_sourceId;
+	Archive::AutoVariable<Vector>       m_worldCoordinates;
+	bool                                m_hasChanged;
+	std::vector<NetworkId>              m_membersToUpdate;
+	Timer                               m_memberUpdateTimer;
+	float                               m_memberUpdateDistance;
+	
+private:
+	ClientMfdStatusUpdateMessage(const ClientMfdStatusUpdateMessage&);
+	ClientMfdStatusUpdateMessage& operator= (const ClientMfdStatusUpdateMessage&);
+};
+
+//-----------------------------------------------------------------
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientOpenContainerMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientOpenContainerMessage.cpp
new file mode 100644
index 00000000..907b6991
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientOpenContainerMessage.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// ClientOpenContainerMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ClientOpenContainerMessage.h"
+
+// ======================================================================
+
+ClientOpenContainerMessage::ClientOpenContainerMessage(NetworkId containerId, std::string slot) :
+	GameNetworkMessage("ClientOpenContainerMessage"),
+	m_containerId(containerId),
+	m_slot(slot)
+{
+	AutoByteStream::addVariable(m_containerId);
+	AutoByteStream::addVariable(m_slot);
+}
+
+// ======================================================================
+
+ClientOpenContainerMessage::ClientOpenContainerMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("ClientOpenContainerMessage"),
+	m_containerId(),
+	m_slot()
+{
+	AutoByteStream::addVariable(m_containerId);
+	AutoByteStream::addVariable(m_slot);
+	unpack(source);
+}
+
+// ======================================================================
+
+ClientOpenContainerMessage::~ClientOpenContainerMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientOpenContainerMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientOpenContainerMessage.h
new file mode 100644
index 00000000..2db76760
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientOpenContainerMessage.h
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// ClientOpenContainerMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_ClientOpenContainerMessage_H
+#define	_ClientOpenContainerMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class ClientOpenContainerMessage : public GameNetworkMessage
+{
+public:
+
+	ClientOpenContainerMessage(NetworkId containerId, std::string slot );
+	explicit ClientOpenContainerMessage(Archive::ReadIterator &source);
+
+	~ClientOpenContainerMessage();
+
+public: // methods
+
+	NetworkId                        getContainerId() const;
+	std::string                      getSlot() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId>             m_containerId;
+	Archive::AutoVariable<std::string>           m_slot; 
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId ClientOpenContainerMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string ClientOpenContainerMessage::getSlot() const
+{
+	return m_slot.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _ClientOpenContainerMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientPermissionsMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientPermissionsMessage.cpp
new file mode 100644
index 00000000..8e3c0aea
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientPermissionsMessage.cpp
@@ -0,0 +1,49 @@
+// ======================================================================
+//
+// ClientPermissionsMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ClientPermissionsMessage.h"
+
+// ======================================================================
+
+ClientPermissionsMessage::ClientPermissionsMessage(bool canLogin, bool canCreateRegularCharacter, bool canCreateJediCharacter, bool canSkipTutorial) :
+		GameNetworkMessage("ClientPermissionsMessage"),
+		m_canLogin(canLogin),
+		m_canCreateRegularCharacter(canCreateRegularCharacter),
+		m_canCreateJediCharacter(canCreateJediCharacter),
+		m_canSkipTutorial(canSkipTutorial)
+{
+	addVariable(m_canLogin);
+	addVariable(m_canCreateRegularCharacter);
+	addVariable(m_canCreateJediCharacter);
+	addVariable(m_canSkipTutorial);
+}
+
+//-----------------------------------------------------------------------
+
+ClientPermissionsMessage::ClientPermissionsMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("ClientPermissionsMessage"),
+		m_canLogin(),
+		m_canCreateRegularCharacter(),
+		m_canCreateJediCharacter(),
+		m_canSkipTutorial()
+{
+	addVariable(m_canLogin);
+	addVariable(m_canCreateRegularCharacter);
+	addVariable(m_canCreateJediCharacter);
+	addVariable(m_canSkipTutorial);
+
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ClientPermissionsMessage::~ClientPermissionsMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientPermissionsMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientPermissionsMessage.h
new file mode 100644
index 00000000..8ad6c9da
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ClientPermissionsMessage.h
@@ -0,0 +1,78 @@
+// ======================================================================
+//
+// ClientPermissionsMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ClientPermissionsMessage_H
+#define INCLUDED_ClientPermissionsMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Connection Server
+ * Sent to:    Client
+ * Action:     Tells the client what permissions it has on the server its
+ *             connected to.
+ */
+class ClientPermissionsMessage : public GameNetworkMessage
+{
+  public:
+	ClientPermissionsMessage(bool canLogin, bool canCreateRegularCharacter, bool canCreateJediCharacter, bool canSkipTutorial);
+	explicit ClientPermissionsMessage(Archive::ReadIterator & source);
+	virtual ~ClientPermissionsMessage();
+
+  public:
+	bool getCanLogin() const;
+	bool getCanCreateRegularCharacter() const;
+	bool getCanCreateJediCharacter() const;
+	bool getCanSkipTutorial() const;
+	
+  private:
+	Archive::AutoVariable<bool> m_canLogin;
+	Archive::AutoVariable<bool> m_canCreateRegularCharacter;
+	Archive::AutoVariable<bool> m_canCreateJediCharacter;
+	Archive::AutoVariable<bool> m_canSkipTutorial;
+
+	ClientPermissionsMessage();
+	ClientPermissionsMessage(const ClientPermissionsMessage&);
+	ClientPermissionsMessage& operator= (const ClientPermissionsMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline bool ClientPermissionsMessage::getCanLogin() const
+{
+	return m_canLogin.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ClientPermissionsMessage::getCanCreateRegularCharacter() const
+{
+	return m_canCreateRegularCharacter.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ClientPermissionsMessage::getCanCreateJediCharacter() const
+{
+	return m_canCreateJediCharacter.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ClientPermissionsMessage::getCanSkipTutorial() const
+{
+	return m_canSkipTutorial.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ClientCentralMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CloseHolocronMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CloseHolocronMessage.cpp
new file mode 100644
index 00000000..d3a1779f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CloseHolocronMessage.cpp
@@ -0,0 +1,34 @@
+// ======================================================================
+//
+// CloseHolocronMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CloseHolocronMessage.h"
+
+#include "Archive/ByteStream.h"
+#include "Archive/AutoByteStream.h"
+
+// ======================================================================
+
+const char * const CloseHolocronMessage::MessageType = "CloseHolocronMessage";
+
+// ======================================================================
+
+CloseHolocronMessage::CloseHolocronMessage()
+: GameNetworkMessage(MessageType)
+{
+}
+
+//-----------------------------------------------------------------------
+
+CloseHolocronMessage::CloseHolocronMessage(Archive::ReadIterator& source)
+: GameNetworkMessage(MessageType)
+{
+	unpack (source);
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CloseHolocronMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CloseHolocronMessage.h
new file mode 100644
index 00000000..ef9b927c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CloseHolocronMessage.h
@@ -0,0 +1,38 @@
+
+// ======================================================================
+//
+// CloseHolocronMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_CloseHolocronMessage_H
+#define INCLUDED_CloseHolocronMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/Archive.h"
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class GameInByteStream;
+class GameOutByteStream;
+
+//-----------------------------------------------------------------------
+
+/** The network message to close the client's holocron window
+ */
+class CloseHolocronMessage : public GameNetworkMessage
+{
+public:
+	CloseHolocronMessage();
+	explicit CloseHolocronMessage (Archive::ReadIterator& source);
+
+	static const char * const MessageType;
+};
+
+//-----------------------------------------------------------------------
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CommandChannelMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CommandChannelMessages.cpp
new file mode 100644
index 00000000..631f8c48
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CommandChannelMessages.cpp
@@ -0,0 +1,106 @@
+// CommandChannelMessages.cpp
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CommandChannelMessages.h"
+
+#include "Archive/ByteStream.h"
+#include "Archive/AutoByteStream.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+//----------------------------------------------------------------------
+
+const char * const CmdSceneReady::MessageType = "CmdSceneReady";
+
+//-----------------------------------------------------------------------
+
+CmdSceneReady::CmdSceneReady() :
+GameNetworkMessage(MessageType) 
+{
+}
+
+//-----------------------------------------------------------------------
+
+CmdSceneReady::CmdSceneReady(Archive::ReadIterator & source) :
+GameNetworkMessage(MessageType) 
+{
+	UNREF(source);
+}
+
+//-----------------------------------------------------------------------
+
+CmdSceneReady::~CmdSceneReady()
+{
+}
+
+//----------------------------------------------------------------------
+
+const char * const CmdStartScene::MessageType = "CmdStartScene";
+
+//-----------------------------------------------------------------------
+
+CmdStartScene::CmdStartScene(const NetworkId newObjectId,
+                             const std::string & newSceneName,
+                             const Vector newStartPosition,
+							 const float newStartYaw,
+                             const std::string & newTemplateName,
+							 const int64 t,
+							 const int32 e,
+							 bool disableSnapshot) :
+GameNetworkMessage(MessageType),
+disableWorldSnapshot(disableSnapshot),
+objectId(newObjectId),
+sceneName(newSceneName),
+startPosition(newStartPosition),
+startYaw(newStartYaw),
+templateName(newTemplateName),
+timeSeconds(t),
+serverEpoch(e)
+{
+	addVariable(disableWorldSnapshot);
+	addVariable(objectId);
+	addVariable(sceneName);
+	addVariable(startPosition);
+	addVariable(startYaw);
+	addVariable(templateName);
+	addVariable(timeSeconds);
+	addVariable(serverEpoch);
+}
+
+//-----------------------------------------------------------------------
+
+CmdStartScene::CmdStartScene(Archive::ReadIterator & source) :
+GameNetworkMessage(MessageType),
+disableWorldSnapshot(false),
+objectId(NetworkId::cms_invalid),
+sceneName(),
+startPosition(),
+startYaw(0.0f),
+templateName(),
+timeSeconds(),
+serverEpoch()
+{
+	addVariable(disableWorldSnapshot);
+	addVariable(objectId);
+	addVariable(sceneName);
+	addVariable(startPosition);
+	addVariable(startYaw);
+	addVariable(templateName);
+	addVariable(timeSeconds);
+	addVariable(serverEpoch);
+	AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+CmdStartScene::~CmdStartScene()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CommandChannelMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CommandChannelMessages.h
new file mode 100644
index 00000000..571e0d87
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CommandChannelMessages.h
@@ -0,0 +1,135 @@
+// CommandChannelMessages.h
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_COMMAND_CHANNEL_MESSAGES_H
+#define	_COMMAND_CHANNEL_MESSAGES_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "Unicode.h"
+#include "sharedMath/Vector.h"
+#include <string>
+#include <vector>
+
+
+//-----------------------------------------------------------------------
+
+class CmdSceneReady : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	CmdSceneReady	();
+	explicit CmdSceneReady	(Archive::ReadIterator & source);
+	virtual				~CmdSceneReady	();
+private:
+	CmdSceneReady(const CmdSceneReady & source);
+	CmdSceneReady & operator = (const CmdSceneReady & rhs);
+};
+
+//-----------------------------------------------------------------------
+
+class CmdStartScene : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+    CmdStartScene	(const NetworkId objectId, 
+		const std::string & newSceneName, 
+		const Vector newStartPosition,
+		const float newStartYaw,
+		const std::string & templateName,
+		const int64 serverTime,
+		const int32 serverEpoch,
+		bool disableWorldSnapshot);
+	
+    explicit CmdStartScene	(Archive::ReadIterator & source);
+    virtual	~CmdStartScene	();
+	
+	bool                        getDisableWorldSnapshot() const;
+    const NetworkId             getObjectId       () const;
+    const std::string &         getSceneName      () const;
+    const Vector&               getStartPosition  () const;
+    const float                 getStartYaw       () const;
+    const std::string &         getTemplateName   () const;
+	const int64                 getTimeSeconds    () const;
+	const int32                 getServerEpoch    () const;
+	
+private:
+	Archive::AutoVariable<bool>         disableWorldSnapshot;
+    Archive::AutoVariable<NetworkId>    objectId;
+    Archive::AutoVariable<std::string>  sceneName;
+    Archive::AutoVariable<Vector>       startPosition;
+	Archive::AutoVariable<float>        startYaw;
+    Archive::AutoVariable<std::string>  templateName;
+	Archive::AutoVariable<int64>        timeSeconds;
+	Archive::AutoVariable<int32>        serverEpoch;
+	
+    CmdStartScene();
+    CmdStartScene(const CmdStartScene&);
+    CmdStartScene& operator= (const CmdStartScene&);
+};
+
+//-----------------------------------------------------------------------
+
+inline bool CmdStartScene::getDisableWorldSnapshot() const
+{
+	return disableWorldSnapshot.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId CmdStartScene::getObjectId() const
+{
+	return objectId.get(); //lint !e1037 // const and non const conversion operators are irrelevent here, the return value is const
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CmdStartScene::getSceneName() const
+{
+	return sceneName.get(); //lint !e1037 
+}
+
+//-----------------------------------------------------------------------
+
+inline const Vector& CmdStartScene::getStartPosition() const
+{
+	return startPosition.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const float CmdStartScene::getStartYaw() const
+{
+	return startYaw.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & CmdStartScene::getTemplateName() const
+{
+	return templateName.get(); //lint !e1037 // const and non const conversion operators are irrelevent here, the return value is const
+}
+
+//-----------------------------------------------------------------------
+
+inline const int64 CmdStartScene::getTimeSeconds() const
+{
+	return timeSeconds.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const int32 CmdStartScene::getServerEpoch() const
+{
+	return serverEpoch.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _COMMAND_CHANNEL_MESSAGES_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsentResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsentResponseMessage.cpp
new file mode 100644
index 00000000..958ec7ae
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsentResponseMessage.cpp
@@ -0,0 +1,49 @@
+// ======================================================================
+//
+// ConsentResponseMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ConsentResponseMessage.h"
+
+
+// ======================================================================
+
+const char * const ConsentResponseMessage::cms_name = "ConsentResponseMessage";
+
+// ======================================================================
+
+ConsentResponseMessage::ConsentResponseMessage(const NetworkId& networkId, int id, bool response)
+: GameNetworkMessage (cms_name),
+  m_networkId        (networkId),
+  m_id               (id),
+  m_response         (response)
+{
+	addVariable(m_networkId);
+	addVariable(m_id);
+	addVariable(m_response);
+}
+
+//-----------------------------------------------------------------------
+
+ConsentResponseMessage::ConsentResponseMessage(Archive::ReadIterator & source)
+: GameNetworkMessage (cms_name),
+  m_networkId        (),
+  m_id               (),
+  m_response         ()
+{
+	addVariable(m_networkId);
+	addVariable(m_id);
+	addVariable(m_response);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ConsentResponseMessage::~ConsentResponseMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsentResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsentResponseMessage.h
new file mode 100644
index 00000000..3440ea7c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsentResponseMessage.h
@@ -0,0 +1,74 @@
+// ======================================================================
+//
+// ConsentResponseMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ConsentResponseMessage_H
+#define INCLUDED_ConsentResponseMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Connection Server
+ * Sent to:    Client
+ * Action:     Tells the client about it's Consents
+ *             connected to.
+ */
+class ConsentResponseMessage : public GameNetworkMessage
+{
+public:
+	ConsentResponseMessage(const NetworkId& networkId, int id, bool response);
+	explicit ConsentResponseMessage(Archive::ReadIterator & source);
+	virtual ~ConsentResponseMessage();
+
+public:
+	static const char * const cms_name;
+
+public:
+	const NetworkId& getNetworkId() const;
+	int  getId() const;
+	bool getResponse() const;
+
+private:
+	Archive::AutoVariable<NetworkId> m_networkId;
+	Archive::AutoVariable<int>       m_id;
+	Archive::AutoVariable<bool>      m_response;
+
+	ConsentResponseMessage();
+	ConsentResponseMessage(const ConsentResponseMessage&);
+	ConsentResponseMessage& operator= (const ConsentResponseMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId& ConsentResponseMessage::getNetworkId() const
+{
+	return m_networkId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int ConsentResponseMessage::getId() const
+{
+	return m_id.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ConsentResponseMessage::getResponse() const
+{
+	return m_response.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ClientCentralMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsoleChannelMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsoleChannelMessages.cpp
new file mode 100644
index 00000000..dc7c094d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsoleChannelMessages.cpp
@@ -0,0 +1,80 @@
+// ConsoleChannelMessages.cpp
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ConsoleChannelMessages.h"
+
+
+//-----------------------------------------------------------------------
+//	ConsoleGenericMessage : ConsoleChannelMessage
+
+//-----------------------------------------------------------------------
+
+const char * const ConGenericMessage::MessageType = "ConGenericMessage";
+
+//----------------------------------------------------------------------
+
+ConGenericMessage::ConGenericMessage(const std::string & consoleMsg, uint32 newMsgId) :
+GameNetworkMessage (ConGenericMessage::MessageType),
+msg                (consoleMsg),
+msgId              (newMsgId)
+{
+	if (consoleMsg.empty())
+	{
+		WARNING(true, ("ConGenericMessage constructed with empty message"));
+	}
+
+	addVariable(msg);
+	addVariable(msgId);
+}
+
+//-----------------------------------------------------------------------
+
+ConGenericMessage::ConGenericMessage(Archive::ReadIterator & source) :
+GameNetworkMessage (ConGenericMessage::MessageType),
+msg                (),
+msgId              (0)
+{										
+	addVariable(msg);
+	addVariable(msgId);
+	AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ConGenericMessage::~ConGenericMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const char * const ExecuteConsoleCommand::MessageType = "ExecuteConsoleCommand";
+
+//----------------------------------------------------------------------
+
+ExecuteConsoleCommand::ExecuteConsoleCommand(const std::string & consoleMsg) :
+GameNetworkMessage (ExecuteConsoleCommand::MessageType),
+m_command          (consoleMsg)
+{
+	addVariable(m_command);
+}
+
+//-----------------------------------------------------------------------
+
+ExecuteConsoleCommand::ExecuteConsoleCommand(Archive::ReadIterator & source) :
+GameNetworkMessage (ExecuteConsoleCommand::MessageType),
+m_command          ()
+{										
+	addVariable(m_command);
+	AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ExecuteConsoleCommand::~ExecuteConsoleCommand()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsoleChannelMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsoleChannelMessages.h
new file mode 100644
index 00000000..6b49e575
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ConsoleChannelMessages.h
@@ -0,0 +1,87 @@
+// ConsoleChannelMessages.h
+// copyright 2000 Verant Interactive
+// Author: Chris Mayer
+
+#ifndef	_CONSOLE_CHANNEL_MESSAGES_H
+#define	_CONSOLE_CHANNEL_MESSAGES_H
+
+//-----------------------------------------------------------------------
+
+class GameInByteStream;
+class GameOutByteStream;
+
+
+//-----------------------------------------------------------------------
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**	Send a generic console string */
+
+class ConGenericMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	explicit ConGenericMessage	(const std::string & consoleMsg, uint32 newMsgId = 0);
+	explicit ConGenericMessage	(Archive::ReadIterator & source);
+	virtual	~ConGenericMessage	();
+	const std::string &         getMsg				(void) const;
+	const uint32                getMsgId (void) const;
+
+private:
+	Archive::AutoVariable<std::string> msg;
+	Archive::AutoVariable<uint32>      msgId;
+
+	ConGenericMessage();
+	ConGenericMessage(const ConGenericMessage&);
+	ConGenericMessage& operator= (const ConGenericMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ConGenericMessage::getMsg(void) const
+{
+	return msg.get(); //lint !e1037 // ambiguity is irrelevent here
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint32 ConGenericMessage::getMsgId(void) const
+{
+	return msgId.get(); 
+}
+
+//-----------------------------------------------------------------------
+
+class ExecuteConsoleCommand : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	explicit ExecuteConsoleCommand	(const std::string & consoleMsg);
+	explicit ExecuteConsoleCommand	(Archive::ReadIterator & source);
+	virtual	~ExecuteConsoleCommand	();
+	const std::string &         getCommand(void) const;
+
+private:
+	Archive::AutoVariable<std::string> m_command;
+
+	ExecuteConsoleCommand();
+	ExecuteConsoleCommand(const ExecuteConsoleCommand&);
+	ExecuteConsoleCommand& operator= (const ExecuteConsoleCommand&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ExecuteConsoleCommand::getCommand(void) const
+{
+	return m_command.get(); //lint !e1037 // ambiguity is irrelevent here
+}
+
+//-----------------------------------------------------------------------
+
+#endif //_CONSOLE_CHANNEL_MESSAGES_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ControllerMessageFactory.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ControllerMessageFactory.cpp
new file mode 100644
index 00000000..369f5e98
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ControllerMessageFactory.cpp
@@ -0,0 +1,132 @@
+// ControllerMessageFactory.cpp
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+#include "Archive/Archive.h"
+#include "Archive/ByteStream.h"
+#include "Unicode.h"
+#include "localizationArchive/StringIdArchive.h"
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedGame/CraftingData.h"
+#include "sharedMath/Quaternion.h"
+#include "sharedMath/Transform.h"
+#include "sharedMathArchive/TransformArchive.h"
+
+#include "sharedNetworkMessages/ObjectMenuRequestDataArchive.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedUtility/InstallationResourceDataArchive.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+
+#include <map>
+#include <set>
+
+//-----------------------------------------------------------------------
+namespace ControllerMessageFactoryNamespace
+{
+	static std::map<int32, ControllerMessageFactory::ControllerMessagePackFunction> s_packFunctions;
+	static std::map<int32, ControllerMessageFactory::ControllerMessageUnpackFunction> s_unpackFunctions;
+	static std::set<int32> s_allowFromClient;
+	static bool s_installed = false;
+}
+
+using namespace ControllerMessageFactoryNamespace;
+
+namespace ControllerGenericPackFunctions
+{
+
+}
+
+//-----------------------------------------------------------------------
+
+void ControllerMessageFactory::install ()
+{
+	FATAL(s_installed, ("ControllerMessageFactory::install already installed"));
+
+	s_installed = true;
+}
+
+//-----------------------------------------------------------------------
+
+void ControllerMessageFactory::remove ()
+{
+	FATAL(!s_installed, ("ControllerMessageFactory::remove not installed"));
+	s_installed = false;
+}
+
+//-----------------------------------------------------------------------
+
+void ControllerMessageFactory::registerControllerMessageHandler (int32 message, ControllerMessagePackFunction pack, ControllerMessageUnpackFunction unpack, bool allowFromClient/* = false*/)
+{
+	FATAL(!s_installed, ("ControllerMessageFactory::register not installed"));
+	NOT_NULL(pack);
+	NOT_NULL(unpack);
+	DEBUG_WARNING(s_packFunctions.find(message) != s_packFunctions.end(), ("Registering pack function for a message %d that already exists", message));
+	DEBUG_WARNING(s_unpackFunctions.find(message) != s_unpackFunctions.end(), ("Registering unpack function for a message %d that already exists", message));
+	s_packFunctions[message] = pack;
+	s_unpackFunctions[message] = unpack;
+
+	if (allowFromClient)
+		IGNORE_RETURN(s_allowFromClient.insert(message));
+	else
+		IGNORE_RETURN(s_allowFromClient.erase(message));
+}
+
+//-----------------------------------------------------------------------
+
+
+void ControllerMessageFactory::pack(const int32 message, const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	FATAL(!s_installed, ("ControllerMessageFactory::pack not installed"));
+
+	std::map<int32, ControllerMessageFactory::ControllerMessagePackFunction>::iterator i = s_packFunctions.find(message);
+	if (i == s_packFunctions.end())
+	{
+		WARNING_STRICT_FATAL(true, ("ControllerMessageFactory::pack received a message %d which had no registered pack function.", message));
+	}
+	else
+	{
+		(i->second)(data, target);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+
+
+MessageQueue::Data* ControllerMessageFactory::unpack(const int32 message, Archive::ReadIterator & source)
+{
+	MessageQueue::Data* data = 0;
+	FATAL(!s_installed, ("ControllerMessageFactory::unpack not installed"));
+
+	std::map<int32, ControllerMessageFactory::ControllerMessageUnpackFunction>::iterator i = s_unpackFunctions.find(message);
+	if (i == s_unpackFunctions.end())
+	{
+		WARNING_STRICT_FATAL(true, ("ControllerMessageFactory::unpack received a message %d which had no registered unpack function.", message));
+	}
+	else
+	{
+		data = (i->second)(source);
+	}
+	return data;
+}
+
+//-----------------------------------------------------------------------
+
+bool ControllerMessageFactory::allowFromClient(const int32 message)
+{
+	return (s_allowFromClient.find(message) != s_allowFromClient.end());
+}
+
+//-----------------------------------------------------------------------
+
+
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ControllerMessageFactory.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ControllerMessageFactory.h
new file mode 100644
index 00000000..f6224e28
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ControllerMessageFactory.h
@@ -0,0 +1,48 @@
+// ControllerMessageFactory.h
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	INCLUDED_ControllerMessageFactory_H
+#define	INCLUDED_ControllerMessageFactory_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/MessageQueueGenericValueType.h"
+
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+}
+
+//-----------------------------------------------------------------------
+//@todo This is causing a dependency on the game.  We need to break this up.
+class ControllerMessageFactory
+{
+public:
+
+	static void                install();
+	static void                remove();
+
+	typedef void (*ControllerMessagePackFunction)(const MessageQueue::Data* data, Archive::ByteStream & target);
+	typedef MessageQueue::Data* (*ControllerMessageUnpackFunction)(Archive::ReadIterator & source);
+
+	static void registerControllerMessageHandler (int32 message, ControllerMessagePackFunction, ControllerMessageUnpackFunction, bool allowFromClient = false);
+
+	static void                pack                                     (const int32 message, const MessageQueue::Data* data, Archive::ByteStream & target);
+	static MessageQueue::Data* unpack                                   (const int32 message, Archive::ReadIterator & source);
+	static bool                allowFromClient                          (const int32 message);
+
+private:
+
+	ControllerMessageFactory ();
+	ControllerMessageFactory (const ControllerMessageFactory & source);
+	ControllerMessageFactory& operator= (const ControllerMessageFactory & rhs);
+	~ControllerMessageFactory ();
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _ControllerMessageFactory_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionMessage.cpp
new file mode 100644
index 00000000..0cdff397
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionMessage.cpp
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// CreateAuctionMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CreateAuctionMessage.h"
+
+// ======================================================================
+
+CreateAuctionMessage::CreateAuctionMessage(const NetworkId & itemId, const Unicode::String & itemLocalizedName, const NetworkId & containerId, int minimumBid, int auctionLength, const Unicode::String & userDescription, bool premium) :
+	GameNetworkMessage("CreateAuctionMessage"),
+	m_itemId(itemId),
+	m_itemLocalizedName(itemLocalizedName),
+	m_containerId(containerId),
+	m_minimumBid(minimumBid),
+	m_auctionLength(auctionLength),
+	m_userDescription(userDescription),
+	m_premium(premium)
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_itemLocalizedName);
+	AutoByteStream::addVariable(m_containerId);
+	AutoByteStream::addVariable(m_minimumBid);
+	AutoByteStream::addVariable(m_auctionLength);
+	AutoByteStream::addVariable(m_userDescription);
+	AutoByteStream::addVariable(m_premium);
+}
+
+// ======================================================================
+
+CreateAuctionMessage::CreateAuctionMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("CreateAuctionMessage"),
+	m_itemId(),
+	m_itemLocalizedName(),
+	m_containerId(),
+	m_minimumBid(),
+	m_auctionLength(),
+	m_userDescription(),
+	m_premium()
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_itemLocalizedName);
+	AutoByteStream::addVariable(m_containerId);
+	AutoByteStream::addVariable(m_minimumBid);
+	AutoByteStream::addVariable(m_auctionLength);
+	AutoByteStream::addVariable(m_userDescription);
+	AutoByteStream::addVariable(m_premium);
+	unpack(source);
+}
+
+// ======================================================================
+
+CreateAuctionMessage::~CreateAuctionMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionMessage.h
new file mode 100644
index 00000000..1ae78e16
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionMessage.h
@@ -0,0 +1,104 @@
+// ======================================================================
+//
+// CreateAuctionMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_CreateAuctionMessage_H
+#define	_CreateAuctionMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class CreateAuctionMessage : public GameNetworkMessage
+{
+public:
+
+	CreateAuctionMessage (const NetworkId & itemId, const Unicode::String & itemLocalizedName, const NetworkId & containerId, int minimumBid, int auctionLength, const Unicode::String & userDescription, bool premium = false );
+	explicit CreateAuctionMessage (Archive::ReadIterator &source);
+
+	~CreateAuctionMessage();
+
+public: // methods
+
+	const NetworkId &                getItemId          () const;
+	const Unicode::String &          getItemLocalizedName() const;
+	const NetworkId &                getContainerId     () const;
+	int                              getMinimumBid      () const;
+	int                              getAuctionLength   () const;
+	const Unicode::String &          getUserDescription () const;
+	bool                             isPremium          () const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId>             m_itemId;          //the item to be auctioned
+	Archive::AutoVariable<Unicode::String>       m_itemLocalizedName;
+	Archive::AutoVariable<NetworkId>             m_containerId;     //the auction container
+	Archive::AutoVariable<int>                   m_minimumBid;      //the minimum acceptable bid
+	Archive::AutoVariable<int>                   m_auctionLength;   //in seconds
+	Archive::AutoVariable<Unicode::String>       m_userDescription; //in seconds
+	Archive::AutoVariable<bool>                  m_premium; 
+};
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & CreateAuctionMessage::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & CreateAuctionMessage::getItemLocalizedName() const
+{
+	return m_itemLocalizedName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & CreateAuctionMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateAuctionMessage::getMinimumBid() const
+{
+	return m_minimumBid.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateAuctionMessage::getAuctionLength() const
+{
+	return m_auctionLength.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & CreateAuctionMessage::getUserDescription() const
+{
+	return m_userDescription.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CreateAuctionMessage::isPremium() const
+{
+	return m_premium.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _CreateAuctionMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionResponseMessage.cpp
new file mode 100644
index 00000000..ab8ada3f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionResponseMessage.cpp
@@ -0,0 +1,47 @@
+// ======================================================================
+//
+// CreateAuctionResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CreateAuctionResponseMessage.h"
+
+// ======================================================================
+
+const char * const CreateAuctionResponseMessage::MessageType = "CreateAuctionResponseMessage";
+
+//----------------------------------------------------------------------
+
+CreateAuctionResponseMessage::CreateAuctionResponseMessage(NetworkId itemId, AuctionResult result, std::string const &itemRestrictedRejectionMessage) :
+	GameNetworkMessage(MessageType),
+	m_itemId(itemId),
+	m_result(result),
+	m_itemRestrictedRejectionMessage(itemRestrictedRejectionMessage)
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_itemRestrictedRejectionMessage);
+}
+
+// ======================================================================
+
+CreateAuctionResponseMessage::CreateAuctionResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage(MessageType),
+	m_itemId(),
+	m_result(),
+	m_itemRestrictedRejectionMessage()
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_itemRestrictedRejectionMessage);
+	unpack(source);
+}
+
+// ======================================================================
+
+CreateAuctionResponseMessage::~CreateAuctionResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionResponseMessage.h
new file mode 100644
index 00000000..66a0a263
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateAuctionResponseMessage.h
@@ -0,0 +1,70 @@
+// ======================================================================
+//
+// CreateAuctionResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_CreateAuctionResponseMessage_H
+#define	_CreateAuctionResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/AuctionErrorCodes.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class CreateAuctionResponseMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	CreateAuctionResponseMessage(NetworkId itemId, AuctionResult result, std::string const &itemRestrictedRejectionMessage);
+	explicit CreateAuctionResponseMessage(Archive::ReadIterator &source);
+
+	~CreateAuctionResponseMessage();
+
+public: // methods
+
+	NetworkId                        getItemId() const;
+	AuctionResult                    getResult() const;
+	std::string const &              getItemRestrictedRejectionMessage() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId> m_itemId;        //the item to be auctioned
+	Archive::AutoVariable<int>       m_result;        //the auction container
+	Archive::AutoVariable<std::string> m_itemRestrictedRejectionMessage;
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId CreateAuctionResponseMessage::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline AuctionResult CreateAuctionResponseMessage::getResult() const
+{
+	return static_cast<AuctionResult>(m_result.get());
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & CreateAuctionResponseMessage::getItemRestrictedRejectionMessage() const
+{
+	return m_itemRestrictedRejectionMessage.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _CreateAuctionResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateClientPathMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateClientPathMessage.cpp
new file mode 100644
index 00000000..a1cbb68c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateClientPathMessage.cpp
@@ -0,0 +1,52 @@
+// ==================================================================
+//
+// CreateClientPathMessage.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CreateClientPathMessage.h"
+
+#include "sharedMathArchive/VectorArchive.h"
+
+// ==================================================================
+
+char const * const CreateClientPathMessage::cms_name = "CreateClientPathMessage";
+
+// ==================================================================
+
+CreateClientPathMessage::CreateClientPathMessage (std::vector<Vector> const & pointList) :
+	GameNetworkMessage (cms_name),
+	m_pointList ()
+{
+	m_pointList.set (pointList);
+	
+	addVariable (m_pointList);
+}
+
+// ------------------------------------------------------------------
+
+CreateClientPathMessage::CreateClientPathMessage (Archive::ReadIterator & source) :
+	GameNetworkMessage (cms_name),
+	m_pointList ()
+{
+	addVariable (m_pointList);
+
+	unpack (source);
+}
+
+// ------------------------------------------------------------------
+
+CreateClientPathMessage::~CreateClientPathMessage ()
+{
+}
+
+// ------------------------------------------------------------------
+
+std::vector<Vector> const & CreateClientPathMessage::getPointList () const
+{
+	return m_pointList.get ();
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateClientPathMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateClientPathMessage.h
new file mode 100644
index 00000000..ba214137
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateClientPathMessage.h
@@ -0,0 +1,44 @@
+// ==================================================================
+//
+// CreateClientPathMessage.h
+// Copyright 2003, Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_CreateClientPathMessage_H
+#define	INCLUDED_CreateClientPathMessage_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Vector.h"
+
+// ==================================================================
+
+class CreateClientPathMessage : public GameNetworkMessage
+{
+public: 
+
+	explicit CreateClientPathMessage (std::vector<Vector> const & pointList);
+	explicit CreateClientPathMessage (Archive::ReadIterator & source);
+	virtual ~CreateClientPathMessage ();
+
+	std::vector<Vector> const & getPointList () const;
+
+private:
+
+	CreateClientPathMessage ();
+
+public:
+
+	static char const * const cms_name;
+
+private:
+
+	Archive::AutoArray<Vector> m_pointList;
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateImmediateAuctionMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateImmediateAuctionMessage.cpp
new file mode 100644
index 00000000..c8a63c97
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateImmediateAuctionMessage.cpp
@@ -0,0 +1,63 @@
+// ======================================================================
+//
+// CreateImmediateAuctionMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CreateImmediateAuctionMessage.h"
+
+// ======================================================================
+
+CreateImmediateAuctionMessage::CreateImmediateAuctionMessage(const NetworkId & itemId, const Unicode::String & itemLocalizedName, const NetworkId & containerId, int price, int auctionLength, const Unicode::String & userDescription, bool premium, bool vendorTransfer) :
+	GameNetworkMessage("CreateImmediateAuctionMessage"),
+	m_itemId(itemId),
+	m_itemLocalizedName(itemLocalizedName),
+	m_containerId(containerId),
+	m_price(price),
+	m_auctionLength(auctionLength),
+	m_userDescription(userDescription),
+	m_premium(premium),
+	m_vendorTransfer(vendorTransfer)
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_itemLocalizedName);
+	AutoByteStream::addVariable(m_containerId);
+	AutoByteStream::addVariable(m_price);
+	AutoByteStream::addVariable(m_auctionLength);
+	AutoByteStream::addVariable(m_userDescription);
+	AutoByteStream::addVariable(m_premium);
+	AutoByteStream::addVariable(m_vendorTransfer);
+}
+
+// ======================================================================
+
+CreateImmediateAuctionMessage::CreateImmediateAuctionMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("CreateImmediateAuctionMessage"),
+	m_itemId(),
+	m_itemLocalizedName(),
+	m_containerId(),
+	m_price(),
+	m_auctionLength(),
+	m_userDescription(),
+	m_premium(),
+	m_vendorTransfer()
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_itemLocalizedName);
+	AutoByteStream::addVariable(m_containerId);
+	AutoByteStream::addVariable(m_price);
+	AutoByteStream::addVariable(m_auctionLength);
+	AutoByteStream::addVariable(m_userDescription);
+	AutoByteStream::addVariable(m_premium);
+	AutoByteStream::addVariable(m_vendorTransfer);
+	unpack(source);
+}
+
+// ======================================================================
+
+CreateImmediateAuctionMessage::~CreateImmediateAuctionMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateImmediateAuctionMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateImmediateAuctionMessage.h
new file mode 100644
index 00000000..9dddd233
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateImmediateAuctionMessage.h
@@ -0,0 +1,113 @@
+// ======================================================================
+//
+// CreateImmediateAuctionMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_CreateImmediateAuctionMessage_H
+#define	_CreateImmediateAuctionMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class CreateImmediateAuctionMessage : public GameNetworkMessage
+{
+public:
+
+	CreateImmediateAuctionMessage(const NetworkId & itemId, const Unicode::String & itemLocalizedName, const NetworkId & containerId, int price, int auctionLength, const Unicode::String & userDescription, bool premium = false, bool vendorTransfer = false );
+	explicit CreateImmediateAuctionMessage(Archive::ReadIterator &source);
+
+	~CreateImmediateAuctionMessage();
+
+public: // methods
+
+	const NetworkId &                getItemId() const;
+	const Unicode::String &          getItemLocalizedName() const;
+	const NetworkId &                getContainerId() const;
+	int                              getPrice() const;
+	int                              getAuctionLength() const;
+	const Unicode::String &          getUserDescription() const;
+	bool                             isPremium() const;
+	bool                             isVendorTransfer() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId>             m_itemId;          //the item to be auctioned
+	Archive::AutoVariable<Unicode::String>       m_itemLocalizedName;
+	Archive::AutoVariable<NetworkId>             m_containerId;     //the auction container
+	Archive::AutoVariable<int>                   m_price;           //the price of the item
+	Archive::AutoVariable<int>                   m_auctionLength;   //in seconds
+	Archive::AutoVariable<Unicode::String>       m_userDescription; //in seconds
+	Archive::AutoVariable<bool>                  m_premium;
+	Archive::AutoVariable<bool>                  m_vendorTransfer;
+};
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & CreateImmediateAuctionMessage::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & CreateImmediateAuctionMessage::getItemLocalizedName() const
+{
+	return m_itemLocalizedName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & CreateImmediateAuctionMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateImmediateAuctionMessage::getPrice() const
+{
+	return m_price.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateImmediateAuctionMessage::getAuctionLength() const
+{
+	return m_auctionLength.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & CreateImmediateAuctionMessage::getUserDescription() const
+{
+	return m_userDescription.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CreateImmediateAuctionMessage::isPremium() const
+{
+	return m_premium.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CreateImmediateAuctionMessage::isVendorTransfer() const
+{
+	return m_vendorTransfer.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _CreateImmediateAuctionMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateMissileMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateMissileMessage.cpp
new file mode 100644
index 00000000..271ea03d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateMissileMessage.cpp
@@ -0,0 +1,62 @@
+// ======================================================================
+//
+// CreateMissileMessage.cpp
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CreateMissileMessage.h"
+
+// ======================================================================
+
+CreateMissileMessage::CreateMissileMessage(int missileId, const NetworkId &source, const NetworkId &target, const Vector & sourceLocation, const Vector & targetLocation, int impactTime, int missileTypeId, int weaponId, int targetComponent) :
+		GameNetworkMessage("CreateMissileMessage"),
+		m_missileId(missileId),
+		m_source(source),
+		m_target(target),
+		m_sourceLocation(sourceLocation),
+		m_targetLocation(targetLocation),
+		m_impactTime(impactTime),
+		m_missileTypeId(missileTypeId),
+		m_weaponId(weaponId),
+		m_targetComponent(targetComponent)
+{
+	addVariable(m_missileId);
+	addVariable(m_source);
+	addVariable(m_target);
+	addVariable(m_sourceLocation);
+	addVariable(m_targetLocation);
+	addVariable(m_impactTime);
+	addVariable(m_missileTypeId);
+	addVariable(m_weaponId);
+	addVariable(m_targetComponent);
+}
+
+// ----------------------------------------------------------------------
+
+CreateMissileMessage::CreateMissileMessage(Archive::ReadIterator &source) :
+		GameNetworkMessage("CreateMissileMessage"),
+		m_missileId(),
+		m_source(),
+		m_target(),
+		m_sourceLocation(),
+		m_targetLocation(),
+		m_impactTime(),
+		m_missileTypeId(),
+		m_weaponId(),
+		m_targetComponent()
+{
+	addVariable(m_missileId);
+	addVariable(m_source);
+	addVariable(m_target);
+	addVariable(m_sourceLocation);
+	addVariable(m_targetLocation);
+	addVariable(m_impactTime);
+	addVariable(m_missileTypeId);
+	addVariable(m_weaponId);
+	addVariable(m_targetComponent);
+	unpack(source); //lint !e1506 // Call to virtual -- the way our system works requires this, and it seems to work OK
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateMissileMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateMissileMessage.h
new file mode 100644
index 00000000..ed05cf7b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateMissileMessage.h
@@ -0,0 +1,115 @@
+// ======================================================================
+//
+// CreateMissileMessage.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_CreateMissileMessage_H
+#define INCLUDED_CreateMissileMessage_H
+
+// ======================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class CreateMissileMessage : public GameNetworkMessage
+{
+  public:
+	CreateMissileMessage(int missileId, const NetworkId &source, const NetworkId &target, const Vector & sourceLocation, const Vector & targetLocation, int impactTime, int missileTypeId, int weaponId, int targetComponent);
+	explicit CreateMissileMessage(Archive::ReadIterator &source);
+
+  public:
+	int getMissileId() const;
+	const NetworkId & getSource() const;
+	const NetworkId & getTarget() const;
+	const Vector & getSourceLocation() const;
+	const Vector & getTargetLocation() const;
+	int getImpactTime() const;
+	int getMissileTypeId() const;
+	int getWeaponId() const;
+	int getTargetComponent() const;
+	
+  private:
+	Archive::AutoVariable<int> m_missileId;
+	Archive::AutoVariable<NetworkId> m_source;
+	Archive::AutoVariable<NetworkId> m_target;
+	Archive::AutoVariable<Vector> m_sourceLocation;
+	Archive::AutoVariable<Vector> m_targetLocation;
+	Archive::AutoVariable<int> m_impactTime;
+	Archive::AutoVariable<int> m_missileTypeId;
+	Archive::AutoVariable<int> m_weaponId;
+	Archive::AutoVariable<int> m_targetComponent;
+};
+
+// ======================================================================
+
+inline int CreateMissileMessage::getMissileId() const
+{
+	return m_missileId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & CreateMissileMessage::getSource() const
+{
+	return m_source.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & CreateMissileMessage::getTarget() const
+{
+	return m_target.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Vector & CreateMissileMessage::getSourceLocation() const
+{
+	return m_sourceLocation.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Vector & CreateMissileMessage::getTargetLocation() const
+{
+	return m_targetLocation.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateMissileMessage::getImpactTime() const
+{
+	return m_impactTime.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateMissileMessage::getMissileTypeId() const
+{
+	return m_missileTypeId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int CreateMissileMessage::getWeaponId() const
+{
+	return m_weaponId.get();
+}
+	
+// ----------------------------------------------------------------------
+
+inline int CreateMissileMessage::getTargetComponent() const
+{
+	return m_targetComponent.get();
+}
+	
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateNebulaLightningMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateNebulaLightningMessage.cpp
new file mode 100644
index 00000000..df3ce1b8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateNebulaLightningMessage.cpp
@@ -0,0 +1,41 @@
+//======================================================================
+//
+// CreateNebulaLightningMessage.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CreateNebulaLightningMessage.h"
+
+//======================================================================
+
+char const * const CreateNebulaLightningMessage::MessageType = "CreateNebulaLightningMessage";
+
+//----------------------------------------------------------------------
+
+CreateNebulaLightningMessage::CreateNebulaLightningMessage(NebulaLightningData const & nebulaLightningData) :
+GameNetworkMessage(MessageType),
+m_nebulaLightningData(nebulaLightningData)
+{
+	addVariable(m_nebulaLightningData);
+}
+
+//----------------------------------------------------------------------
+
+CreateNebulaLightningMessage::CreateNebulaLightningMessage(Archive::ReadIterator &source) :
+GameNetworkMessage(MessageType),
+m_nebulaLightningData()
+{
+	addVariable(m_nebulaLightningData);
+	unpack(source);
+}
+
+//----------------------------------------------------------------------
+
+NebulaLightningData const & CreateNebulaLightningMessage::getNebulaLightningData() const
+{
+	return m_nebulaLightningData.get();
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateNebulaLightningMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateNebulaLightningMessage.h
new file mode 100644
index 00000000..bc7eb8ba
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateNebulaLightningMessage.h
@@ -0,0 +1,36 @@
+//======================================================================
+//
+// CreateNebulaLightningMessage.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_CreateNebulaLightningMessage_H
+#define INCLUDED_CreateNebulaLightningMessage_H
+
+//======================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/NebulaLightningData.h"
+
+//----------------------------------------------------------------------
+
+class CreateNebulaLightningMessage : public GameNetworkMessage
+{
+public:
+
+	static char const * const MessageType;
+
+	explicit CreateNebulaLightningMessage(NebulaLightningData const & nebulaLightningData);
+	explicit CreateNebulaLightningMessage(Archive::ReadIterator &source);
+
+	NebulaLightningData const & getNebulaLightningData() const;
+
+private:
+	Archive::AutoVariable<NebulaLightningData> m_nebulaLightningData;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateProjectileMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateProjectileMessage.cpp
new file mode 100644
index 00000000..ebc9367e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateProjectileMessage.cpp
@@ -0,0 +1,108 @@
+// ======================================================================
+//
+// CreateProjectileMessage.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CreateProjectileMessage.h"
+
+#include "sharedGame/ShipChassisSlotType.h"
+
+#include "sharedMathArchive/TransformArchive.h"
+
+// ======================================================================
+
+CreateProjectileMessage::CreateProjectileMessage(uint16 shipId, int weaponIndex, int projectileIndex, int targetedComponent, Transform const &transform_p, uint32 syncStampLong) :
+	GameNetworkMessage("CreateProjectileMessage"),
+	m_shipId(shipId),
+	m_weaponIndex(static_cast<int8>(weaponIndex)),
+	m_projectileIndex(static_cast<int8>(projectileIndex)),
+	m_targetedComponent(static_cast<int8>(targetedComponent)),
+	m_startPosition_p(transform_p.getPosition_p()),
+	m_direction_p(transform_p.getLocalFrameK_p()*7800.f),
+	m_syncStampLong(syncStampLong)
+{
+	addVariable(m_shipId);
+	addVariable(m_weaponIndex);
+	addVariable(m_projectileIndex);
+	addVariable(m_targetedComponent);
+	addVariable(m_startPosition_p);
+	addVariable(m_direction_p);
+	addVariable(m_syncStampLong);
+}
+
+// ----------------------------------------------------------------------
+
+CreateProjectileMessage::CreateProjectileMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("CreateProjectileMessage"),
+	m_shipId(),
+	m_weaponIndex(0),
+	m_projectileIndex(0),
+	m_targetedComponent(static_cast<int8>(ShipChassisSlotType::SCST_num_types)),
+	m_startPosition_p(),
+	m_direction_p(),
+	m_syncStampLong(0)
+{
+	addVariable(m_shipId);
+	addVariable(m_weaponIndex);
+	addVariable(m_projectileIndex);
+	addVariable(m_targetedComponent);
+	addVariable(m_startPosition_p);
+	addVariable(m_direction_p);
+	addVariable(m_syncStampLong);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+uint16 CreateProjectileMessage::getShipId() const
+{
+	return m_shipId.get();
+}
+
+// ----------------------------------------------------------------------
+
+int CreateProjectileMessage::getWeaponIndex() const
+{
+	return m_weaponIndex.get();
+}
+
+// ----------------------------------------------------------------------
+
+int CreateProjectileMessage::getProjectileIndex() const
+{
+	return m_projectileIndex.get();
+}
+
+// ----------------------------------------------------------------------
+
+int CreateProjectileMessage::getTargetedComponent() const
+{
+	return m_targetedComponent.get();
+}
+
+// ----------------------------------------------------------------------
+
+Transform const CreateProjectileMessage::getTransform_p() const
+{
+	Transform ret(Transform::IF_none);
+	Vector const &startPosition_p = m_startPosition_p.get().get();
+	Vector direction_p = m_direction_p.get().get();
+	direction_p.normalize();
+	ret.setLocalFrameKJ_p(direction_p, Vector::perpendicular(direction_p));
+	ret.setPosition_p(startPosition_p);
+	return ret;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 CreateProjectileMessage::getSyncStampLong() const
+{
+	return m_syncStampLong.get();
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateProjectileMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateProjectileMessage.h
new file mode 100644
index 00000000..85782cd3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/CreateProjectileMessage.h
@@ -0,0 +1,48 @@
+// ======================================================================
+//
+// CreateProjectileMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_CreateProjectileMessage_H_
+#define	_CreateProjectileMessage_H_
+
+// ======================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Transform.h"
+#include "sharedUtility/PackedPosition.h"
+
+// ======================================================================
+
+class CreateProjectileMessage: public GameNetworkMessage
+{
+public:
+	CreateProjectileMessage(uint16 shipId, int weaponIndex, int projectileIndex, int targetedComponent, Transform const &transform_p, uint32 syncStampLong);
+	explicit CreateProjectileMessage(Archive::ReadIterator &source);
+
+public:
+	uint16 getShipId() const;
+	int getWeaponIndex() const;
+	int getProjectileIndex() const;
+	int getTargetedComponent() const;
+	Transform const getTransform_p() const;
+	uint32 getSyncStampLong() const;
+
+private: 
+	Archive::AutoVariable<uint16> m_shipId;
+	Archive::AutoVariable<int8> m_weaponIndex;
+	Archive::AutoVariable<int8> m_projectileIndex;
+	Archive::AutoVariable<int8> m_targetedComponent;
+	Archive::AutoVariable<PackedPosition> m_startPosition_p;
+	Archive::AutoVariable<PackedPosition> m_direction_p;
+	Archive::AutoVariable<uint32> m_syncStampLong;
+};
+
+// ======================================================================
+
+#endif // _CreateProjectileMessage_H_
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterMessage.cpp
new file mode 100644
index 00000000..5295633b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterMessage.cpp
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// DeleteCharacterMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/DeleteCharacterMessage.h"
+
+// ======================================================================
+
+DeleteCharacterMessage::DeleteCharacterMessage(uint32 clusterId, const NetworkId &characterId) :
+		GameNetworkMessage("DeleteCharacterMessage"),
+		m_clusterId(clusterId),
+		m_characterId(characterId)
+{
+	addVariable(m_clusterId);
+	addVariable(m_characterId);
+}
+
+//-----------------------------------------------------------------------
+
+DeleteCharacterMessage::DeleteCharacterMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("DeleteCharacterMessage"),
+		m_clusterId(),
+		m_characterId()
+{
+	addVariable(m_clusterId);
+	addVariable(m_characterId);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+DeleteCharacterMessage::~DeleteCharacterMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterMessage.h
new file mode 100644
index 00000000..6eb25110
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterMessage.h
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// DeleteCharacterMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_DeleteCharacterMessage_H
+#define INCLUDED_DeleteCharacterMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class DeleteCharacterMessage : public GameNetworkMessage
+{
+public:
+	DeleteCharacterMessage(uint32 clusterId, const NetworkId &characterId);
+	explicit DeleteCharacterMessage(Archive::ReadIterator & source);
+	virtual ~DeleteCharacterMessage();
+
+  public:
+	uint32 getClusterId() const;
+	const NetworkId &getCharacterId() const;
+	
+private:
+	Archive::AutoVariable<uint32> m_clusterId;
+	Archive::AutoVariable<NetworkId> m_characterId;
+
+	DeleteCharacterMessage();
+	DeleteCharacterMessage(const DeleteCharacterMessage&);
+	DeleteCharacterMessage& operator= (const DeleteCharacterMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline uint32 DeleteCharacterMessage::getClusterId() const
+{
+	return m_clusterId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & DeleteCharacterMessage::getCharacterId() const
+{
+	return m_characterId.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ClientCentralMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterReplyMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterReplyMessage.cpp
new file mode 100644
index 00000000..c3f495c7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterReplyMessage.cpp
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// DeleteCharacterReplyMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/DeleteCharacterReplyMessage.h"
+
+// ======================================================================
+
+const char * const DeleteCharacterReplyMessage::MessageType = "DeleteCharacterReplyMessage";
+
+//----------------------------------------------------------------------
+
+DeleteCharacterReplyMessage::DeleteCharacterReplyMessage(ResultCode resultCode) :
+GameNetworkMessage(MessageType),
+m_resultCode(static_cast<int>(resultCode))
+{
+	addVariable(m_resultCode);
+}
+
+//-----------------------------------------------------------------------
+
+DeleteCharacterReplyMessage::DeleteCharacterReplyMessage(Archive::ReadIterator & source) :
+GameNetworkMessage(MessageType),
+m_resultCode()
+{
+	addVariable(m_resultCode);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+DeleteCharacterReplyMessage::~DeleteCharacterReplyMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterReplyMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterReplyMessage.h
new file mode 100644
index 00000000..e63657cb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DeleteCharacterReplyMessage.h
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// DeleteCharacterReplyMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_DeleteCharacterReplyMessage_H
+#define INCLUDED_DeleteCharacterReplyMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class DeleteCharacterReplyMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	enum ResultCode {rc_OK, rc_ALREADY_IN_PROGRESS, rc_CLUSTER_DOWN};
+	
+public:
+	DeleteCharacterReplyMessage(ResultCode resultCode);
+	explicit DeleteCharacterReplyMessage(Archive::ReadIterator & source);
+	virtual ~DeleteCharacterReplyMessage();
+	
+public:
+	ResultCode getResultCode() const;
+	
+private:
+	Archive::AutoVariable<int> m_resultCode;
+	
+	DeleteCharacterReplyMessage();
+	DeleteCharacterReplyMessage(const DeleteCharacterReplyMessage&);
+	DeleteCharacterReplyMessage& operator= (const DeleteCharacterReplyMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline DeleteCharacterReplyMessage::ResultCode DeleteCharacterReplyMessage::getResultCode() const
+{
+	return static_cast<ResultCode>(m_resultCode.get());
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ClientCentralMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyClientPathMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyClientPathMessage.cpp
new file mode 100644
index 00000000..023c46da
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyClientPathMessage.cpp
@@ -0,0 +1,35 @@
+// ==================================================================
+//
+// DestroyClientPathMessage.h
+// Copyright 2003, Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/DestroyClientPathMessage.h"
+
+// ==================================================================
+
+char const * const DestroyClientPathMessage::cms_name = "DestroyClientPathMessage";
+
+// ==================================================================
+
+DestroyClientPathMessage::DestroyClientPathMessage () :
+	GameNetworkMessage (cms_name)
+{
+}
+
+// ------------------------------------------------------------------
+
+DestroyClientPathMessage::DestroyClientPathMessage (Archive::ReadIterator& /*source*/) :
+	GameNetworkMessage (cms_name)
+{
+}
+
+// ------------------------------------------------------------------
+
+DestroyClientPathMessage::~DestroyClientPathMessage ()
+{
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyClientPathMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyClientPathMessage.h
new file mode 100644
index 00000000..accafc1e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyClientPathMessage.h
@@ -0,0 +1,33 @@
+// ==================================================================
+//
+// DestroyClientPathMessage.h
+// Copyright 2003, Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_DestroyClientPathMessage_H
+#define	INCLUDED_DestroyClientPathMessage_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ==================================================================
+
+class DestroyClientPathMessage : public GameNetworkMessage
+{
+public: 
+
+	DestroyClientPathMessage ();
+	explicit DestroyClientPathMessage (Archive::ReadIterator &source);
+	virtual ~DestroyClientPathMessage();
+
+public:
+
+	static char const * const cms_name;
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipComponentMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipComponentMessage.cpp
new file mode 100644
index 00000000..1fb10966
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipComponentMessage.cpp
@@ -0,0 +1,66 @@
+// ======================================================================
+//
+// DestroyShipComponentMessage.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/DestroyShipComponentMessage.h"
+
+// ======================================================================
+
+char const * const DestroyShipComponentMessage::MessageType = "DestroyShipComponentMessage";
+
+//----------------------------------------------------------------------
+
+DestroyShipComponentMessage::DestroyShipComponentMessage(NetworkId const &shipId, int chassisSlot, float severity) :
+GameNetworkMessage(MessageType),
+m_shipId(shipId),
+m_chassisSlot(chassisSlot),
+m_severity(severity)
+{
+	addVariable(m_shipId);
+	addVariable(m_chassisSlot);
+	addVariable(m_severity);
+}
+
+// ----------------------------------------------------------------------
+
+DestroyShipComponentMessage::DestroyShipComponentMessage(Archive::ReadIterator &source) :
+GameNetworkMessage(MessageType),
+m_shipId(),
+m_chassisSlot(0),
+m_severity(0.0f)
+{
+	addVariable(m_shipId);
+	addVariable(m_chassisSlot);
+	addVariable(m_severity);
+
+	unpack(source);
+}
+
+
+//----------------------------------------------------------------------
+
+NetworkId const &DestroyShipComponentMessage::getShipId() const
+{
+	return m_shipId.get();
+}
+
+//----------------------------------------------------------------------
+
+int DestroyShipComponentMessage::getChassisSlot() const
+{
+	return m_chassisSlot.get();
+}
+
+//----------------------------------------------------------------------
+
+float DestroyShipComponentMessage::getSeverity() const
+{
+	return m_severity.get();
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipComponentMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipComponentMessage.h
new file mode 100644
index 00000000..1ac31239
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipComponentMessage.h
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// DestroyShipComponentMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_DestroyShipComponentMessage_H_
+#define	_DestroyShipComponentMessage_H_
+
+// ======================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+// ======================================================================
+
+class DestroyShipComponentMessage: public GameNetworkMessage
+{
+public:
+
+	static char const * const MessageType;
+
+	DestroyShipComponentMessage(NetworkId const &shipId, int chassisSlot, float severity);
+	explicit DestroyShipComponentMessage(Archive::ReadIterator &source);
+
+public:
+	NetworkId const &getShipId() const;
+	int getChassisSlot() const;
+	float getSeverity() const;
+
+private: 
+	Archive::AutoVariable<NetworkId> m_shipId;
+	Archive::AutoVariable<int> m_chassisSlot;
+	Archive::AutoVariable<float> m_severity;
+};
+
+// ======================================================================
+
+#endif // _DestroyShipComponentMessage_H_
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipMessage.cpp
new file mode 100644
index 00000000..85517d5c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipMessage.cpp
@@ -0,0 +1,55 @@
+// ======================================================================
+//
+// DestroyShipMessage.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/DestroyShipMessage.h"
+
+// ======================================================================
+
+char const * const DestroyShipMessage::MessageType = "DestroyShipMessage";
+
+//----------------------------------------------------------------------
+
+DestroyShipMessage::DestroyShipMessage(NetworkId const &shipId, float severity) :
+GameNetworkMessage(MessageType),
+m_shipId(shipId),
+m_severity(severity)
+{
+	addVariable(m_shipId);
+	addVariable(m_severity);
+}
+
+// ----------------------------------------------------------------------
+
+DestroyShipMessage::DestroyShipMessage(Archive::ReadIterator &source) :
+GameNetworkMessage(MessageType),
+m_shipId(),
+m_severity(0.0f)
+{
+	addVariable(m_shipId);
+	addVariable(m_severity);
+
+	unpack(source);
+}
+
+
+//----------------------------------------------------------------------
+
+NetworkId const &DestroyShipMessage::getShipId() const
+{
+	return m_shipId.get();
+}
+
+//----------------------------------------------------------------------
+
+float DestroyShipMessage::getSeverity() const
+{
+	return m_severity.get();
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipMessage.h
new file mode 100644
index 00000000..e8cabccd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DestroyShipMessage.h
@@ -0,0 +1,41 @@
+// ======================================================================
+//
+// DestroyShipMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_DestroyShipMessage_H_
+#define	_DestroyShipMessage_H_
+
+// ======================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+// ======================================================================
+
+class DestroyShipMessage: public GameNetworkMessage
+{
+public:
+
+	static char const * const MessageType;
+
+	DestroyShipMessage(NetworkId const &shipId, float severity);
+	explicit DestroyShipMessage(Archive::ReadIterator &source);
+
+public:
+	NetworkId const &getShipId() const;
+	float getSeverity() const;
+
+private: 
+	Archive::AutoVariable<NetworkId> m_shipId;
+	Archive::AutoVariable<float> m_severity;
+};
+
+// ======================================================================
+
+#endif // _DestroyShipMessage_H_
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DroidCommandProgrammingMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DroidCommandProgrammingMessage.cpp
new file mode 100644
index 00000000..89f58bed
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DroidCommandProgrammingMessage.cpp
@@ -0,0 +1,124 @@
+// DroidCommandProgrammingMessage.cpp
+// Copyright 2004, Sony Online Entertainment Inc., all rights reserved. 
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/DroidCommandProgrammingMessage.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(DroidCommandProgrammingMessage, CM_droidCommandProgramming);
+
+//-----------------------------------------------------------------------
+
+DroidCommandProgrammingMessage::DroidCommandProgrammingMessage() :
+MessageQueue::Data(),
+m_commands(),
+m_chipsToAdd(),
+m_chipsToRemove(),
+m_droidControlDevice()
+{
+}
+
+//-----------------------------------------------------------------------
+
+DroidCommandProgrammingMessage & DroidCommandProgrammingMessage::operator=(const DroidCommandProgrammingMessage & rhs)
+{
+	if (this == &rhs)
+		return *this;
+
+	m_commands = rhs.m_commands;
+	m_chipsToAdd = rhs.m_chipsToAdd;
+	m_chipsToRemove = rhs.m_chipsToRemove;
+	m_droidControlDevice = rhs.m_droidControlDevice;
+
+	return *this;
+}
+
+//-----------------------------------------------------------------------
+
+void DroidCommandProgrammingMessage::pack(MessageQueue::Data const * const data, Archive::ByteStream & target)
+{
+	DroidCommandProgrammingMessage const * const msg = safe_cast<DroidCommandProgrammingMessage const *> (data);
+
+	if (msg)
+	{
+		std::vector<std::string> const & commands = msg->getCommands();
+		int size = commands.size(); //lint !e713 signed / unsigned
+		Archive::put(target, size);
+		for(std::vector<std::string>::const_iterator i = commands.begin(); i != commands.end(); ++i)
+		{
+			Archive::put(target, *i);
+		}
+
+		std::vector<NetworkId> const & chipsToAdd = msg->getChipsToAdd();
+		size = chipsToAdd.size(); //lint !e713 signed / unsigned
+		Archive::put(target, size);
+		for(std::vector<NetworkId>::const_iterator j = chipsToAdd.begin(); j != chipsToAdd.end(); ++j)
+		{
+			Archive::put(target, *j);
+		}
+
+		std::vector<NetworkId> const & chipsToRemove = msg->getChipsToRemove();
+		size = chipsToRemove.size(); //lint !e713 signed / unsigned
+		Archive::put(target, size);
+		for(std::vector<NetworkId>::const_iterator k = chipsToRemove.begin(); k != chipsToRemove.end(); ++k)
+		{
+			Archive::put(target, *k);
+		}
+
+		Archive::put(target, msg->getDroidControlDevice());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* DroidCommandProgrammingMessage::unpack(Archive::ReadIterator & source)
+{
+	DroidCommandProgrammingMessage * msg = new DroidCommandProgrammingMessage;
+
+	std::string command;
+	std::vector<std::string> commands;
+	int size = 0;
+	Archive::get(source, size);
+	for(int i = 0; i < size; ++i)
+	{
+		Archive::get(source, command);
+		commands.push_back(command);
+	}
+	msg->setCommands(commands);
+
+	std::vector<NetworkId> chips;
+	NetworkId chip;
+	Archive::get(source, size);
+	for(int j = 0; j < size; ++j)
+	{
+		Archive::get(source, chip);
+		chips.push_back(chip);
+	}
+	msg->setChipsToAdd(chips);
+
+	chips.clear();
+	Archive::get(source, size);
+	for(int k = 0; k < size; ++k)
+	{
+		Archive::get(source, chip);
+		chips.push_back(chip);
+	}
+	msg->setChipsToRemove(chips);
+
+	NetworkId networkId;
+	Archive::get(source, networkId);
+	msg->setDroidControlDevice(networkId);
+	return msg;
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DroidCommandProgrammingMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DroidCommandProgrammingMessage.h
new file mode 100644
index 00000000..a2516c42
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/DroidCommandProgrammingMessage.h
@@ -0,0 +1,108 @@
+// DroidCommandProgrammingMessage.h
+// Copyright 2004, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef	_INCLUDED_DroidCommandProgrammingMessage_H
+#define	_INCLUDED_DroidCommandProgrammingMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+class DroidCommandProgrammingMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+public:
+	DroidCommandProgrammingMessage();
+	DroidCommandProgrammingMessage & operator=(const DroidCommandProgrammingMessage & rhs);
+
+	//accessors
+	std::vector<std::string> const & getCommands() const;
+	std::vector<NetworkId> const & getChipsToAdd() const;
+	std::vector<NetworkId> const & getChipsToRemove() const;
+	NetworkId const & getDroidControlDevice() const;
+
+	//mutators
+	void setCommands(std::vector<std::string> const & commands);
+	void setChipsToAdd(std::vector<NetworkId> const & chipsToAdd);
+	void setChipsToRemove(std::vector<NetworkId> const & chipsToRemove);
+	void setDroidControlDevice(NetworkId const & droidControlDevice);
+
+private:
+	//disabled
+	DroidCommandProgrammingMessage(DroidCommandProgrammingMessage const & source);
+
+private:
+	std::vector<std::string> m_commands;
+	std::vector<NetworkId> m_chipsToAdd;
+	std::vector<NetworkId> m_chipsToRemove;
+	NetworkId m_droidControlDevice;
+};
+
+//-----------------------------------------------------------------------
+
+inline std::vector<std::string> const & DroidCommandProgrammingMessage::getCommands() const
+{
+	return m_commands;
+}
+
+//-----------------------------------------------------------------------
+
+inline std::vector<NetworkId> const & DroidCommandProgrammingMessage::getChipsToAdd() const
+{
+	return m_chipsToAdd;
+}
+
+//-----------------------------------------------------------------------
+
+inline std::vector<NetworkId> const & DroidCommandProgrammingMessage::getChipsToRemove() const
+{
+	return m_chipsToRemove;
+}
+
+//-----------------------------------------------------------------------
+
+inline NetworkId const & DroidCommandProgrammingMessage::getDroidControlDevice() const
+{
+	return m_droidControlDevice;
+}
+
+//-----------------------------------------------------------------------
+
+inline void DroidCommandProgrammingMessage::setCommands(std::vector<std::string> const & commands)
+{
+	m_commands = commands;
+}
+
+//-----------------------------------------------------------------------
+
+inline void DroidCommandProgrammingMessage::setChipsToAdd(std::vector<NetworkId> const & chipsToAdd)
+{
+	m_chipsToAdd = chipsToAdd;
+}
+
+//-----------------------------------------------------------------------
+
+inline void DroidCommandProgrammingMessage::setChipsToRemove(std::vector<NetworkId> const & chipsToRemove)
+{
+	m_chipsToRemove = chipsToRemove;
+}
+
+//-----------------------------------------------------------------------
+
+inline void DroidCommandProgrammingMessage::setDroidControlDevice(NetworkId const & droidControlDevice)
+{
+	m_droidControlDevice = droidControlDevice;
+}
+
+//-----------------------------------------------------------------------
+
+#endif
+// _INCLUDED_DroidCommandProgrammingMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditAppearanceMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditAppearanceMessage.cpp
new file mode 100644
index 00000000..f8697591
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditAppearanceMessage.cpp
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// EditAppearanceMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/EditAppearanceMessage.h"
+
+// ======================================================================
+
+const char * const EditAppearanceMessage::MessageType = "EditAppearanceMessage";
+
+//----------------------------------------------------------------------
+
+EditAppearanceMessage::EditAppearanceMessage(const NetworkId & target) :
+GameNetworkMessage(MessageType),
+m_target(target)
+{
+	addVariable(m_target);
+}
+
+//----------------------------------------------------------------------
+
+EditAppearanceMessage::EditAppearanceMessage(Archive::ReadIterator &source) :
+GameNetworkMessage(MessageType),
+m_target()
+{
+	addVariable(m_target);
+	unpack(source);
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditAppearanceMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditAppearanceMessage.h
new file mode 100644
index 00000000..46daf53f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditAppearanceMessage.h
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// EditAppearanceMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_EditAppearanceMessage_H
+#define	_EditAppearanceMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class EditAppearanceMessage : public GameNetworkMessage
+{
+public:
+	static const char * const MessageType;
+
+public:
+	explicit EditAppearanceMessage(const NetworkId & id);
+	explicit EditAppearanceMessage(Archive::ReadIterator &source);
+
+public:
+	const NetworkId &                                 getTarget () const;
+
+private:
+	Archive::AutoVariable<NetworkId>                  m_target;
+};
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & EditAppearanceMessage::getTarget () const
+{
+	return m_target.get ();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _EditAppearanceMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditStatsMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditStatsMessage.cpp
new file mode 100644
index 00000000..e1aeba84
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditStatsMessage.cpp
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// EditStatsMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/EditStatsMessage.h"
+
+// ======================================================================
+
+const char * const EditStatsMessage::MessageType = "EditStatsMessage";
+
+//----------------------------------------------------------------------
+
+EditStatsMessage::EditStatsMessage(const NetworkId & target) :
+GameNetworkMessage(MessageType),
+m_target(target)
+{
+	addVariable(m_target);
+}
+
+//----------------------------------------------------------------------
+
+EditStatsMessage::EditStatsMessage(Archive::ReadIterator &source) :
+GameNetworkMessage(MessageType),
+m_target()
+{
+	addVariable(m_target);
+	unpack(source);
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditStatsMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditStatsMessage.h
new file mode 100644
index 00000000..af723fad
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EditStatsMessage.h
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// EditStatsMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_EditStatsMessage_H
+#define	_EditStatsMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class EditStatsMessage : public GameNetworkMessage
+{
+public:
+	static const char * const MessageType;
+
+public:
+	explicit EditStatsMessage(const NetworkId & id);
+	explicit EditStatsMessage(Archive::ReadIterator &source);
+
+public:
+	const NetworkId &                                 getTarget () const;
+
+private:
+	Archive::AutoVariable<NetworkId>                  m_target;
+};
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & EditStatsMessage::getTarget () const
+{
+	return m_target.get ();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _EditStatsMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterStructurePlacementModeMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterStructurePlacementModeMessage.cpp
new file mode 100644
index 00000000..1621bfc6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterStructurePlacementModeMessage.cpp
@@ -0,0 +1,58 @@
+// ==================================================================
+//
+// EnterStructurePlacementModeMessage.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/EnterStructurePlacementModeMessage.h"
+
+// ==================================================================
+
+const char* const EnterStructurePlacementModeMessage::cms_name = "EnterStructurePlacementModeMessage";
+
+// ==================================================================
+
+EnterStructurePlacementModeMessage::EnterStructurePlacementModeMessage (const NetworkId& deedNetworkId, const std::string& structureSharedObjectTemplateName) :
+	GameNetworkMessage ("EnterStructurePlacementModeMessage"),
+	m_deedNetworkId (deedNetworkId),
+	m_structureSharedObjectTemplateName (structureSharedObjectTemplateName)
+{
+	addVariable (m_deedNetworkId);
+	addVariable (m_structureSharedObjectTemplateName);
+}
+
+// ------------------------------------------------------------------
+
+EnterStructurePlacementModeMessage::EnterStructurePlacementModeMessage (Archive::ReadIterator& source) :
+	GameNetworkMessage ("EnterStructurePlacementModeMessage"),
+	m_deedNetworkId (),
+	m_structureSharedObjectTemplateName ()
+{
+	addVariable (m_deedNetworkId);
+	addVariable (m_structureSharedObjectTemplateName);
+	unpack (source);
+}
+
+// ------------------------------------------------------------------
+
+EnterStructurePlacementModeMessage::~EnterStructurePlacementModeMessage ()
+{
+}
+
+// ------------------------------------------------------------------
+
+const NetworkId& EnterStructurePlacementModeMessage::getDeedNetworkId () const
+{
+	return m_deedNetworkId.get ();
+}
+
+// ------------------------------------------------------------------
+
+const std::string& EnterStructurePlacementModeMessage::getStructureSharedObjectTemplateName () const
+{
+	return m_structureSharedObjectTemplateName.get ();
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterStructurePlacementModeMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterStructurePlacementModeMessage.h
new file mode 100644
index 00000000..a6eaace8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterStructurePlacementModeMessage.h
@@ -0,0 +1,42 @@
+// ==================================================================
+//
+// EnterStructurePlacementModeMessage.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_EnterStructurePlacementModeMessage_H
+#define	INCLUDED_EnterStructurePlacementModeMessage_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ==================================================================
+
+class EnterStructurePlacementModeMessage : public GameNetworkMessage
+{
+public: 
+
+	EnterStructurePlacementModeMessage (const NetworkId& deedNetworkId, const std::string& structureSharedObjectTemplateName);
+	explicit EnterStructurePlacementModeMessage (Archive::ReadIterator &source);
+	virtual ~EnterStructurePlacementModeMessage();
+
+	const NetworkId&   getDeedNetworkId () const;
+	const std::string& getStructureSharedObjectTemplateName () const;
+
+public:
+
+	static const char* const cms_name;
+
+private: 
+
+	Archive::AutoVariable<NetworkId>   m_deedNetworkId;
+	Archive::AutoVariable<std::string> m_structureSharedObjectTemplateName;
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterTicketPurchaseModeMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterTicketPurchaseModeMessage.cpp
new file mode 100644
index 00000000..93e780ec
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterTicketPurchaseModeMessage.cpp
@@ -0,0 +1,69 @@
+// ==================================================================
+//
+// EnterTicketPurchaseModeMessage.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/EnterTicketPurchaseModeMessage.h"
+
+// ==================================================================
+
+const char* const EnterTicketPurchaseModeMessage::cms_name = "EnterTicketPurchaseModeMessage";
+
+// ==================================================================
+
+EnterTicketPurchaseModeMessage::EnterTicketPurchaseModeMessage (const std::string& planetName, const std::string& travelPointName, bool instantTravel) :
+	GameNetworkMessage ("EnterTicketPurchaseModeMessage"),
+	m_planetName (planetName),
+	m_travelPointName (travelPointName),
+	m_instantTravel (instantTravel)
+{
+	addVariable (m_planetName);
+	addVariable (m_travelPointName);
+	addVariable (m_instantTravel);
+}
+
+// ------------------------------------------------------------------
+
+EnterTicketPurchaseModeMessage::EnterTicketPurchaseModeMessage (Archive::ReadIterator& source) :
+	GameNetworkMessage ("EnterTicketPurchaseModeMessage"),
+	m_planetName (),
+	m_travelPointName (),
+	m_instantTravel ()
+{
+	addVariable (m_planetName);
+	addVariable (m_travelPointName);
+	addVariable (m_instantTravel);
+	unpack (source);
+}
+
+// ------------------------------------------------------------------
+
+EnterTicketPurchaseModeMessage::~EnterTicketPurchaseModeMessage ()
+{
+}
+
+// ------------------------------------------------------------------
+
+const std::string& EnterTicketPurchaseModeMessage::getPlanetName () const
+{
+	return m_planetName.get ();
+}
+
+// ------------------------------------------------------------------
+
+const std::string& EnterTicketPurchaseModeMessage::getTravelPointName () const
+{
+	return m_travelPointName.get ();
+}
+
+// ------------------------------------------------------------------
+
+bool EnterTicketPurchaseModeMessage::getInstantTravel () const
+{
+	return m_instantTravel.get ();
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterTicketPurchaseModeMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterTicketPurchaseModeMessage.h
new file mode 100644
index 00000000..2ff8809b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnterTicketPurchaseModeMessage.h
@@ -0,0 +1,43 @@
+// ==================================================================
+//
+// EnterTicketPurchaseModeMessage.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_EnterTicketPurchaseModeMessage_H
+#define	INCLUDED_EnterTicketPurchaseModeMessage_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ==================================================================
+
+class EnterTicketPurchaseModeMessage : public GameNetworkMessage
+{
+public: 
+
+	EnterTicketPurchaseModeMessage (const std::string& planetName, const std::string& travelPointName, bool instantTravel);
+	explicit EnterTicketPurchaseModeMessage (Archive::ReadIterator &source);
+	virtual ~EnterTicketPurchaseModeMessage();
+
+	const std::string& getPlanetName () const;
+	const std::string& getTravelPointName () const;
+	bool getInstantTravel () const;
+
+public:
+
+	static const char* const cms_name;
+
+private:
+
+	Archive::AutoVariable<std::string> m_planetName;
+	Archive::AutoVariable<std::string> m_travelPointName;
+	Archive::AutoVariable<bool> m_instantTravel;
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnvironmentalHitData.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnvironmentalHitData.cpp
new file mode 100644
index 00000000..a8fca422
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnvironmentalHitData.cpp
@@ -0,0 +1,49 @@
+//======================================================================
+//
+// EnvironmentalHitData.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/EnvironmentalHitData.h"
+
+#include "Archive/Archive.h"
+
+//======================================================================
+
+EnvironmentalHitData::EnvironmentalHitData() :
+nebulaId(0),
+side(0),
+damage(0.0f)
+{
+}
+
+//----------------------------------------------------------------------
+
+EnvironmentalHitData::EnvironmentalHitData(int _nebulaId, int8 _side, float _damage) :
+nebulaId(_nebulaId),
+side(_side),
+damage(_damage)
+{
+}
+
+//----------------------------------------------------------------------
+
+void EnvironmentalHitData::get(Archive::ReadIterator & source)
+{
+	Archive::get(source, nebulaId);
+	Archive::get(source, side);
+	Archive::get(source, damage);
+}
+
+//----------------------------------------------------------------------
+
+void EnvironmentalHitData::put(Archive::ByteStream & target) const
+{
+	Archive::put(target, nebulaId);
+	Archive::put(target, side);
+	Archive::put(target, damage);
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnvironmentalHitData.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnvironmentalHitData.h
new file mode 100644
index 00000000..f7ff37a6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/EnvironmentalHitData.h
@@ -0,0 +1,53 @@
+//======================================================================
+//
+// EnvironmentalHitData.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_EnvironmentalHitData_H
+#define INCLUDED_EnvironmentalHitData_H
+
+//======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+}
+
+//----------------------------------------------------------------------
+
+class EnvironmentalHitData
+{
+public:
+
+	EnvironmentalHitData();
+	EnvironmentalHitData(int _nebulaId, int8 _side, float _damage);
+
+	int nebulaId;
+	int8 side;
+	float damage;
+
+	void get(Archive::ReadIterator & source);
+	void put(Archive::ByteStream & target) const;
+};
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	inline void get(ReadIterator & source, EnvironmentalHitData & target)
+	{
+		target.get(source);
+	}
+
+	inline void put(ByteStream & target, EnvironmentalHitData const& source)
+	{
+		source.put(target);
+	}
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ExpertiseRequestMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ExpertiseRequestMessage.cpp
new file mode 100644
index 00000000..b01db2be
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ExpertiseRequestMessage.cpp
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// ExpertiseRequestMessage.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ExpertiseRequestMessage.h"
+
+// ======================================================================
+
+ExpertiseRequestMessage::ExpertiseRequestMessage() :
+	GameNetworkMessage("ExpertiseRequestMessage")
+{
+	addVariable(m_addExpertisesList);
+	addVariable(m_clearAllExpertisesFirst);
+}
+
+// ----------------------------------------------------------------------
+
+ExpertiseRequestMessage::ExpertiseRequestMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("ExpertiseRequestMessage")
+{
+	addVariable(m_addExpertisesList);
+	addVariable(m_clearAllExpertisesFirst);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+void ExpertiseRequestMessage::setAddExpertisesList(const std::vector<std::string> & addExpertiseList)
+{
+	m_addExpertisesList.set (addExpertiseList);
+}
+
+// ----------------------------------------------------------------------
+
+void ExpertiseRequestMessage::setClearAllExpertisesFirst(bool clearAllExpertisesFirst)
+{
+	m_clearAllExpertisesFirst.set (clearAllExpertisesFirst);
+}
+
+// ----------------------------------------------------------------------
+
+ExpertiseRequestMessage::~ExpertiseRequestMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ExpertiseRequestMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ExpertiseRequestMessage.h
new file mode 100644
index 00000000..229a2b64
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ExpertiseRequestMessage.h
@@ -0,0 +1,56 @@
+// ======================================================================
+//
+// ExpertiseRequestMessage.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ExpertiseRequestMessage_H
+#define INCLUDED_ExpertiseRequestMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class ExpertiseRequestMessage: public GameNetworkMessage
+{
+public:
+	ExpertiseRequestMessage();
+	explicit ExpertiseRequestMessage(Archive::ReadIterator &source);
+	virtual ~ExpertiseRequestMessage();
+
+	stdvector<std::string>::fwd const &getAddExpertisesList() const;
+	void setAddExpertisesList(stdvector<std::string>::fwd const &addExpertisesList);
+	bool getClearAllExpertisesFirst() const;
+	void setClearAllExpertisesFirst(bool clearAllExpertisesFirst);
+
+private:
+	ExpertiseRequestMessage(ExpertiseRequestMessage const &);
+	ExpertiseRequestMessage &operator=(ExpertiseRequestMessage const &);
+
+private:
+
+	Archive::AutoArray<std::string> m_addExpertisesList;
+	Archive::AutoVariable<bool> m_clearAllExpertisesFirst;
+};
+
+// ----------------------------------------------------------------------
+
+inline stdvector<std::string>::fwd const &ExpertiseRequestMessage::getAddExpertisesList() const
+{
+	return m_addExpertisesList.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool ExpertiseRequestMessage::getClearAllExpertisesFirst() const
+{
+	return m_clearAllExpertisesFirst.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ExpertiseRequestMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionRequestMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionRequestMessage.cpp
new file mode 100644
index 00000000..3cd7d516
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionRequestMessage.cpp
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// FactionRequestMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/FactionRequestMessage.h"
+
+// ======================================================================
+
+FactionRequestMessage::FactionRequestMessage()
+: GameNetworkMessage("FactionRequestMessage")
+{
+}
+
+//-----------------------------------------------------------------------
+
+FactionRequestMessage::FactionRequestMessage(Archive::ReadIterator & source)
+: GameNetworkMessage("FactionRequestMessage")
+{
+	UNREF(source);
+}
+
+// ----------------------------------------------------------------------
+
+FactionRequestMessage::~FactionRequestMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionRequestMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionRequestMessage.h
new file mode 100644
index 00000000..5d234018
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionRequestMessage.h
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// FactionRequestMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_FactionRequestMessage_H
+#define INCLUDED_FactionRequestMessage_H
+
+// ======================================================================
+
+//#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Client
+ * Sent to:    Connection Server
+ * Action:     Requests the state of the player's stomach(s).
+ */
+class FactionRequestMessage : public GameNetworkMessage
+{
+ public:
+	FactionRequestMessage();
+	explicit FactionRequestMessage(Archive::ReadIterator & source);
+	virtual ~FactionRequestMessage();
+
+  private:
+	FactionRequestMessage(const FactionRequestMessage&);
+	FactionRequestMessage& operator= (const FactionRequestMessage&);
+};
+
+// ======================================================================
+
+#endif	// _INCLUDED_ClientCentralMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionResponseMessage.cpp
new file mode 100644
index 00000000..6cf3908b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionResponseMessage.cpp
@@ -0,0 +1,73 @@
+// ======================================================================
+//
+// FactionResponseMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/FactionResponseMessage.h"
+
+// ======================================================================
+
+const char * const FactionResponseMessage::MessageType = "FactionResponseMessage";
+
+//----------------------------------------------------------------------
+
+FactionResponseMessage::FactionResponseMessage(int rebel, int imperial, int criminal, const std::vector<std::string>& npcFactionNameList, const std::vector<float>& npcFactionValueList)
+: GameNetworkMessage    (MessageType),
+m_factionRebelValue   (rebel),
+m_factionImperialValue(imperial),
+m_factionCriminalValue(criminal),
+m_npcFactionNameList(),
+m_npcFactionValueList()
+{
+	m_npcFactionNameList.set(npcFactionNameList);
+	m_npcFactionValueList.set(npcFactionValueList);
+
+	addVariable(m_factionRebelValue);
+	addVariable(m_factionImperialValue);
+	addVariable(m_factionCriminalValue);
+	addVariable(m_npcFactionNameList);
+	addVariable(m_npcFactionValueList);
+}
+
+//-----------------------------------------------------------------------
+
+FactionResponseMessage::FactionResponseMessage(Archive::ReadIterator & source)
+: GameNetworkMessage(MessageType),
+m_factionRebelValue(),
+m_factionImperialValue(),
+m_factionCriminalValue(),
+m_npcFactionNameList(),
+m_npcFactionValueList()
+{
+	addVariable(m_factionRebelValue);
+	addVariable(m_factionImperialValue);
+	addVariable(m_factionCriminalValue);
+	addVariable(m_npcFactionNameList);
+	addVariable(m_npcFactionValueList);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+const std::vector<std::string> & FactionResponseMessage::getNPCFactionNames()  const
+{
+	return m_npcFactionNameList.get();
+}
+
+// ----------------------------------------------------------------------
+
+const std::vector<float> & FactionResponseMessage::getNPCFactionValues() const
+{
+	return m_npcFactionValueList.get();
+}
+
+// ----------------------------------------------------------------------
+
+FactionResponseMessage::~FactionResponseMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionResponseMessage.h
new file mode 100644
index 00000000..129b4b94
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionResponseMessage.h
@@ -0,0 +1,75 @@
+// ======================================================================
+//
+// FactionResponseMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_FactionResponseMessage_H
+#define INCLUDED_FactionResponseMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Connection Server
+ * Sent to:    Client
+ * Action:     Tells the client about it's factions
+ *             connected to.
+ */
+class FactionResponseMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	FactionResponseMessage(int rebel, int imperial, int criminal, const stdvector<std::string>::fwd & npcFactionNameList, const stdvector<float>::fwd & npcFactionValueList);
+	explicit FactionResponseMessage(Archive::ReadIterator & source);
+	virtual ~FactionResponseMessage();
+
+public:
+	int                getFactionRebel   () const;
+	int                getFactionImperial() const;
+	int                getFactionCriminal() const;
+	const stdvector<std::string>::fwd & getNPCFactionNames()  const;
+	const stdvector<float>::fwd       & getNPCFactionValues() const;
+	
+private:
+	Archive::AutoVariable<int>         m_factionRebelValue;
+	Archive::AutoVariable<int>         m_factionImperialValue;
+	Archive::AutoVariable<int>         m_factionCriminalValue;
+	Archive::AutoArray<std::string>    m_npcFactionNameList;
+	Archive::AutoArray<float>          m_npcFactionValueList;
+
+	FactionResponseMessage();
+	FactionResponseMessage(const FactionResponseMessage&);
+	FactionResponseMessage& operator= (const FactionResponseMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline int FactionResponseMessage::getFactionRebel() const
+{
+	return m_factionRebelValue.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int FactionResponseMessage::getFactionImperial() const
+{
+	return m_factionImperialValue.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int FactionResponseMessage::getFactionCriminal() const
+{
+	return m_factionCriminalValue.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ClientCentralMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GalaxyLoopTimesResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GalaxyLoopTimesResponse.cpp
new file mode 100644
index 00000000..3753c054
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GalaxyLoopTimesResponse.cpp
@@ -0,0 +1,40 @@
+// GalaxyLoopTimesResponse.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GalaxyLoopTimesResponse.h"
+
+//-----------------------------------------------------------------------
+
+GalaxyLoopTimesResponse::GalaxyLoopTimesResponse(const unsigned long l, const unsigned long c) :
+GameNetworkMessage("GalaxyLoopTimesResponse"),
+currentFrameMilliseconds(c),
+lastFrameMilliseconds(l)
+{
+	addVariable(currentFrameMilliseconds);
+	addVariable(lastFrameMilliseconds);
+}
+
+//-----------------------------------------------------------------------
+
+GalaxyLoopTimesResponse::GalaxyLoopTimesResponse(Archive::ReadIterator & source) :
+GameNetworkMessage("GalaxyLoopTimesResponse"),
+currentFrameMilliseconds(),
+lastFrameMilliseconds()
+{
+	addVariable(currentFrameMilliseconds);
+	addVariable(lastFrameMilliseconds);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+GalaxyLoopTimesResponse::~GalaxyLoopTimesResponse()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GalaxyLoopTimesResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GalaxyLoopTimesResponse.h
new file mode 100644
index 00000000..56d447c5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GalaxyLoopTimesResponse.h
@@ -0,0 +1,48 @@
+// GalaxyLoopTimesResponse.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_GalaxyLoopTimesResponse_H
+#define	_INCLUDED_GalaxyLoopTimesResponse_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class GalaxyLoopTimesResponse : public GameNetworkMessage
+{
+public:
+	GalaxyLoopTimesResponse(const unsigned long lastFrameMilliseconds, const unsigned long currentFrameMilliseconds);
+	explicit GalaxyLoopTimesResponse(Archive::ReadIterator & source);
+	~GalaxyLoopTimesResponse();
+
+	const unsigned long  getCurrentFrameMilliseconds  () const;
+	const unsigned long  getLastFrameMilliseconds     () const;
+
+private:
+	GalaxyLoopTimesResponse & operator = (const GalaxyLoopTimesResponse & rhs);
+	GalaxyLoopTimesResponse(const GalaxyLoopTimesResponse & source);
+
+	Archive::AutoVariable<unsigned long>  currentFrameMilliseconds;
+	Archive::AutoVariable<unsigned long>  lastFrameMilliseconds;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned long GalaxyLoopTimesResponse::getCurrentFrameMilliseconds() const
+{
+	return currentFrameMilliseconds.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned long GalaxyLoopTimesResponse::getLastFrameMilliseconds() const
+{
+	return lastFrameMilliseconds.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_GalaxyLoopTimesResponse_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetails.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetails.cpp
new file mode 100644
index 00000000..7ea4e1a7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetails.cpp
@@ -0,0 +1,36 @@
+// ======================================================================
+//
+// GetAuctionDetails.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GetAuctionDetails.h"
+
+// ======================================================================
+
+GetAuctionDetails::GetAuctionDetails(const NetworkId & itemId):
+	GameNetworkMessage("GetAuctionDetails"),
+	m_itemId(itemId)
+{
+	AutoByteStream::addVariable(m_itemId);
+}
+
+// ======================================================================
+
+GetAuctionDetails::GetAuctionDetails(Archive::ReadIterator &source) :
+	GameNetworkMessage("GetAuctionDetails"),
+	m_itemId()
+{
+	AutoByteStream::addVariable(m_itemId);
+
+	unpack(source);
+}
+
+// ======================================================================
+
+GetAuctionDetails::~GetAuctionDetails()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetails.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetails.h
new file mode 100644
index 00000000..275d3ada
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetails.h
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// GetAuctionDetails.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_GetAuctionDetails_H
+#define	_GetAuctionDetails_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+
+class GetAuctionDetails : public GameNetworkMessage
+{
+public:
+
+	GetAuctionDetails(const NetworkId & item);
+	explicit GetAuctionDetails(Archive::ReadIterator &source);
+
+	~GetAuctionDetails();
+
+public: // methods
+
+	NetworkId                          getItem() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId>         m_itemId;           //item
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId GetAuctionDetails::getItem() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _GetAuctionDetails_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetailsResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetailsResponse.cpp
new file mode 100644
index 00000000..45ff319b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetailsResponse.cpp
@@ -0,0 +1,66 @@
+// ======================================================================
+//
+// GetAuctionDetailsResponse.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GetAuctionDetailsResponse.h"
+
+// ======================================================================
+
+const char * const GetAuctionDetailsResponse::MessageType = "GetAuctionDetailsResponse";
+
+//----------------------------------------------------------------------
+
+GetAuctionDetailsResponse::GetAuctionDetailsResponse(const Auction::ItemDataDetails & details) :
+	GameNetworkMessage(MessageType),
+	m_details(details)
+{
+	AutoByteStream::addVariable(m_details);
+}
+
+// ----------------------------------------------------------------------
+
+GetAuctionDetailsResponse::GetAuctionDetailsResponse(Archive::ReadIterator & source) :
+	GameNetworkMessage(MessageType),
+	m_details()
+{
+	AutoByteStream::addVariable(m_details);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+GetAuctionDetailsResponse::~GetAuctionDetailsResponse()
+{
+}
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+
+	void get(ReadIterator &source, Auction::ItemDataDetails &target)
+	{
+		get(source, target.itemId);
+		get(source, target.userDescription);
+		get(source, target.propertyList);
+		get(source, target.templateName);
+		get(source, target.appearanceString);
+	}
+
+	void put(ByteStream &target, Auction::ItemDataDetails const &source)
+	{
+		put(target, source.itemId);
+		put(target, source.userDescription);
+		put(target, source.propertyList);
+		put(target, source.templateName);
+		put(target, source.appearanceString);
+	}
+
+}
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetailsResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetailsResponse.h
new file mode 100644
index 00000000..66e18ef9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetAuctionDetailsResponse.h
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// GetAuctionDetailsResponse.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_GetAuctionDetailsResponse_H
+#define	_GetAuctionDetailsResponse_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/AuctionData.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/AuctionData.h"
+
+//-----------------------------------------------------------------------
+
+class GetAuctionDetailsResponse : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	GetAuctionDetailsResponse(const Auction::ItemDataDetails & details);
+	explicit GetAuctionDetailsResponse(Archive::ReadIterator &source);
+
+	~GetAuctionDetailsResponse();
+
+public: // methods
+
+	Auction::ItemDataDetails    getDetails() const;
+public: // types
+
+private: 
+	Archive::AutoVariable<Auction::ItemDataDetails>  m_details;
+};
+
+// ----------------------------------------------------------------------
+
+inline Auction::ItemDataDetails GetAuctionDetailsResponse::getDetails() const
+{
+	return m_details.get();
+}
+
+// ----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get(ReadIterator &source, Auction::ItemDataDetails &target);
+	void put(ByteStream &target, Auction::ItemDataDetails const &source);
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _GetAuctionDetailsResponse_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsMessage.cpp
new file mode 100644
index 00000000..6a694b73
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsMessage.cpp
@@ -0,0 +1,54 @@
+// ======================================================================
+//
+// GetMapLocationsMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GetMapLocationsMessage.h"
+
+// ======================================================================
+
+const char * const GetMapLocationsMessage::MessageType = "GetMapLocationsMessage";
+
+//----------------------------------------------------------------------
+
+GetMapLocationsMessage::GetMapLocationsMessage(const std::string &planetName, int cacheVersionStatic, int cacheVersionDynamic, int cacheVersionPersist) :
+GameNetworkMessage    (MessageType),
+m_planetName          (planetName),
+m_cacheVersionStatic  (cacheVersionStatic),
+m_cacheVersionDynamic (cacheVersionDynamic),
+m_cacheVersionPersist (cacheVersionPersist)
+{
+	AutoByteStream::addVariable(m_planetName);
+	AutoByteStream::addVariable(m_cacheVersionStatic);
+	AutoByteStream::addVariable(m_cacheVersionDynamic);
+	AutoByteStream::addVariable(m_cacheVersionPersist);
+}
+
+// ======================================================================
+
+GetMapLocationsMessage::GetMapLocationsMessage(Archive::ReadIterator &source) :
+GameNetworkMessage    (MessageType),
+m_planetName          (),
+m_cacheVersionStatic  (0),
+m_cacheVersionDynamic (0),
+m_cacheVersionPersist (0)
+{
+	AutoByteStream::addVariable(m_planetName);
+	AutoByteStream::addVariable(m_cacheVersionStatic);
+	AutoByteStream::addVariable(m_cacheVersionDynamic);
+	AutoByteStream::addVariable(m_cacheVersionPersist);
+	unpack(source);
+}
+
+// ======================================================================
+
+GetMapLocationsMessage::~GetMapLocationsMessage()
+{
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsMessage.h
new file mode 100644
index 00000000..c0799e4d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsMessage.h
@@ -0,0 +1,81 @@
+// ======================================================================
+//
+// GetMapLocationsMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_GetMapLocationsMessage_H
+#define	_GetMapLocationsMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+#include "sharedNetworkMessages/MapLocation.h"
+#include "sharedNetworkMessages/MapLocationArchive.h"
+
+//-----------------------------------------------------------------------
+
+class GetMapLocationsMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	GetMapLocationsMessage(const std::string &planetName, int cacheVersionStatic, int cacheVersionDynamic, int cacheVersionPersist);
+	explicit GetMapLocationsMessage(Archive::ReadIterator &source);
+
+	~GetMapLocationsMessage();
+
+public: // methods
+
+	const std::string              & getPlanetName          () const;
+	int                              getCacheVersionStatic  () const;
+	int                              getCacheVersionDynamic () const;
+	int                              getCacheVersionPersist () const;
+
+public: // types
+
+private:
+	Archive::AutoVariable<std::string>           m_planetName;
+	Archive::AutoVariable<int>                   m_cacheVersionStatic;
+	Archive::AutoVariable<int>                   m_cacheVersionDynamic;
+	Archive::AutoVariable<int>                   m_cacheVersionPersist;
+};
+
+// ----------------------------------------------------------------------
+
+inline const std::string &GetMapLocationsMessage::getPlanetName() const
+{
+	return m_planetName.get();
+}
+
+//----------------------------------------------------------------------
+
+inline int GetMapLocationsMessage::getCacheVersionStatic  () const
+{
+	return m_cacheVersionStatic.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline int GetMapLocationsMessage::getCacheVersionDynamic () const
+{
+	return m_cacheVersionDynamic.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline int GetMapLocationsMessage::getCacheVersionPersist () const
+{
+	return m_cacheVersionPersist.get ();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _GetMapLocationsMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.cpp
new file mode 100644
index 00000000..ac328559
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.cpp
@@ -0,0 +1,76 @@
+// ======================================================================
+//
+// GetMapLocationsResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GetMapLocationsResponseMessage.h"
+
+// ======================================================================
+
+const char * const GetMapLocationsResponseMessage::MessageType = "GetMapLocationsResponseMessage";
+
+//----------------------------------------------------------------------
+
+GetMapLocationsResponseMessage::GetMapLocationsResponseMessage(const std::string &planetName, 
+															   const MapLocationVector & locStatic, 
+															   const MapLocationVector & locDynamic, 
+															   const MapLocationVector & locPersist, 
+															   int versionStatic, 
+															   int versionDynamic, 
+															   int versionPersist) :
+GameNetworkMessage     (MessageType),
+m_planetName           (planetName),
+m_mapLocationsStatic   (),
+m_mapLocationsDynamic  (),
+m_mapLocationsPersist  (),
+m_versionStatic        (versionStatic),
+m_versionDynamic       (versionDynamic),
+m_versionPersist       (versionPersist)
+{
+	m_mapLocationsStatic.set   (locStatic);
+	m_mapLocationsDynamic.set  (locDynamic);
+	m_mapLocationsPersist.set  (locPersist);
+	
+	AutoByteStream::addVariable(m_planetName);
+	AutoByteStream::addVariable(m_mapLocationsStatic);
+	AutoByteStream::addVariable(m_mapLocationsDynamic);
+	AutoByteStream::addVariable(m_mapLocationsPersist);
+	AutoByteStream::addVariable(m_versionStatic);
+	AutoByteStream::addVariable(m_versionDynamic);
+	AutoByteStream::addVariable(m_versionPersist);
+}
+
+// ======================================================================
+
+GetMapLocationsResponseMessage::GetMapLocationsResponseMessage(Archive::ReadIterator &source) :
+GameNetworkMessage(MessageType),
+m_planetName           (),
+m_mapLocationsStatic   (),
+m_mapLocationsDynamic  (),
+m_mapLocationsPersist  (),
+m_versionStatic        (),
+m_versionDynamic       (),
+m_versionPersist       ()
+{
+	AutoByteStream::addVariable(m_planetName);
+	AutoByteStream::addVariable(m_mapLocationsStatic);
+	AutoByteStream::addVariable(m_mapLocationsDynamic);
+	AutoByteStream::addVariable(m_mapLocationsPersist);
+	AutoByteStream::addVariable(m_versionStatic);
+	AutoByteStream::addVariable(m_versionDynamic);
+	AutoByteStream::addVariable(m_versionPersist);
+	
+	unpack(source);
+}
+
+// ======================================================================
+
+GetMapLocationsResponseMessage::~GetMapLocationsResponseMessage()
+{
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.h
new file mode 100644
index 00000000..19c3f6f2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.h
@@ -0,0 +1,111 @@
+// ======================================================================
+//
+// GetMapLocationsResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_GetMapLocationsResponseMessage_H
+#define	_GetMapLocationsResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+#include "sharedNetworkMessages/MapLocation.h"
+#include "sharedNetworkMessages/MapLocationArchive.h"
+
+//-----------------------------------------------------------------------
+
+class GetMapLocationsResponseMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	typedef stdvector<MapLocation>::fwd MapLocationVector;
+
+	GetMapLocationsResponseMessage          (const std::string &planetName, const MapLocationVector & locStatic, const MapLocationVector & locDynamic, const MapLocationVector & locPersist, int versionStatic, int versionDynamic, int versionPersist);
+	explicit GetMapLocationsResponseMessage (Archive::ReadIterator &source);
+
+	~GetMapLocationsResponseMessage();
+
+public: // methods
+
+	const std::string &          getPlanetName          ()  const;
+	const MapLocationVector &    getMapLocationsStatic  ()  const;
+	const MapLocationVector &    getMapLocationsDynamic ()  const;
+	const MapLocationVector &    getMapLocationsPersist ()  const;
+
+	int                          getVersionStatic       ()  const;
+	int                          getVersionDynamic      ()  const;
+	int                          getVersionPersist      ()  const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<std::string>           m_planetName; 
+	Archive::AutoArray<MapLocation>              m_mapLocationsStatic; 
+	Archive::AutoArray<MapLocation>              m_mapLocationsDynamic; 
+	Archive::AutoArray<MapLocation>              m_mapLocationsPersist; 
+	Archive::AutoVariable<int>                   m_versionStatic;
+	Archive::AutoVariable<int>                   m_versionDynamic;
+	Archive::AutoVariable<int>                   m_versionPersist;
+};
+
+// ----------------------------------------------------------------------
+
+inline const std::string &GetMapLocationsResponseMessage::getPlanetName() const
+{
+	return m_planetName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const GetMapLocationsResponseMessage::MapLocationVector &GetMapLocationsResponseMessage::getMapLocationsStatic () const
+{
+	return m_mapLocationsStatic.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const GetMapLocationsResponseMessage::MapLocationVector &GetMapLocationsResponseMessage::getMapLocationsDynamic () const
+{
+	return m_mapLocationsDynamic.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const GetMapLocationsResponseMessage::MapLocationVector &GetMapLocationsResponseMessage::getMapLocationsPersist () const
+{
+	return m_mapLocationsPersist.get();
+}
+
+//----------------------------------------------------------------------
+
+inline int GetMapLocationsResponseMessage::getVersionStatic       ()  const
+{
+	return m_versionStatic.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline int GetMapLocationsResponseMessage::getVersionDynamic      ()  const
+{
+	return m_versionDynamic.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline int GetMapLocationsResponseMessage::getVersionPersist      ()  const
+{
+	return m_versionPersist.get ();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _GetMapLocationsResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GuildRequestMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GuildRequestMessage.cpp
new file mode 100644
index 00000000..2ebb8c20
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GuildRequestMessage.cpp
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// GuildRequestMessage.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GuildRequestMessage.h"
+
+// ======================================================================
+
+GuildRequestMessage::GuildRequestMessage(NetworkId const &targetId) :
+	GameNetworkMessage("GuildRequestMessage"),
+	m_targetId(targetId)
+{
+	addVariable(m_targetId);
+}
+
+// ----------------------------------------------------------------------
+
+GuildRequestMessage::GuildRequestMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("GuildRequestMessage")
+{
+	addVariable(m_targetId);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+GuildRequestMessage::~GuildRequestMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GuildRequestMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GuildRequestMessage.h
new file mode 100644
index 00000000..89bf9cf7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GuildRequestMessage.h
@@ -0,0 +1,44 @@
+// ======================================================================
+//
+// GuildRequestMessage.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_GuildRequestMessage_H
+#define INCLUDED_GuildRequestMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class GuildRequestMessage: public GameNetworkMessage
+{
+public:
+	GuildRequestMessage(NetworkId const &targetId);
+	explicit GuildRequestMessage(Archive::ReadIterator &source);
+	virtual ~GuildRequestMessage();
+
+	NetworkId const &getTargetId() const;
+
+private:
+	GuildRequestMessage(GuildRequestMessage const &);
+	GuildRequestMessage &operator=(GuildRequestMessage const &);
+
+private:
+	Archive::AutoVariable<NetworkId> m_targetId;
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &GuildRequestMessage::getTargetId() const
+{
+	return m_targetId.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_GuildRequestMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GuildResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GuildResponseMessage.cpp
new file mode 100644
index 00000000..f835d6a4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GuildResponseMessage.cpp
@@ -0,0 +1,48 @@
+// ======================================================================
+//
+// GuildResponseMessage.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GuildResponseMessage.h"
+
+// ======================================================================
+
+const char * const GuildResponseMessage::MessageType = "GuildResponseMessage";
+
+//----------------------------------------------------------------------
+
+GuildResponseMessage::GuildResponseMessage(NetworkId const &targetId, std::string const &guildName, std::string const &memberTitle) :
+GameNetworkMessage(MessageType),
+m_targetId(targetId),
+m_guildName(guildName),
+m_memberTitle(memberTitle)
+{
+	addVariable(m_targetId);
+	addVariable(m_guildName);
+	addVariable(m_memberTitle);
+}
+
+// ----------------------------------------------------------------------
+
+GuildResponseMessage::GuildResponseMessage(Archive::ReadIterator &source) :
+GameNetworkMessage(MessageType),
+m_targetId(),
+m_guildName(),
+m_memberTitle()
+{
+	addVariable(m_targetId);
+	addVariable(m_guildName);
+	addVariable(m_memberTitle);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+GuildResponseMessage::~GuildResponseMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GuildResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GuildResponseMessage.h
new file mode 100644
index 00000000..38464b3b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GuildResponseMessage.h
@@ -0,0 +1,66 @@
+// ======================================================================
+//
+// GuildResponseMessage.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_GuildResponseMessage_H
+#define INCLUDED_GuildResponseMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class GuildResponseMessage: public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	GuildResponseMessage(NetworkId const &targetId, std::string const &guildName, std::string const &memberTitle);
+	explicit GuildResponseMessage(Archive::ReadIterator &source);
+	virtual ~GuildResponseMessage();
+
+	NetworkId const &getTargetId() const;
+	std::string const &getGuildName() const;
+	std::string const &getMemberTitle() const;
+	
+private:
+	GuildResponseMessage();
+	GuildResponseMessage(GuildResponseMessage const &);
+	GuildResponseMessage &operator=(GuildResponseMessage const &);
+
+private:
+	Archive::AutoVariable<NetworkId> m_targetId;
+	Archive::AutoVariable<std::string> m_guildName;
+	Archive::AutoVariable<std::string> m_memberTitle;
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &GuildResponseMessage::getTargetId() const
+{
+	return m_targetId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &GuildResponseMessage::getGuildName() const
+{
+	return m_guildName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &GuildResponseMessage::getMemberTitle() const
+{
+	return m_memberTitle.get();
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_GuildResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HeartBeat.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HeartBeat.cpp
new file mode 100644
index 00000000..6339b4e5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HeartBeat.cpp
@@ -0,0 +1,32 @@
+// HeartBeat.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/HeartBeat.h"
+
+//-----------------------------------------------------------------------
+
+HeartBeat::HeartBeat() :
+GameNetworkMessage("HeartBeat")
+{
+}
+
+//-----------------------------------------------------------------------
+
+HeartBeat::HeartBeat(Archive::ReadIterator & source) :
+GameNetworkMessage("HeartBeat")
+{
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+HeartBeat::~HeartBeat()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HeartBeat.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HeartBeat.h
new file mode 100644
index 00000000..b777ec07
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HeartBeat.h
@@ -0,0 +1,28 @@
+// HeartBeat.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_HeartBeat_H
+#define	_INCLUDED_HeartBeat_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h" 
+
+//-----------------------------------------------------------------------
+
+class HeartBeat : public GameNetworkMessage
+{
+public:
+	HeartBeat();
+	explicit HeartBeat(Archive::ReadIterator & source);
+	~HeartBeat();
+
+private:
+	HeartBeat & operator = (const HeartBeat & rhs);
+	HeartBeat(const HeartBeat & source);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_HeartBeat_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HyperspaceMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HyperspaceMessage.cpp
new file mode 100644
index 00000000..c7213dfe
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HyperspaceMessage.cpp
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// HyperspaceMessage.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+// tford
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/HyperspaceMessage.h"
+
+// ======================================================================
+
+HyperspaceMessage::HyperspaceMessage(NetworkId const & ownerId)
+: GameNetworkMessage("HyperspaceMessage")
+, m_ownerId(ownerId)
+{
+	addVariable(m_ownerId);
+}
+
+// ----------------------------------------------------------------------
+
+HyperspaceMessage::HyperspaceMessage(Archive::ReadIterator & source)
+: GameNetworkMessage("HyperspaceMessage")
+, m_ownerId()
+{
+	addVariable(m_ownerId);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & HyperspaceMessage::getOwnerId() const
+{
+	return m_ownerId.get();
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HyperspaceMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HyperspaceMessage.h
new file mode 100644
index 00000000..f0379126
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/HyperspaceMessage.h
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// HyperspaceMessage.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_HyperspaceMessage_H_
+#define	_HyperspaceMessage_H_
+
+// ======================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Transform.h"
+
+// ======================================================================
+
+class HyperspaceMessage: public GameNetworkMessage
+{
+public:
+	HyperspaceMessage(NetworkId const & ownerId);
+	explicit HyperspaceMessage(Archive::ReadIterator & source);
+
+public:
+	NetworkId const & getOwnerId() const;
+
+private: 
+	Archive::AutoVariable<NetworkId> m_ownerId;
+};
+
+// ======================================================================
+
+#endif // _HyperspaceMessage_H_
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignChangeMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignChangeMessage.cpp
new file mode 100644
index 00000000..a4c05ea5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignChangeMessage.cpp
@@ -0,0 +1,222 @@
+// ImageDesignChangeMessage.cpp
+// Copyright 2004, Sony Online Entertainment Inc., all rights reserved. 
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ImageDesignChangeMessage.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(ImageDesignChangeMessage, CM_imageDesignerChange);
+
+//-----------------------------------------------------------------------
+
+ImageDesignChangeMessage::ImageDesignChangeMessage() :
+MessageQueue::Data(),
+m_designerId(),
+m_recipientId(),
+m_terminalId(),
+m_newHairSet(false),
+m_newHairAsset(),
+m_hairCustomizationData(),
+m_designType(DT_COSMETIC),
+m_startingTime(0),
+m_designerRequiredCredits(0),
+m_recipientPaidCredits(0),
+m_accepted(false),
+m_origin(O_UNKNOWN),
+m_morphChanges(),
+m_indexChanges(),
+m_holoEmote(),
+m_bodySkillMod(0),
+m_faceSkillMod(0),
+m_markingsSkillMod(0),
+m_hairSkillMod(0)
+{
+}
+
+//-----------------------------------------------------------------------
+
+ImageDesignChangeMessage & ImageDesignChangeMessage::operator=(const ImageDesignChangeMessage & rhs)
+{
+	if (this == &rhs)
+		return *this;
+
+	m_designerId = rhs.m_designerId;
+	m_recipientId = rhs.m_recipientId;
+	m_terminalId = rhs.m_terminalId;
+	m_newHairSet = rhs.m_newHairSet;
+	m_newHairAsset = rhs.m_newHairAsset;
+	m_hairCustomizationData = rhs.m_hairCustomizationData;
+	m_designType = rhs.m_designType;
+	m_startingTime = rhs.m_startingTime;
+	m_designerRequiredCredits = rhs.m_designerRequiredCredits;
+	m_recipientPaidCredits = rhs.m_recipientPaidCredits;
+	m_accepted = rhs.m_accepted;
+	m_origin = rhs.m_origin;
+	m_morphChanges = rhs.m_morphChanges;
+	m_indexChanges = rhs.m_indexChanges;
+	m_holoEmote = rhs.m_holoEmote;
+	m_bodySkillMod = rhs.m_bodySkillMod;
+	m_faceSkillMod = rhs.m_faceSkillMod;
+	m_markingsSkillMod = rhs.m_markingsSkillMod;
+	m_hairSkillMod = rhs.m_hairSkillMod;
+
+	return *this;
+}
+
+//-----------------------------------------------------------------------
+
+void ImageDesignChangeMessage::addMorphParameterChange(std::string const & name, float const value)
+{
+	m_morphChanges[name] = value;
+}
+
+//-----------------------------------------------------------------------
+
+void ImageDesignChangeMessage::addIndexParameterChange(std::string const & name, int const value)
+{
+	m_indexChanges[name] = value;
+}
+
+//-----------------------------------------------------------------------
+
+void ImageDesignChangeMessage::setMorphParameterChanges(std::map<std::string, float> const & morphChanges)
+{
+	m_morphChanges = morphChanges;
+}
+
+//-----------------------------------------------------------------------
+
+void ImageDesignChangeMessage::setIndexParameterChanges(std::map<std::string, int> const & indexChanges)
+{
+	m_indexChanges = indexChanges;
+}
+
+//-----------------------------------------------------------------------
+
+void ImageDesignChangeMessage::pack(MessageQueue::Data const * const data, Archive::ByteStream & target)
+{
+	const ImageDesignChangeMessage* const msg = safe_cast<const ImageDesignChangeMessage*> (data);
+
+	if (msg)
+	{
+		Archive::put(target, msg->getDesignerId());
+		Archive::put(target, msg->getRecipientId());
+		Archive::put(target, msg->getTerminalId());
+		Archive::put(target, msg->getNewHairSet());
+		Archive::put(target, msg->getNewHairAsset());
+		Archive::put(target, msg->getHairCustomizationData());
+		Archive::put(target, msg->getDesignType());
+		Archive::put(target, msg->getStartingTime());
+		Archive::put(target, msg->getDesignerRequiredCredits());
+		Archive::put(target, msg->getRecipientPaidCredits());
+		Archive::put(target, msg->getAccepted());
+		Archive::put(target, msg->getOrigin());
+		Archive::put(target, msg->getBodySkillMod());
+		Archive::put(target, msg->getFaceSkillMod());
+		Archive::put(target, msg->getMarkingsSkillMod());
+		Archive::put(target, msg->getHairSkillMod());
+
+		std::map<std::string, float> const & morphs = msg->getMorphParameterChanges();
+		int size = morphs.size();
+		Archive::put(target, size);
+		for(std::map<std::string, float>::const_iterator i = morphs.begin(); i != morphs.end(); ++i)
+		{
+			Archive::put(target, i->first);
+			Archive::put(target, i->second);
+		}
+
+		std::map<std::string, int> const & indexes = msg->getIndexParameterChanges();
+		size = indexes.size();
+		Archive::put(target, size);
+		for(std::map<std::string, int>::const_iterator j = indexes.begin(); j != indexes.end(); ++j)
+		{
+			Archive::put(target, j->first);
+			Archive::put(target, j->second);
+		}
+		Archive::put(target, msg->getHoloEmote());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* ImageDesignChangeMessage::unpack(Archive::ReadIterator & source)
+{
+	ImageDesignChangeMessage * msg = new ImageDesignChangeMessage;
+
+	NetworkId tempId;
+	bool tempBool = false;
+	std::string tempStr;
+	int tempInt = 0;
+	time_t tempTime = 0;
+
+	Archive::get(source, tempId);
+	msg->setDesignerId(tempId);
+	Archive::get(source, tempId);
+	msg->setRecipientId(tempId);
+	Archive::get(source, tempId);
+	msg->setTerminalId(tempId);
+	Archive::get(source, tempBool);
+	msg->setNewHairSet(tempBool);
+	Archive::get(source, tempStr);
+	msg->setNewHairAsset(tempStr);
+	Archive::get(source, tempStr);
+	msg->setHairCustomizationData(tempStr);
+	Archive::get(source, tempInt);
+	DesignType const designType = static_cast<DesignType>(tempInt);
+	msg->setDesignType(designType);
+	Archive::get(source, tempTime);
+	msg->setStartingTime(tempTime);
+	Archive::get(source, tempInt);
+	msg->setDesignerRequiredCredits(tempInt);
+	Archive::get(source, tempInt);
+	msg->setRecipientPaidCredits(tempInt);
+	Archive::get(source, tempBool);
+	msg->setAccepted(tempBool);
+	Archive::get(source, tempInt);
+	Origin const origin = static_cast<Origin>(tempInt);
+	msg->setOrigin(origin);
+	Archive::get(source, tempInt);
+	msg->setBodySkillMod(tempInt);
+	Archive::get(source, tempInt);
+	msg->setFaceSkillMod(tempInt);
+	Archive::get(source, tempInt);
+	msg->setMarkingsSkillMod(tempInt);
+	Archive::get(source, tempInt);
+	msg->setHairSkillMod(tempInt);
+
+	int size = 0;
+	Archive::get(source, size);
+	std::string name;
+	float value = 0;
+	for(int i = 0; i < size; ++i)
+	{
+		Archive::get(source, name);
+		Archive::get(source, value);
+		msg->addMorphParameterChange(name, value);
+	}
+
+	Archive::get(source, size);
+	int value2 = 0;
+	for(int j = 0; j < size; ++j)
+	{
+		Archive::get(source, name);
+		Archive::get(source, value2);
+		msg->addIndexParameterChange(name, value2);
+	}
+	Archive::get(source, tempStr);
+	msg->setHoloEmote(tempStr);
+	return msg;
+}
+
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignChangeMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignChangeMessage.h
new file mode 100644
index 00000000..07c176e0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignChangeMessage.h
@@ -0,0 +1,371 @@
+// ImageDesignChangeMessage.h
+// Copyright 2004, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef	_INCLUDED_ImageDesignChangeMessage_H
+#define	_INCLUDED_ImageDesignChangeMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+class ImageDesignChangeMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	enum DesignType
+	{
+		DT_COSMETIC,
+		DT_PHYSICAL,
+		DT_STAT_MIGRATION,
+		DT_UNKNOWN
+	};
+
+	enum Origin
+	{
+		O_DESIGNER,
+		O_RECIPIENT,
+		O_SERVER,
+		O_UNKNOWN
+	};
+
+public:
+	ImageDesignChangeMessage();
+	ImageDesignChangeMessage & operator=(const ImageDesignChangeMessage & rhs);
+
+	//accessors
+	NetworkId const & getDesignerId() const;
+	NetworkId const & getRecipientId() const;
+	NetworkId const & getTerminalId() const;
+	bool getNewHairSet() const;
+	std::string const & getNewHairAsset() const;
+	std::string const & getHairCustomizationData() const;
+	DesignType getDesignType() const;
+	time_t getStartingTime() const;
+	int getDesignerRequiredCredits() const;
+	int getRecipientPaidCredits() const;
+	bool getAccepted() const;
+	Origin getOrigin() const;
+	std::map<std::string, float> const & getMorphParameterChanges () const;
+	std::map<std::string, int> const & getIndexParameterChanges () const;
+	std::string const & getHoloEmote() const;
+	int getBodySkillMod() const;
+	int getFaceSkillMod() const;
+	int getMarkingsSkillMod() const;
+	int getHairSkillMod() const;
+
+	//mutators
+	void setDesignerId(NetworkId const & designerId);
+	void setRecipientId(NetworkId const & recipientId);
+	void setTerminalId(NetworkId const & recipientId);
+	void setNewHairSet(bool changed);
+	void setNewHairAsset(std::string const & newAsset);
+	void setHairCustomizationData(std::string const & hairCustomizationData);
+	void setDesignType(DesignType const & designType);
+	void setStartingTime(time_t startingTime);
+	void setDesignerRequiredCredits(int credits);
+	void setRecipientPaidCredits(int credits);
+	void setAccepted(bool accepted);
+	void setOrigin(Origin const & origin);
+	void addMorphParameterChange(std::string const & name, float value);
+	void addIndexParameterChange(std::string const & name, int value);
+	void setMorphParameterChanges(std::map<std::string, float> const & morphChanges);
+	void setIndexParameterChanges(std::map<std::string, int> const & indexChanges);
+	void setHoloEmote(std::string const & holoEmote);
+	void setBodySkillMod(int skillMod);
+	void setFaceSkillMod(int skillMod);
+	void setMarkingsSkillMod(int skillMod);
+	void setHairSkillMod(int skillMod);
+
+private:
+	//disabled
+	ImageDesignChangeMessage(ImageDesignChangeMessage const & source);
+
+private:
+	NetworkId m_designerId;
+	NetworkId m_recipientId;
+	NetworkId m_terminalId;
+	bool m_newHairSet;
+	std::string m_newHairAsset;
+	std::string m_hairCustomizationData;
+	DesignType m_designType;
+	time_t m_startingTime;
+	int m_designerRequiredCredits;
+	int m_recipientPaidCredits;
+	bool m_accepted;
+	Origin m_origin;
+	std::map<std::string, float> m_morphChanges;
+	std::map<std::string, int> m_indexChanges;
+	std::string m_holoEmote;
+	int m_bodySkillMod;
+	int m_faceSkillMod;
+	int m_markingsSkillMod;
+	int m_hairSkillMod;
+};
+
+//-----------------------------------------------------------------------
+
+inline NetworkId const & ImageDesignChangeMessage::getDesignerId() const
+{
+	return m_designerId;
+}
+
+//-----------------------------------------------------------------------
+
+inline NetworkId const & ImageDesignChangeMessage::getRecipientId() const
+{
+	return m_recipientId;
+}
+
+//-----------------------------------------------------------------------
+
+inline NetworkId const & ImageDesignChangeMessage::getTerminalId() const
+{
+	return m_terminalId;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ImageDesignChangeMessage::getNewHairSet() const
+{
+	return m_newHairSet;
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & ImageDesignChangeMessage::getNewHairAsset() const
+{
+	return m_newHairAsset;
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & ImageDesignChangeMessage::getHairCustomizationData() const
+{
+	return m_hairCustomizationData;
+}
+
+//-----------------------------------------------------------------------
+
+inline ImageDesignChangeMessage::DesignType ImageDesignChangeMessage::getDesignType() const
+{
+	return m_designType;
+}
+
+//-----------------------------------------------------------------------
+
+inline time_t ImageDesignChangeMessage::getStartingTime() const
+{
+	return m_startingTime;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ImageDesignChangeMessage::getDesignerRequiredCredits() const
+{
+	return m_designerRequiredCredits;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ImageDesignChangeMessage::getRecipientPaidCredits() const
+{
+	return m_recipientPaidCredits;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ImageDesignChangeMessage::getAccepted() const
+{
+	return m_accepted;
+}
+
+//-----------------------------------------------------------------------
+
+inline ImageDesignChangeMessage::Origin ImageDesignChangeMessage::getOrigin() const
+{
+	return m_origin;
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & ImageDesignChangeMessage::getHoloEmote() const
+{
+	return m_holoEmote;
+}
+
+
+//-----------------------------------------------------------------------
+
+inline int ImageDesignChangeMessage::getBodySkillMod() const
+{
+	return m_bodySkillMod;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ImageDesignChangeMessage::getFaceSkillMod() const
+{
+	return m_faceSkillMod;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ImageDesignChangeMessage::getMarkingsSkillMod() const
+{
+	return m_markingsSkillMod;
+}
+
+//-----------------------------------------------------------------------
+
+inline int ImageDesignChangeMessage::getHairSkillMod() const
+{
+	return m_hairSkillMod;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setDesignerId(NetworkId const & designerId)
+{
+	m_designerId = designerId;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setRecipientId(NetworkId const & recipientId)
+{
+	m_recipientId = recipientId;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setTerminalId(NetworkId const & terminalId)
+{
+	m_terminalId = terminalId;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setNewHairSet(bool const changed)
+{
+	m_newHairSet = changed;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setNewHairAsset(std::string const & newAsset)
+{
+	m_newHairAsset = newAsset;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setHairCustomizationData(std::string const & hairCustomizationData)
+{
+	m_hairCustomizationData = hairCustomizationData;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setDesignType(DesignType const & designType)
+{
+	m_designType = designType;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setStartingTime(time_t const startingTime)
+{
+	m_startingTime = startingTime;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setDesignerRequiredCredits(int const credits)
+{
+	if(credits < 0)
+		m_designerRequiredCredits = 0;
+	m_designerRequiredCredits = credits;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setRecipientPaidCredits(int const credits)
+{
+	if(credits < 0)
+		m_recipientPaidCredits = 0;
+	m_recipientPaidCredits = credits;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setAccepted(bool const accepted)
+{
+	m_accepted = accepted;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setOrigin(ImageDesignChangeMessage::Origin const & origin)
+{
+	m_origin = origin;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setHoloEmote(std::string const & holoEmote)
+{
+	m_holoEmote = holoEmote;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setBodySkillMod(int const skillMod)
+{
+	m_bodySkillMod = skillMod;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setFaceSkillMod(int const skillMod)
+{
+	m_faceSkillMod = skillMod;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setMarkingsSkillMod(int const skillMod)
+{
+	m_markingsSkillMod = skillMod;
+}
+
+//-----------------------------------------------------------------------
+
+inline void ImageDesignChangeMessage::setHairSkillMod(int const skillMod)
+{
+	m_hairSkillMod = skillMod;
+}
+
+//-----------------------------------------------------------------------
+
+inline std::map<std::string, float> const & ImageDesignChangeMessage::getMorphParameterChanges() const
+{
+	return m_morphChanges;
+}
+
+//-----------------------------------------------------------------------
+
+inline std::map<std::string, int> const & ImageDesignChangeMessage::getIndexParameterChanges() const
+{
+	return m_indexChanges;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ImageDesignChangeMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignStartMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignStartMessage.cpp
new file mode 100644
index 00000000..41f7ec04
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignStartMessage.cpp
@@ -0,0 +1,63 @@
+// ======================================================================
+//
+// ImageDesignStartMessage.cpp
+//
+// Copyright 2002-2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ImageDesignStartMessage.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+// ======================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(ImageDesignStartMessage, CM_imageDesignerStart);
+
+//----------------------------------------------------------------------
+
+ImageDesignStartMessage::ImageDesignStartMessage(NetworkId const & designerId, NetworkId const & recipientId, NetworkId const & terminalId, std::string const & currentHoloEmote) :
+MessageQueue::Data(),
+m_designerId(designerId),
+m_recipientId(recipientId),
+m_terminalId(terminalId),
+m_currentHoloEmote(currentHoloEmote)
+{
+}
+
+//----------------------------------------------------------------------
+
+void ImageDesignStartMessage::pack(const MessageQueue::Data * const data, Archive::ByteStream & target)
+{
+	ImageDesignStartMessage const * const message = safe_cast<ImageDesignStartMessage const *> (data);
+	if(message)
+	{
+		Archive::put(target, message->getDesignerId());
+		Archive::put(target, message->getRecipientId());
+		Archive::put(target, message->getTerminalId());
+		Archive::put(target, message->getCurrentHoloEmote());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data * ImageDesignStartMessage::unpack(Archive::ReadIterator & source)
+{
+	NetworkId designerId;
+	NetworkId recipientId;
+	NetworkId terminalId;
+	std::string currentHoloEmote;
+	
+	Archive::get(source, designerId);
+	Archive::get(source, recipientId);
+	Archive::get(source, terminalId);
+	Archive::get(source, currentHoloEmote);
+	
+	return new ImageDesignStartMessage(designerId, recipientId, terminalId, currentHoloEmote);
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignStartMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignStartMessage.h
new file mode 100644
index 00000000..bfe11d94
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ImageDesignStartMessage.h
@@ -0,0 +1,74 @@
+// ======================================================================
+//
+// ImageDesignStartMessage.h
+//
+// Copyright 2002-2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_ImageDesignStartMessage_H
+#define	_ImageDesignStartMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+//-----------------------------------------------------------------------
+
+class ImageDesignStartMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	ImageDesignStartMessage(NetworkId const & designerId, NetworkId const & recipientId, NetworkId const & terminalId, std::string const & currentHoloEmote);
+
+public:
+	NetworkId const & getDesignerId() const;
+	NetworkId const & getRecipientId() const;
+	NetworkId const & getTerminalId() const;
+	std::string const & getCurrentHoloEmote() const;
+
+private:
+//disabled
+	ImageDesignStartMessage(ImageDesignStartMessage const & source);
+
+private:
+	NetworkId m_designerId;
+	NetworkId m_recipientId;
+	NetworkId m_terminalId;
+	std::string m_currentHoloEmote;
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & ImageDesignStartMessage::getDesignerId() const
+{
+	return m_designerId;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & ImageDesignStartMessage::getRecipientId() const
+{
+	return m_recipientId;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & ImageDesignStartMessage::getTerminalId() const
+{
+	return m_terminalId;
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const & ImageDesignStartMessage::getCurrentHoloEmote() const
+{
+	return m_currentHoloEmote;
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _ImageDesignStartMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorCommitMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorCommitMessage.cpp
new file mode 100644
index 00000000..0628a444
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorCommitMessage.cpp
@@ -0,0 +1,350 @@
+// ======================================================================
+//
+// IncubatorCommitMessage.cpp
+//
+// Copyright 2007 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/IncubatorCommitMessage.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+// ======================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(IncubatorCommitMessage, CM_incubatorCommit);
+
+//----------------------------------------------------------------------
+
+IncubatorCommitMessage::IncubatorCommitMessage() :
+MessageQueue::Data(),
+m_committed(true),
+m_terminalId(),
+m_slot1Id(),
+m_slot2Id(),
+m_slot3Id(),
+m_slot4Id(),
+m_initialPointsSurvival(0),
+m_initialPointsBeastialResilience(0),
+m_initialPointsCunning(0),
+m_initialPointsIntelligence(0),
+m_initialPointsAggression(0),
+m_initialPointsHuntersInstinct(0),
+m_totalPointsSurvival(0),
+m_totalPointsBeastialResilience(0),
+m_totalPointsCunning(0),
+m_totalPointsIntelligence(0),
+m_totalPointsAggression(0),
+m_totalPointsHuntersInstinct(0),
+m_temperatureGauge(0),
+m_nutrientGauge(0),
+m_newCreatureColorIndex(0)
+{
+	
+}
+
+IncubatorCommitMessage::IncubatorCommitMessage(
+	bool committed, 
+	NetworkId const & terminalId,
+	NetworkId const & slot1Id,
+	NetworkId const & slot2Id,
+	NetworkId const & slot3Id,
+	NetworkId const & slot4Id,
+	int initialPointsSurvival,
+		int initialPointsBeastialResilience,
+		int initialPointsCunning,
+		int initialPointsIntelligence,
+		int initialPointsAggression,
+		int initialPointsHuntersInstinct,
+		int totalPointsSurvival,
+		int totalPointsBeastialResilience,
+		int totalPointsCunning,
+		int totalPointsIntelligence,
+		int totalPointsAggression,
+		int totalPointsHuntersInstinct,
+		int temperatureGauge,
+		int nutrientGauge,
+		int newCreatureColorIndex
+) :
+MessageQueue::Data(),
+m_committed(committed),
+m_terminalId(terminalId),
+m_slot1Id(slot1Id),
+m_slot2Id(slot2Id),
+m_slot3Id(slot3Id),
+m_slot4Id(slot4Id),
+m_initialPointsSurvival(initialPointsSurvival),
+m_initialPointsBeastialResilience(initialPointsBeastialResilience),
+m_initialPointsCunning(initialPointsCunning),
+m_initialPointsIntelligence(initialPointsIntelligence),
+m_initialPointsAggression(initialPointsAggression),
+m_initialPointsHuntersInstinct(initialPointsHuntersInstinct),
+m_totalPointsSurvival(totalPointsSurvival),
+m_totalPointsBeastialResilience(totalPointsBeastialResilience),
+m_totalPointsCunning(totalPointsCunning),
+m_totalPointsIntelligence(totalPointsIntelligence),
+m_totalPointsAggression(totalPointsAggression),
+m_totalPointsHuntersInstinct(totalPointsHuntersInstinct),
+m_temperatureGauge(temperatureGauge),
+m_nutrientGauge(nutrientGauge),
+m_newCreatureColorIndex(newCreatureColorIndex)
+{
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setTerminalId(NetworkId const& val)
+{
+	m_terminalId = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setSlot1Id(NetworkId const& val)
+{
+	m_slot1Id = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setSlot2Id(NetworkId const& val)
+{
+	m_slot2Id = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setSlot3Id(NetworkId const& val)
+{
+	m_slot3Id = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setSlot4Id(NetworkId const& val)
+{
+	m_slot4Id = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setCommitted(bool val)
+{
+	m_committed = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setInitialPointsSurvival(int val)
+{
+	m_initialPointsSurvival = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setInitialPointsBeastialResilience(int val)
+{
+	m_initialPointsBeastialResilience = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setInitialPointsCunning(int val)
+{
+	m_initialPointsCunning = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setInitialPointsIntelligence(int val)
+{
+	m_initialPointsIntelligence = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setInitialPointsAggression(int val)
+{
+	m_initialPointsAggression = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setInitialPointsHuntersInstinct(int val)
+{
+	m_initialPointsHuntersInstinct = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setTotalPointsSurvival(int val)
+{
+	m_totalPointsSurvival = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setTotalPointsBeastialResilience(int val)
+{
+	m_totalPointsBeastialResilience = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setTotalPointsCunning(int val)
+{
+	m_totalPointsCunning = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setTotalPointsIntelligence(int val)
+{
+	m_totalPointsIntelligence = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setTotalPointsAggression(int val)
+{
+	m_totalPointsAggression = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setTotalPointsHuntersInstinct(int val)
+{
+	m_totalPointsHuntersInstinct = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setTemperatureGauge(int val)
+{
+	m_temperatureGauge = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::setNutrientGauge(int val)
+{
+	m_nutrientGauge = val;
+}
+
+void IncubatorCommitMessage::setNewCreatureColorIndex(int val)
+{
+	m_newCreatureColorIndex = val;
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorCommitMessage::pack(const MessageQueue::Data * const data, Archive::ByteStream & target)
+{
+	IncubatorCommitMessage const * const message = safe_cast<IncubatorCommitMessage const *> (data);
+	if(message)
+	{
+		Archive::put(target, message->getCommitted());
+		Archive::put(target, message->getTerminalId());
+		Archive::put(target, message->getSlot1Id());
+		Archive::put(target, message->getSlot2Id());
+		Archive::put(target, message->getSlot3Id());
+		Archive::put(target, message->getSlot4Id());
+		Archive::put(target,message->getInitialPointsSurvival());
+		Archive::put(target,message->getInitialPointsBeastialResilience());
+		Archive::put(target,message->getInitialPointsCunning());
+		Archive::put(target,message->getInitialPointsIntelligence());
+		Archive::put(target,message->getInitialPointsAggression());
+		Archive::put(target,message->getInitialPointsHuntersInstinct());
+		Archive::put(target,message->getTotalPointsSurvival());
+		Archive::put(target,message->getTotalPointsBeastialResilience());
+		Archive::put(target,message->getTotalPointsCunning());
+		Archive::put(target,message->getTotalPointsIntelligence());
+		Archive::put(target,message->getTotalPointsAggression());
+		Archive::put(target,message->getTotalPointsHuntersInstinct());
+		Archive::put(target,message->getTemperatureGauge());
+		Archive::put(target,message->getNutrientGauge());
+		Archive::put(target,message->getNewCreatureColorIndex());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data * IncubatorCommitMessage::unpack(Archive::ReadIterator & source)
+{
+	NetworkId terminalId;
+	NetworkId slot1Id;
+	NetworkId slot2Id;
+	NetworkId slot3Id;
+	NetworkId slot4Id;
+	bool committed;
+
+	int initialPointsSurvival;
+	int initialPointsBeastialResilience;
+	int initialPointsCunning;
+	int initialPointsIntelligence;
+	int initialPointsAggression;
+	int initialPointsHuntersInstinct;
+	int totalPointsSurvival;
+	int totalPointsBeastialResilience;
+	int totalPointsCunning;
+	int totalPointsIntelligence;
+	int totalPointsAggression;
+	int totalPointsHuntersInstinct;
+	int temperatureGauge;
+	int nutrientGauge;
+	int newCreatureColorIndex;
+	
+
+	Archive::get(source, committed);
+	Archive::get(source, terminalId);
+	Archive::get(source, slot1Id);
+	Archive::get(source, slot2Id);
+	Archive::get(source, slot3Id);
+	Archive::get(source, slot4Id);
+
+	Archive::get(source, initialPointsSurvival);
+	Archive::get(source, initialPointsBeastialResilience);
+	Archive::get(source, initialPointsCunning);
+	Archive::get(source, initialPointsIntelligence);
+	Archive::get(source, initialPointsAggression);
+	Archive::get(source, initialPointsHuntersInstinct);
+	Archive::get(source, totalPointsSurvival);
+	Archive::get(source, totalPointsBeastialResilience);
+	Archive::get(source, totalPointsCunning);
+	Archive::get(source, totalPointsIntelligence);
+	Archive::get(source, totalPointsAggression);
+	Archive::get(source, totalPointsHuntersInstinct);
+	Archive::get(source, temperatureGauge);
+	Archive::get(source, nutrientGauge);
+	Archive::get(source, newCreatureColorIndex);
+	
+	return new IncubatorCommitMessage(
+		committed, 
+		terminalId,
+		slot1Id,
+		slot2Id,
+		slot3Id,
+		slot4Id,
+		initialPointsSurvival,
+		initialPointsBeastialResilience,
+		initialPointsCunning,
+		initialPointsIntelligence,
+		initialPointsAggression,
+		initialPointsHuntersInstinct,
+		totalPointsSurvival,
+		totalPointsBeastialResilience,
+		totalPointsCunning,
+		totalPointsIntelligence,
+		totalPointsAggression,
+		totalPointsHuntersInstinct,
+		temperatureGauge,
+		nutrientGauge,
+		newCreatureColorIndex
+	);
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorCommitMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorCommitMessage.h
new file mode 100644
index 00000000..349b8e22
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorCommitMessage.h
@@ -0,0 +1,272 @@
+// ======================================================================
+//
+// IncubatorCommitMessage.h
+//
+// Copyright 2007 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_IncubatorCommitMessage_H
+#define	_IncubatorCommitMessage_H
+
+//-----------------------------------------------------------------------
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+//-----------------------------------------------------------------------
+
+class IncubatorCommitMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	IncubatorCommitMessage();
+	IncubatorCommitMessage(
+		bool committed,
+		NetworkId const & terminalId,
+		NetworkId const & slot1Id,
+		NetworkId const & slot2Id,
+		NetworkId const & slot3Id,
+		NetworkId const & slot4Id,
+		int initialPointsSurvival,
+		int initialPointsBeastialResilience,
+		int initialPointsCunning,
+		int initialPointsIntelligence,
+		int initialPointsAggression,
+		int initialPointsHuntersInstinct,
+		int totalPointsSurvival,
+		int totalPointsBeastialResilience,
+		int totalPointsCunning,
+		int totalPointsIntelligence,
+		int totalPointsAggression,
+		int totalPointsHuntersInstinct,
+		int temperatureGauge,
+		int nutrientGauge,
+		int newCreatureColorIndex
+		);
+
+public:
+	NetworkId const & getTerminalId() const;
+	NetworkId const & getSlot1Id() const;
+	NetworkId const & getSlot2Id() const;
+	NetworkId const & getSlot3Id() const;
+	NetworkId const & getSlot4Id() const;
+	bool getCommitted() const;
+	int getInitialPointsSurvival() const;
+	int getInitialPointsBeastialResilience() const;
+	int getInitialPointsCunning() const;
+	int getInitialPointsIntelligence() const;
+	int getInitialPointsAggression() const;
+	int getInitialPointsHuntersInstinct() const;
+	int getTotalPointsSurvival() const;
+	int getTotalPointsBeastialResilience() const;
+	int getTotalPointsCunning() const;
+	int getTotalPointsIntelligence() const;
+	int getTotalPointsAggression() const;
+	int getTotalPointsHuntersInstinct() const;
+	int getTemperatureGauge() const;
+	int getNutrientGauge() const;
+	int getNewCreatureColorIndex() const;
+
+	void setTerminalId(NetworkId const& val);
+	void setCommitted(bool val);
+	void setSlot1Id(NetworkId const& val);
+	void setSlot2Id(NetworkId const& val);
+	void setSlot3Id(NetworkId const& val);
+	void setSlot4Id(NetworkId const& val);
+	void setInitialPointsSurvival(int val);
+	void setInitialPointsBeastialResilience(int val);
+	void setInitialPointsCunning(int val);
+	void setInitialPointsIntelligence(int val);
+	void setInitialPointsAggression(int val);
+	void setInitialPointsHuntersInstinct(int val);
+	void setTotalPointsSurvival(int val);
+	void setTotalPointsBeastialResilience(int val);
+	void setTotalPointsCunning(int val);
+	void setTotalPointsIntelligence(int val);
+	void setTotalPointsAggression(int val);
+	void setTotalPointsHuntersInstinct(int val);
+	void setTemperatureGauge(int val);
+	void setNutrientGauge(int val);
+	void setNewCreatureColorIndex(int val);
+
+private:
+//disabled
+	IncubatorCommitMessage(IncubatorCommitMessage const & source);
+
+private:
+	bool m_committed;
+	NetworkId m_terminalId;
+
+	NetworkId m_slot1Id;
+	NetworkId m_slot2Id;
+	NetworkId m_slot3Id;
+	NetworkId m_slot4Id;
+	
+	int m_initialPointsSurvival;
+	int m_initialPointsBeastialResilience;
+	int m_initialPointsCunning;
+	int m_initialPointsIntelligence;
+	int m_initialPointsAggression;
+	int m_initialPointsHuntersInstinct;
+
+	int m_totalPointsSurvival;
+	int m_totalPointsBeastialResilience;
+	int m_totalPointsCunning;
+	int m_totalPointsIntelligence;
+	int m_totalPointsAggression;
+	int m_totalPointsHuntersInstinct;
+
+	int m_temperatureGauge;
+	int m_nutrientGauge;
+
+	int m_newCreatureColorIndex;
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & IncubatorCommitMessage::getTerminalId() const
+{
+	return m_terminalId;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & IncubatorCommitMessage::getSlot1Id() const
+{
+	return m_slot1Id;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & IncubatorCommitMessage::getSlot2Id() const
+{
+	return m_slot2Id;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & IncubatorCommitMessage::getSlot3Id() const
+{
+	return m_slot3Id;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & IncubatorCommitMessage::getSlot4Id() const
+{
+	return m_slot4Id;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool IncubatorCommitMessage::getCommitted() const
+{
+	return m_committed;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorCommitMessage::getInitialPointsSurvival() const
+{
+	return m_initialPointsSurvival;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorCommitMessage::getInitialPointsBeastialResilience() const
+{
+	return m_initialPointsBeastialResilience;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorCommitMessage::getInitialPointsCunning() const
+{
+	return m_initialPointsCunning;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorCommitMessage::getInitialPointsIntelligence() const
+{
+	return m_initialPointsIntelligence;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorCommitMessage::getInitialPointsAggression() const
+{
+	return m_initialPointsAggression;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorCommitMessage::getInitialPointsHuntersInstinct() const
+{
+	return m_initialPointsHuntersInstinct;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorCommitMessage::getTotalPointsSurvival() const
+{
+	return m_totalPointsSurvival;
+}
+
+// ----------------------------------------------------------------------
+inline int IncubatorCommitMessage::getTotalPointsBeastialResilience() const
+{
+	return m_totalPointsBeastialResilience;
+}
+
+// ----------------------------------------------------------------------
+inline int IncubatorCommitMessage::getTotalPointsCunning() const
+{
+	return m_totalPointsCunning;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorCommitMessage::getTotalPointsIntelligence() const
+{
+	return m_totalPointsIntelligence;
+}
+
+// ----------------------------------------------------------------------
+inline int IncubatorCommitMessage::getTotalPointsAggression() const
+{
+	return m_totalPointsAggression;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorCommitMessage::getTotalPointsHuntersInstinct() const
+{
+	return m_totalPointsHuntersInstinct;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorCommitMessage::getTemperatureGauge() const
+{
+	return m_temperatureGauge; // 0 -> 10
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorCommitMessage::getNutrientGauge() const
+{
+	return m_nutrientGauge; // 0 -> 10
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorCommitMessage::getNewCreatureColorIndex() const
+{
+	return m_newCreatureColorIndex;
+}
+
+// ----------------------------------------------------------------------
+#endif 
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorStartMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorStartMessage.cpp
new file mode 100644
index 00000000..47109e97
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorStartMessage.cpp
@@ -0,0 +1,162 @@
+// ======================================================================
+//
+// IncubatorStartMessage.cpp
+//
+// Copyright 2007 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/IncubatorStartMessage.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+#include <cstdio>
+
+// ======================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(IncubatorStartMessage, CM_incubatorStart);
+
+//----------------------------------------------------------------------
+
+IncubatorStartMessage::IncubatorStartMessage(
+		int sessionNumber,
+		NetworkId const & playerId, 
+		NetworkId const & terminalId,
+		int powerGauge,
+		int initialPointsSurvival,
+		int initialPointsBeastialResilience,
+		int initialPointsCunning,
+		int initialPointsIntelligence,
+		int initialPointsAggression,
+		int initialPointsHuntersInstinct,
+		int temperatureGauge,
+		int nutrientGauge,
+		int initialCreatureColorIndex,
+		std::string const& creatureTemplateName
+		) :
+MessageQueue::Data(),
+m_sessionNumber(sessionNumber),
+m_playerId(playerId),
+m_terminalId(terminalId),
+m_powerGauge(powerGauge),
+m_initialPointsSurvival(initialPointsSurvival),
+m_initialPointsBeastialResilience(initialPointsBeastialResilience),
+m_initialPointsCunning(initialPointsCunning),
+m_initialPointsIntelligence(initialPointsIntelligence),
+m_initialPointsAggression(initialPointsAggression),
+m_initialPointsHuntersInstinct(initialPointsHuntersInstinct),
+m_temperatureGauge(temperatureGauge),
+m_nutrientGauge(nutrientGauge),
+m_initialCreatureColorIndex(initialCreatureColorIndex),
+m_creatureTemplateName(creatureTemplateName)
+{
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorStartMessage::pack(const MessageQueue::Data * const data, Archive::ByteStream & target)
+{
+	IncubatorStartMessage const * const message = safe_cast<IncubatorStartMessage const *> (data);
+	if(message)
+	{
+		Archive::put(target, message->getSessionNumber());
+		Archive::put(target, message->getPlayerId());
+		Archive::put(target, message->getTerminalId());
+		Archive::put(target, message->getPowerGauge());
+		Archive::put(target, message->getInitialPointsSurvival());
+		Archive::put(target, message->getInitialPointsBeastialResilience());
+		Archive::put(target, message->getInitialPointsCunning());
+		Archive::put(target, message->getInitialPointsIntelligence());
+		Archive::put(target, message->getInitialPointsAggression());
+		Archive::put(target, message->getInitialPointsHuntersInstinct());
+		Archive::put(target, message->getTemperatureGauge());
+		Archive::put(target, message->getNutrientGauge() );
+		Archive::put(target, message->getInitialCreatureColorIndex() );
+		Archive::put(target, message->getCreatureTemplateName());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data * IncubatorStartMessage::unpack(Archive::ReadIterator & source)
+{
+	int sessionNumber; 
+	NetworkId playerId;
+	NetworkId terminalId;
+	int powerGauge;
+	int initialPointsSurvival;
+	int initialPointsBeastialResilience;
+	int initialPointsCunning;
+	int initialPointsIntelligence;
+	int initialPointsAggression;
+	int initialPointsHuntersInstinct;
+	int temperatureGauge; 
+	int nutrientGauge; 
+	int initialCreatureColorIndex;
+	std::string creatureTemplateName;
+	
+	Archive::get(source, sessionNumber);
+	Archive::get(source, playerId);
+	Archive::get(source, terminalId);
+	Archive::get(source, powerGauge);
+	Archive::get(source, initialPointsSurvival);
+	Archive::get(source, initialPointsBeastialResilience);
+	Archive::get(source, initialPointsCunning);
+	Archive::get(source, initialPointsIntelligence);
+	Archive::get(source, initialPointsAggression);
+	Archive::get(source, initialPointsHuntersInstinct);
+	Archive::get(source, temperatureGauge);
+	Archive::get(source, nutrientGauge);
+	Archive::get(source, initialCreatureColorIndex);
+	Archive::get(source, creatureTemplateName);
+	
+	return new IncubatorStartMessage(
+		sessionNumber,
+		playerId, 
+		terminalId,
+		powerGauge,
+		initialPointsSurvival,
+		initialPointsBeastialResilience,
+		initialPointsCunning,
+		initialPointsIntelligence,
+		initialPointsAggression,
+		initialPointsHuntersInstinct,
+		temperatureGauge,
+		nutrientGauge,
+		initialCreatureColorIndex,
+		creatureTemplateName
+	);
+}
+
+//----------------------------------------------------------------------
+
+void IncubatorStartMessage::getStringRepresentation(std::string& buff) const
+{
+	char tmp[512];
+
+	sprintf(tmp,
+		"%d %s %s %d %d %d %d %d %d %d %d %d %d %s ",
+		getSessionNumber(),
+		getPlayerId().getValueString().c_str(),
+		getTerminalId().getValueString().c_str(),
+		getPowerGauge(),
+		getInitialPointsSurvival(),
+		getInitialPointsBeastialResilience(),
+		getInitialPointsCunning(),
+		getInitialPointsIntelligence(),
+		getInitialPointsAggression(),
+		getInitialPointsHuntersInstinct(),
+		getTemperatureGauge(),
+		getNutrientGauge(),
+		getInitialCreatureColorIndex(), 
+		getCreatureTemplateName().c_str()
+	);
+
+	buff = tmp;
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorStartMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorStartMessage.h
new file mode 100644
index 00000000..ca8b156d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IncubatorStartMessage.h
@@ -0,0 +1,180 @@
+// ======================================================================
+//
+// IncubatorStartMessage.h
+//
+// Copyright 2007 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_IncubatorStartMessage_H
+#define	_IncubatorStartMessage_H
+
+//-----------------------------------------------------------------------
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+//-----------------------------------------------------------------------
+
+class IncubatorStartMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	IncubatorStartMessage(
+		int sessionNumber,
+		NetworkId const & playerId, 
+		NetworkId const & terminalId,
+		int powerGauge,
+		int initialPointsSurvival,
+		int initialPointsBeastialResilience,
+		int initialPointsCunning,
+		int initialPointsIntelligence,
+		int initialPointsAggression,
+		int initialPointsHuntersInstinct,
+		int temperatureGauge,
+		int nutrientGauge,
+		int initialCreatureColorIndex,
+		std::string const& creatureTemplateName
+	);
+
+public:
+	int getSessionNumber() const;
+	NetworkId const & getPlayerId() const;
+	NetworkId const & getTerminalId() const;
+	int getPowerGauge() const;
+	int getInitialPointsSurvival() const;
+	int getInitialPointsBeastialResilience() const;
+	int getInitialPointsCunning() const;
+	int getInitialPointsIntelligence() const;
+	int getInitialPointsAggression() const;
+	int getInitialPointsHuntersInstinct() const;
+	int getTemperatureGauge() const;
+	int getNutrientGauge() const;
+	int getInitialCreatureColorIndex() const;
+	std::string const& getCreatureTemplateName() const;
+
+	void getStringRepresentation(std::string& buff) const;
+
+private:
+//disabled
+	IncubatorStartMessage(IncubatorStartMessage const & source);
+
+private:
+	int m_sessionNumber; // 1-3
+	NetworkId m_playerId;
+	NetworkId m_terminalId;
+	int m_powerGauge; // 0 -> 1000
+	int m_initialPointsSurvival;
+	int m_initialPointsBeastialResilience;
+	int m_initialPointsCunning;
+	int m_initialPointsIntelligence;
+	int m_initialPointsAggression;
+	int m_initialPointsHuntersInstinct;
+	int m_temperatureGauge; // 0 -> 10
+	int m_nutrientGauge; // 0 -> 10
+	int m_initialCreatureColorIndex;
+	std::string m_creatureTemplateName;
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & IncubatorStartMessage::getPlayerId() const
+{
+	return m_playerId;
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & IncubatorStartMessage::getTerminalId() const
+{
+	return m_terminalId;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorStartMessage::getSessionNumber() const
+{
+	return m_sessionNumber;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorStartMessage::getPowerGauge() const
+{
+	return m_powerGauge;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorStartMessage::getInitialPointsSurvival() const
+{
+	return m_initialPointsSurvival;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorStartMessage::getInitialPointsBeastialResilience() const
+{
+	return m_initialPointsBeastialResilience;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorStartMessage::getInitialPointsCunning() const
+{
+	return m_initialPointsCunning;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorStartMessage::getInitialPointsIntelligence() const
+{
+	return m_initialPointsIntelligence;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorStartMessage::getInitialPointsAggression() const
+{
+	return m_initialPointsAggression;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorStartMessage::getInitialPointsHuntersInstinct() const
+{
+	return m_initialPointsHuntersInstinct;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorStartMessage::getTemperatureGauge() const
+{
+	return m_temperatureGauge; // 0 -> 10
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorStartMessage::getNutrientGauge() const
+{
+	return m_nutrientGauge; // 0 -> 10
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const& IncubatorStartMessage::getCreatureTemplateName() const
+{
+	return m_creatureTemplateName;
+}
+
+// ----------------------------------------------------------------------
+
+inline int IncubatorStartMessage::getInitialCreatureColorIndex() const
+{
+	return m_initialCreatureColorIndex;
+}
+
+// ----------------------------------------------------------------------
+
+#endif 
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerMessage.cpp
new file mode 100644
index 00000000..4be6d19a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerMessage.cpp
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// IsVendorOwnerMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/IsVendorOwnerMessage.h"
+
+// ======================================================================
+
+IsVendorOwnerMessage::IsVendorOwnerMessage(NetworkId containerId) :
+	GameNetworkMessage("IsVendorOwnerMessage"),
+	m_containerId(containerId)
+{
+	AutoByteStream::addVariable(m_containerId);
+}
+
+// ======================================================================
+
+IsVendorOwnerMessage::IsVendorOwnerMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("IsVendorOwnerMessage"),
+	m_containerId()
+{
+	AutoByteStream::addVariable(m_containerId);
+	unpack(source);
+}
+
+// ======================================================================
+
+IsVendorOwnerMessage::~IsVendorOwnerMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerMessage.h
new file mode 100644
index 00000000..2bbabf4c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerMessage.h
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// IsVendorOwnerMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_IsVendorOwnerMessage_H
+#define	_IsVendorOwnerMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class IsVendorOwnerMessage : public GameNetworkMessage
+{
+public:
+
+	IsVendorOwnerMessage(NetworkId containerId);
+	explicit IsVendorOwnerMessage(Archive::ReadIterator &source);
+
+	~IsVendorOwnerMessage();
+
+public: // methods
+
+	NetworkId                        getContainerId() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId> m_containerId;
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId IsVendorOwnerMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _IsVendorOwnerMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerResponseMessage.cpp
new file mode 100644
index 00000000..3fa8eaf9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerResponseMessage.cpp
@@ -0,0 +1,61 @@
+// ======================================================================
+//
+// IsVendorOwnerResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/IsVendorOwnerResponseMessage.h"
+
+// ======================================================================
+
+const char * const IsVendorOwnerResponseMessage::MessageType = "IsVendorOwnerResponseMessage";
+
+//----------------------------------------------------------------------
+
+IsVendorOwnerResponseMessage::IsVendorOwnerResponseMessage(
+	const NetworkId &containerId,
+	const std::string &marketName,
+	IsVendorOwnerResponseMessage::VendorOwnerResult ownerResult, 
+	AuctionResult result,
+	uint16 maxPageSize
+) :
+	GameNetworkMessage(MessageType),
+	m_ownerResult(static_cast<int>(ownerResult)),
+	m_result(result),
+	m_containerId(containerId),
+	m_marketName(marketName),
+	m_maxPageSize(maxPageSize)
+{
+	AutoByteStream::addVariable(m_ownerResult);
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_containerId);
+	AutoByteStream::addVariable(m_marketName);
+	AutoByteStream::addVariable(m_maxPageSize);
+}
+
+// ======================================================================
+
+IsVendorOwnerResponseMessage::IsVendorOwnerResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage(MessageType),
+	m_ownerResult(0),
+	m_result(0),
+	m_containerId(),
+	m_marketName(),
+	m_maxPageSize(0)
+{
+	AutoByteStream::addVariable(m_ownerResult);
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_containerId);
+	AutoByteStream::addVariable(m_marketName);
+	AutoByteStream::addVariable(m_maxPageSize);
+	unpack(source);
+}
+
+// ======================================================================
+
+IsVendorOwnerResponseMessage::~IsVendorOwnerResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerResponseMessage.h
new file mode 100644
index 00000000..c51cec51
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/IsVendorOwnerResponseMessage.h
@@ -0,0 +1,95 @@
+// ======================================================================
+//
+// IsVendorOwnerResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_IsVendorOwnerResponseMessage_H
+#define	_IsVendorOwnerResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/AuctionErrorCodes.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class IsVendorOwnerResponseMessage : public GameNetworkMessage
+{
+public:
+
+	enum VendorOwnerResult
+	{
+		vor_IsOwner,
+		vor_IsNotOwner,
+		vor_HasNoOwner
+	};
+
+	static const char * const MessageType;
+
+	IsVendorOwnerResponseMessage(const NetworkId &containerId, const std::string &marketName, VendorOwnerResult ownerResult, AuctionResult result, uint16 maxPageSize);
+	explicit IsVendorOwnerResponseMessage(Archive::ReadIterator &source);
+
+	~IsVendorOwnerResponseMessage();
+
+public: // methods
+
+	VendorOwnerResult                getOwnerResult () const;
+	AuctionResult                    getResult      () const;
+	const NetworkId &                getContainerId () const;
+	const std::string &              getMarketName  () const;
+	uint16                           getMaxPageSize () const; //returns the maximum size that a queried page will return
+
+public: // types
+
+private: 
+	Archive::AutoVariable<int>               m_ownerResult;  
+	Archive::AutoVariable<int>               m_result;   
+	Archive::AutoVariable<NetworkId>         m_containerId;   
+	Archive::AutoVariable<std::string>       m_marketName;   
+	Archive::AutoVariable<uint16>            m_maxPageSize;   
+};
+
+// ----------------------------------------------------------------------
+
+inline IsVendorOwnerResponseMessage::VendorOwnerResult IsVendorOwnerResponseMessage::getOwnerResult() const
+{
+	return static_cast<VendorOwnerResult>(m_ownerResult.get());
+}
+
+// ----------------------------------------------------------------------
+
+inline AuctionResult IsVendorOwnerResponseMessage::getResult() const
+{
+	return static_cast<AuctionResult>(m_result.get());
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & IsVendorOwnerResponseMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+//----------------------------------------------------------------------
+
+inline const std::string & IsVendorOwnerResponseMessage::getMarketName  () const
+{
+	return m_marketName.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline uint16 IsVendorOwnerResponseMessage::getMaxPageSize  () const
+{
+	return m_maxPageSize.get ();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _IsVendorOwnerResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/LogoutMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/LogoutMessage.cpp
new file mode 100644
index 00000000..35c89d98
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/LogoutMessage.cpp
@@ -0,0 +1,34 @@
+// ======================================================================
+//
+// LogoutMessage.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "LogoutMessage.h"
+
+// ======================================================================
+
+LogoutMessage::LogoutMessage() :
+	GameNetworkMessage("LogoutMessage")
+{
+}
+
+// ----------------------------------------------------------------------
+
+LogoutMessage::LogoutMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("LogoutMessage")
+{
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+LogoutMessage::~LogoutMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/LogoutMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/LogoutMessage.h
new file mode 100644
index 00000000..4f3914bb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/LogoutMessage.h
@@ -0,0 +1,33 @@
+// ======================================================================
+//
+// LogoutMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_LogoutMessage_H
+#define	_INCLUDED_LogoutMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class LogoutMessage : public GameNetworkMessage
+{
+public:
+	LogoutMessage();
+	LogoutMessage(Archive::ReadIterator &source);
+	~LogoutMessage();
+
+private:
+	LogoutMessage(LogoutMessage const &);
+	LogoutMessage &operator=(LogoutMessage const &);
+};
+
+// ======================================================================
+
+#endif	// _INCLUDED_LogoutMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocation.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocation.cpp
new file mode 100644
index 00000000..ec63e447
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocation.cpp
@@ -0,0 +1,65 @@
+// MapLocation.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MapLocation.h"
+
+//-----------------------------------------------------------------------
+
+MapLocation::MapLocation() :
+m_locationId   (),
+m_locationName (),
+m_location     (),
+m_category     (0),
+m_subCategory  (0),
+m_flags        (0),
+m_size		   (0.0f)
+{
+}
+
+//----------------------------------------------------------------------
+
+MapLocation::MapLocation(const MapLocation &rhs) :
+m_locationId   (rhs.m_locationId),
+m_locationName (rhs.m_locationName),
+m_location     (rhs.m_location),
+m_category     (rhs.m_category),
+m_subCategory  (rhs.m_subCategory),
+m_flags        (rhs.m_flags),
+m_size		   (rhs.m_size)
+{
+}
+
+//----------------------------------------------------------------------
+
+MapLocation::MapLocation(const NetworkId &locationId, const Unicode::String &locationName, const Vector2d &location, uint8 category, uint8 subCategory, uint8 flags, float size) :
+m_locationId   (locationId),
+m_locationName (locationName),
+m_location     (location),
+m_category     (category),
+m_subCategory  (subCategory),
+m_flags        (flags),
+m_size		   (size)
+{
+
+}
+
+//----------------------------------------------------------------------
+
+MapLocation & MapLocation::operator= (const MapLocation &rhs)
+{
+	if (this != &rhs)
+	{
+		m_locationId   = rhs.m_locationId;
+		m_locationName = rhs.m_locationName;
+		m_location     = rhs.m_location;
+		m_category     = rhs.m_category;
+		m_subCategory  = rhs.m_subCategory;
+		m_flags        = rhs.m_flags;
+		m_size		   = rhs.m_size;
+	}
+	return *this;
+}
+
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocation.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocation.h
new file mode 100644
index 00000000..383726c5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocation.h
@@ -0,0 +1,99 @@
+// MapLocation.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef	_INCLUDED_MapLocation_H
+#define	_INCLUDED_MapLocation_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector2d.h"
+#include "Unicode.h"
+
+//-----------------------------------------------------------------------
+
+class MapLocation
+{
+public:
+
+	enum Flags
+	{
+		F_inactive = 0x0001,
+		F_active   = 0x0002,
+	};
+
+	MapLocation & operator = (const MapLocation & rhs);
+	bool operator== (const MapLocation & rhs) const;
+	bool operator!= (const MapLocation & rhs) const;
+//	bool operator<  (const MapLocation & rhs) const;
+	MapLocation();
+	MapLocation(const MapLocation & source);
+	MapLocation(const NetworkId &locationId, const Unicode::String &locationName, const Vector2d &location, uint8 category, uint8 subCategory, uint8 flags, float size = 0.0f);
+
+	const NetworkId &          getLocationId        () const;
+	const Unicode::String &    getLocationName      () const;
+	const Vector2d &           getLocation          () const;
+	const uint8                getCategory          () const;
+	const uint8                getSubCategory       () const;
+	const uint8                getFlags             () const;
+	const bool                 isActive             () const;
+	const bool                 isInactive           () const;
+	const float				   getSize              () const;
+
+	NetworkId             m_locationId;
+	Unicode::String       m_locationName;
+	Vector2d              m_location;
+	uint8                 m_category;
+	uint8                 m_subCategory;
+	uint8                 m_flags;
+	float				  m_size;
+};
+
+//----------------------------------------------------------------------
+
+inline const NetworkId          & MapLocation::getLocationId        () const {return m_locationId;}
+inline const Unicode::String    & MapLocation::getLocationName      () const {return m_locationName;}
+inline const Vector2d           & MapLocation::getLocation          () const {return m_location;}
+inline const uint8                MapLocation::getCategory          () const {return m_category;}
+inline const uint8                MapLocation::getSubCategory       () const {return m_subCategory;}
+inline const uint8                MapLocation::getFlags             () const {return m_flags;}
+inline const float				  MapLocation::getSize              () const {return m_size;}
+
+//----------------------------------------------------------------------
+
+
+inline bool MapLocation::operator== (const MapLocation & rhs) const
+{
+	return 
+		m_locationId   == rhs.m_locationId &&
+		m_locationName == rhs.m_locationName &&
+		m_location     == rhs.m_location &&
+		m_category     == rhs.m_category &&
+		m_subCategory  == rhs.m_subCategory &&
+		m_flags        == rhs.m_flags;
+}
+
+//----------------------------------------------------------------------
+
+inline bool MapLocation::operator!= (const MapLocation & rhs) const
+{
+	return !(*this == rhs);
+}
+
+//----------------------------------------------------------------------
+
+inline const bool MapLocation::isInactive           () const
+{
+	return (m_flags & F_inactive) != 0;
+}
+
+//----------------------------------------------------------------------
+
+inline const bool MapLocation::isActive           () const
+{
+	return (m_flags & F_active) != 0;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MapLocation_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocationArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocationArchive.cpp
new file mode 100644
index 00000000..d684d2c0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocationArchive.cpp
@@ -0,0 +1,44 @@
+//======================================================================
+//
+// MapLocationArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MapLocationArchive.h"
+
+#include "Archive/Archive.h"
+#include "Archive/ByteStream.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/MapLocation.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator &source, MapLocation &target)
+	{
+		get (source, target.m_locationId);  
+		get (source, target.m_locationName); 
+		get (source, target.m_location.x);
+		get (source, target.m_location.y);
+		get (source, target.m_category);
+		get (source, target.m_subCategory);
+		get (source, target.m_flags);
+	}
+
+	void put (ByteStream &target, const MapLocation &source)
+	{
+		put (target, source.m_locationId);  
+		put (target, source.m_locationName); 
+		put (target, source.m_location.x);
+		put (target, source.m_location.y);
+		put (target, source.m_category);
+		put (target, source.m_subCategory);
+		put (target, source.m_flags);
+	}
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocationArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocationArchive.h
new file mode 100644
index 00000000..5de3a8ad
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MapLocationArchive.h
@@ -0,0 +1,22 @@
+// MapLocationArchive.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef	_INCLUDED_MapLocationArchive_H
+#define	_INCLUDED_MapLocationArchive_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/ByteStream.h"
+#include "sharedNetworkMessages/MapLocation.h"
+
+//-----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator &source, MapLocation &target);
+	void put (ByteStream &target, const MapLocation &source);
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MapLocationArchive_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueChangeRoleIconChoice.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueChangeRoleIconChoice.cpp
new file mode 100644
index 00000000..4dd8675f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueChangeRoleIconChoice.cpp
@@ -0,0 +1,65 @@
+//========================================================================
+//
+// MessageQueueChangeRoleIconChoice.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueChangeRoleIconChoice.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueChangeRoleIconChoice, CM_changeRoleIconChoice);
+
+//----------------------------------------------------------------------
+
+MessageQueueChangeRoleIconChoice::MessageQueueChangeRoleIconChoice (int newRoleIconChoice, uint8 sequenceId) :
+m_roleIconChoice  (newRoleIconChoice),
+m_sequenceId      (sequenceId)
+{
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+MessageQueueChangeRoleIconChoice::~MessageQueueChangeRoleIconChoice ()
+{
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueChangeRoleIconChoice::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueChangeRoleIconChoice* const msg = safe_cast<const MessageQueueChangeRoleIconChoice*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->getRoleIconChoice ());
+		Archive::put(target, msg->getSequenceId ());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueChangeRoleIconChoice::unpack (Archive::ReadIterator & source)
+{
+	int newRoleIconChoice = 0;
+	uint8 sequenceId = 0;
+	
+	Archive::get(source, newRoleIconChoice);
+	Archive::get(source, sequenceId);
+	
+	return new MessageQueueChangeRoleIconChoice(newRoleIconChoice, sequenceId);
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueChangeRoleIconChoice.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueChangeRoleIconChoice.h
new file mode 100644
index 00000000..a3edba80
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueChangeRoleIconChoice.h
@@ -0,0 +1,56 @@
+//========================================================================
+//
+// MessageQueueChangeRoleIconChoice.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueChangeRoleIconChoice_H
+#define INCLUDED_MessageQueueChangeRoleIconChoice_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+class MessageQueueChangeRoleIconChoice : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueChangeRoleIconChoice (int newRoleIconChoice, uint8 sequenceId);
+	virtual ~MessageQueueChangeRoleIconChoice ();
+
+	int               getRoleIconChoice  () const;
+	uint8             getSequenceId      () const;
+
+private:
+	int               m_roleIconChoice;
+	uint8             m_sequenceId;
+
+private:
+	MessageQueueChangeRoleIconChoice (const MessageQueueChangeRoleIconChoice &);
+	MessageQueueChangeRoleIconChoice & operator= (const MessageQueueChangeRoleIconChoice &);
+};
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueChangeRoleIconChoice::getRoleIconChoice () const
+{
+	return m_roleIconChoice;
+}
+
+//----------------------------------------------------------------------
+
+inline uint8 MessageQueueChangeRoleIconChoice::getSequenceId () const
+{
+	return m_sequenceId;
+}
+
+//----------------------------------------------------------------------
+
+#endif	// INCLUDED_MessageQueueChangeRoleIconChoice_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatCommand.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatCommand.cpp
new file mode 100644
index 00000000..88bfbdd1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatCommand.cpp
@@ -0,0 +1,35 @@
+//======================================================================
+//
+// MessageQueueCombatCommand.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCombatCommand.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+
+//===================================================================
+
+MEMORY_BLOCK_MANAGER_IMPLEMENTATION_WITH_INSTALL(MessageQueueCombatCommand, true, 0, 0, 0);
+
+//===================================================================
+
+
+//-----------------------------------------------------------------------
+
+MessageQueueCombatCommand::MessageQueueCombatCommand (const std::string & str, uint32 sequenceId) :
+Data (),
+m_string (str),
+m_sequenceId (sequenceId)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueCombatCommand::~MessageQueueCombatCommand()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatCommand.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatCommand.h
new file mode 100644
index 00000000..3da65d84
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatCommand.h
@@ -0,0 +1,61 @@
+//======================================================================
+//
+// MessageQueueCombatCommand.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueCombatCommand_H
+#define INCLUDED_MessageQueueCombatCommand_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/MemoryBlockManagerMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+/**
+* A generic message queue data that contains a simple payload of one String.
+* The meaning of the String is context and message dependant.
+*
+*/
+
+class MessageQueueCombatCommand : public MessageQueue::Data
+{
+	MEMORY_BLOCK_MANAGER_INTERFACE_WITH_INSTALL;
+
+public:
+
+	explicit                MessageQueueCombatCommand (const std::string & str, uint32 sequenceId);
+	virtual                ~MessageQueueCombatCommand();
+
+	const std::string &     getString     (void) const;
+	uint32                  getSequenceId (void) const;
+
+private:
+
+	MessageQueueCombatCommand&  operator= (const MessageQueueCombatCommand & source);
+	                     MessageQueueCombatCommand(const MessageQueueCombatCommand & source);
+
+	std::string m_string;
+	uint32      m_sequenceId;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & MessageQueueCombatCommand::getString (void) const
+{
+	return m_string;
+}
+
+//-----------------------------------------------------------------------
+
+inline uint32 MessageQueueCombatCommand::getSequenceId (void) const
+{
+	return m_sequenceId;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _MessageQueueCombatCommand_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpam.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpam.cpp
new file mode 100644
index 00000000..2c313abd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpam.cpp
@@ -0,0 +1,219 @@
+//======================================================================
+//
+// MessageQueueCombatSpam.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCombatSpam.h"
+
+#include "sharedFoundation/NetworkId.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueCombatSpamArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_WITH_ARCHIVE(MessageQueueCombatSpam, CM_combatSpam);
+
+
+//===================================================================
+
+MessageQueueCombatSpam::MessageQueueCombatSpam(const NetworkId & attacker, const Vector & attackerPosition_w, const NetworkId & defender, const Vector & defenderPosition_w, const NetworkId & weapon, const NetworkId & armor, const StringId & attackName, int rawDamage, int damageType, int elementalDamage, int elementalDamageType, int bleedDamage, int critDamage, int blockedDamage, int finalDamage, int hitLocation, bool success, bool critical, bool glancing, bool crushing, bool strikethrough, float strikethroughAmmount, bool evadeResult, float evadeAmmount, bool blockResult, int block, bool dodge, bool parry, bool proc, int spamType) :
+	MessageQueue::Data(),
+	m_attacker(attacker),
+	m_attackerPosition_w(attackerPosition_w),
+	m_defender(defender),
+	m_defenderPosition_w(defenderPosition_w),
+	m_weapon(weapon),
+	m_weaponName(),
+	m_armor(armor),
+	m_attackName(attackName),
+	m_rawDamage(rawDamage),
+	m_damageType(damageType),
+	m_elementalDamage(elementalDamage),
+	m_elementalDamageType(elementalDamageType),
+	m_bleedDamage(bleedDamage),
+	m_critDamage(critDamage),
+	m_blockedDamage(blockedDamage),
+	m_finalDamage(finalDamage),
+	m_hitLocation(hitLocation),
+	m_success(success),
+	m_critical(critical),
+	m_glancing(glancing),
+	m_crushing(crushing),
+	m_strikethrough(strikethrough),
+	m_strikethroughAmmount(strikethroughAmmount),
+	m_evadeResult(evadeResult),
+	m_evadeAmmount(evadeAmmount),
+	m_blockResult(blockResult),
+	m_block(block),
+	m_dodge(dodge),
+	m_parry(parry),
+	m_proc(proc),
+	m_spamMessage(),
+	m_spamType(spamType)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueCombatSpam::MessageQueueCombatSpam(const NetworkId & attacker, const Vector & attackerPosition_w, const NetworkId & defender, const Vector & defenderPosition_w, const StringId & weaponName, const NetworkId & armor, const StringId & attackName, int rawDamage, int damageType, int elementalDamage, int elementalDamageType, int bleedDamage, int critDamage, int blockedDamage, int finalDamage, int hitLocation, bool success, bool critical, bool glancing, bool crushing, bool strikethrough, float strikethroughAmmount, bool evadeResult, float evadeAmmount, bool blockResult, int block, bool dodge, bool parry, bool proc, int spamType) :
+	MessageQueue::Data(),
+	m_attacker(attacker),
+	m_attackerPosition_w(attackerPosition_w),
+	m_defender(defender),
+	m_defenderPosition_w(defenderPosition_w),
+	m_weapon(),
+	m_weaponName(weaponName),
+	m_armor(armor),
+	m_attackName(attackName),
+	m_rawDamage(rawDamage),
+	m_damageType(damageType),
+	m_elementalDamage(elementalDamage),
+	m_elementalDamageType(elementalDamageType),
+	m_bleedDamage(bleedDamage),
+	m_critDamage(critDamage),
+	m_blockedDamage(blockedDamage),
+	m_finalDamage(finalDamage),
+	m_hitLocation(hitLocation),
+	m_success(success),
+	m_critical(critical),
+	m_glancing(glancing),
+	m_crushing(crushing),
+	m_strikethrough(strikethrough),
+	m_strikethroughAmmount(strikethroughAmmount),
+	m_evadeResult(evadeResult),
+	m_evadeAmmount(evadeAmmount),
+	m_blockResult(blockResult),
+	m_block(block),
+	m_dodge(dodge),
+	m_parry(parry),
+	m_proc(proc),
+	m_spamMessage(),
+	m_spamType(spamType)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueCombatSpam::MessageQueueCombatSpam(const Unicode::String & spamMessage, bool critical, bool glancing, bool proc, int spamType) :
+	MessageQueue::Data (),
+	m_attacker(),
+	m_attackerPosition_w(),
+	m_defender(),
+	m_defenderPosition_w(),
+	m_weapon(),
+	m_weaponName(),
+	m_armor(),
+	m_attackName(),
+	m_rawDamage(0),
+	m_damageType(0),
+	m_elementalDamage(0),
+	m_elementalDamageType(0),
+	m_bleedDamage(0),
+	m_critDamage(0),
+	m_blockedDamage(0),
+	m_finalDamage(0),
+	m_hitLocation(0),
+	m_success(false),
+	m_critical(critical),
+	m_glancing(glancing),
+	m_crushing(false),
+	m_strikethrough(false),
+	m_strikethroughAmmount(0.0f),
+	m_evadeResult(false),
+	m_evadeAmmount(0.0f),
+	m_blockResult(false),
+	m_block(0),
+	m_dodge(false),
+	m_parry(false),
+	m_proc(proc),
+	m_spamMessage(spamMessage),
+	m_spamType(spamType)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueCombatSpam::MessageQueueCombatSpam(const NetworkId & attacker, const Vector & attackerPosition_w, const NetworkId & defender, const Vector & defenderPosition_w, const Unicode::String & spamMessage, bool critical, bool glancing, bool proc, int spamType) :
+	MessageQueue::Data (),
+	m_attacker(attacker),
+	m_attackerPosition_w(attackerPosition_w),
+	m_defender(defender),
+	m_defenderPosition_w(defenderPosition_w),
+	m_weapon(),
+	m_weaponName(),
+	m_armor(),
+	m_attackName(),
+	m_rawDamage(0),
+	m_damageType(0),
+	m_elementalDamage(0),
+	m_elementalDamageType(0),
+	m_bleedDamage(0),
+	m_critDamage(0),
+	m_blockedDamage(0),
+	m_finalDamage(0),
+	m_hitLocation(0),
+	m_success(false),
+	m_critical(critical),
+	m_glancing(glancing),
+	m_crushing(false),
+	m_strikethrough(false),
+	m_strikethroughAmmount(0.0f),
+	m_evadeResult(false),
+	m_evadeAmmount(0.0f),
+	m_blockResult(false),
+	m_block(0),
+	m_dodge(false),
+	m_parry(false),
+	m_proc(proc),
+	m_spamMessage(spamMessage),
+	m_spamType(spamType)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueCombatSpam::MessageQueueCombatSpam (const MessageQueueCombatSpam& rhs) :
+	MessageQueue::Data (),
+	m_attacker(rhs.m_attacker),
+	m_attackerPosition_w(rhs.m_attackerPosition_w),
+	m_defender(rhs.m_defender),
+	m_defenderPosition_w(rhs.m_defenderPosition_w),
+	m_weapon(rhs.m_weapon),
+	m_weaponName(rhs.m_weaponName),
+	m_armor(rhs.m_armor),
+	m_attackName(rhs.m_attackName),
+	m_rawDamage(rhs.m_rawDamage),
+	m_damageType(rhs.m_damageType),
+	m_elementalDamage(rhs.m_elementalDamage),
+	m_elementalDamageType(rhs.m_elementalDamageType),
+	m_bleedDamage(rhs.m_bleedDamage),
+	m_critDamage(rhs.m_critDamage),
+	m_blockedDamage(rhs.m_blockedDamage),
+	m_finalDamage(rhs.m_finalDamage),
+	m_hitLocation(rhs.m_hitLocation),
+	m_success(rhs.m_success),
+	m_critical(rhs.m_critical),
+	m_glancing(rhs.m_glancing),
+	m_crushing(rhs.m_crushing),
+	m_strikethrough(rhs.m_strikethrough),
+	m_strikethroughAmmount(rhs.m_strikethroughAmmount),
+	m_evadeResult(rhs.m_evadeResult),
+	m_evadeAmmount(rhs.m_evadeAmmount),
+	m_blockResult(rhs.m_blockResult),
+	m_block(rhs.m_block),
+	m_dodge(rhs.m_dodge),
+	m_parry(rhs.m_parry),
+	m_proc(rhs.m_proc),
+	m_spamMessage(rhs.m_spamMessage),
+	m_spamType(rhs.m_spamType)
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpam.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpam.h
new file mode 100644
index 00000000..ac405d85
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpam.h
@@ -0,0 +1,85 @@
+//======================================================================
+//
+// MessageQueueCombatSpam.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueCombatSpam_H
+#define INCLUDED_MessageQueueCombatSpam_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+#include "Unicode.h"
+
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+/**
+ * A CombatSpam message is issued on an server object's MessageQueue if the object
+ * observes 'source' performing CombatSpam towards 'target'.
+ */
+
+//----------------------------------------------------------------------
+
+class MessageQueueCombatSpam : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	
+	MessageQueueCombatSpam (const NetworkId & attacker,	const Vector & attackerPosition_w, const NetworkId & defender, const Vector & defenderPosition_w, const NetworkId & weapon, const NetworkId & armor, const StringId & attackName, int rawDamage, int damageType, int elementalDamage, int elementalDamageType, int bleedDamage, int critDamage, int blockedDamage, int finalDamage, int hitLocation, bool success, bool critical, bool glancing, bool crushing, bool strikethrough, float strikethroughAmmount, bool evadeResult, float evadeAmmount, bool blockResult, int block, bool dodge, bool parry, bool proc, int spamType);
+	MessageQueueCombatSpam (const NetworkId & attacker,	const Vector & attackerPosition_w, const NetworkId & defender, const Vector & defenderPosition_w, const StringId & weaponName, const NetworkId & armor, const StringId & attackName, int rawDamage, int damageType, int elementalDamage, int elementalDamageType, int bleedDamage, int critDamage, int blockedDamage, int finalDamage, int hitLocation, bool success, bool critical, bool glancing, bool crushing, bool strikethrough, float strikethroughAmmount, bool evadeResult, float evadeAmmount, bool blockResult, int block, bool dodge, bool parry, bool proc, int spamType);
+	MessageQueueCombatSpam (const Unicode::String & spamMessage, bool critical, bool glancing, bool proc, int spamType);
+	MessageQueueCombatSpam (const NetworkId & attacker,	const Vector & attackerPosition_w, const NetworkId & defender, const Vector & defenderPosition_w, const Unicode::String & spamMessage, bool critical, bool glancing, bool proc, int spamType);
+	MessageQueueCombatSpam (const MessageQueueCombatSpam&);
+
+private:
+
+	MessageQueueCombatSpam ();
+	MessageQueueCombatSpam& operator= (const MessageQueueCombatSpam&);
+
+public:
+
+	const NetworkId m_attacker;
+	const Vector    m_attackerPosition_w;
+	const NetworkId m_defender;
+	const Vector    m_defenderPosition_w;
+	const NetworkId m_weapon;
+	const StringId  m_weaponName;
+	const NetworkId m_armor;
+	const StringId  m_attackName;
+	int             m_rawDamage;
+	int             m_damageType;
+	int             m_elementalDamage;
+	int             m_elementalDamageType;
+	int             m_bleedDamage;
+	int             m_critDamage;
+	int             m_blockedDamage;
+	int             m_finalDamage;
+	int             m_hitLocation;
+	bool            m_success;
+	bool            m_critical;
+	bool            m_glancing;
+	bool            m_crushing;
+	bool            m_strikethrough;
+	float           m_strikethroughAmmount;
+	bool            m_evadeResult;
+	float           m_evadeAmmount;
+	bool            m_blockResult;
+	int             m_block;
+	bool            m_dodge;
+	bool            m_parry;
+	bool            m_proc;
+	Unicode::String m_spamMessage;
+	int             m_spamType;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpamArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpamArchive.cpp
new file mode 100644
index 00000000..865aacd1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpamArchive.cpp
@@ -0,0 +1,192 @@
+//======================================================================
+//
+// MessageQueueCombatSpamArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCombatSpamArchive.h"
+
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/MessageQueueCombatSpam.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+namespace MessageQueueCombatSpamArchiveNamespace
+{
+	enum DataType
+	{
+		dt_attackDataWeaponObject,
+		dt_attackDataWeaponName,
+		dt_messageData
+	};
+}
+
+using namespace MessageQueueCombatSpamArchiveNamespace;
+
+
+//======================================================================
+
+MessageQueue::Data * MessageQueueCombatSpamArchive::get (Archive::ReadIterator & source)
+{
+	uint8       dataType;
+	NetworkId   attacker;
+	Vector      attackerPosition_w;
+	NetworkId   defender;
+	Vector      defenderPosition_w;
+	NetworkId   weapon;
+	StringId    weaponName;
+	NetworkId   armor;
+	StringId    attackName;
+	int         rawDamage = 0;
+	int         damageType = 0;
+	int         elementalDamage = 0;
+	int         elementalDamageType = 0;
+	int         bleedDamage = 0;
+	int         critDamage = 0;
+	int         blockedDamage = 0;
+	int         finalDamage = 0;
+	int         hitLocation = 0;
+	bool        success= false;
+	bool		critical= false;
+	bool		glancing= false;
+	bool        crushing= false;
+	bool        strikethrough= false;
+	float       strikethroughAmmount= 0.0f;
+	bool        evadeResult= false;
+	float       evadeAmmount= 0.0f;
+	bool        blockResult= false;
+	int         block= 0;
+	bool        dodge= false;
+	bool        parry= false;
+	bool		proc= false;
+	Unicode::String spamMessage;
+	int         spamType;
+
+	Archive::get(source, dataType);
+	Archive::get(source, attacker);
+	Archive::get(source, attackerPosition_w);
+	Archive::get(source, defender);
+	Archive::get(source, defenderPosition_w);
+	if (dataType == dt_attackDataWeaponObject || dataType == dt_attackDataWeaponName)
+	{
+		if (dataType == dt_attackDataWeaponObject)
+			Archive::get(source, weapon);
+		else
+			Archive::get(source, weaponName);
+		Archive::get(source, attackName);
+		Archive::get(source, success);
+		if (success)
+		{
+			Archive::get(source, armor);
+			Archive::get(source, rawDamage);
+			Archive::get(source, damageType);
+			Archive::get(source, elementalDamage);
+			Archive::get(source, elementalDamageType);
+			Archive::get(source, bleedDamage);
+			Archive::get(source, critDamage);
+			Archive::get(source, blockedDamage);
+			Archive::get(source, finalDamage);
+			Archive::get(source, hitLocation);
+			Archive::get(source, crushing);
+			Archive::get(source, strikethrough);
+			Archive::get(source, strikethroughAmmount);
+			Archive::get(source, evadeResult);
+			Archive::get(source, evadeAmmount);
+			Archive::get(source, blockResult);
+			Archive::get(source, block);
+		}
+		else
+		{
+			Archive::get(source, dodge);
+			Archive::get(source, parry);
+		}
+	}
+	else
+	{
+		Archive::get(source, spamMessage);
+	}
+
+	Archive::get(source, critical);
+	Archive::get(source, glancing);
+	Archive::get(source, proc);
+	Archive::get(source, spamType);
+
+	if (dataType == dt_attackDataWeaponObject)
+		return new MessageQueueCombatSpam(attacker, attackerPosition_w, defender, defenderPosition_w, weapon, armor, attackName, rawDamage, damageType, elementalDamage, elementalDamageType, bleedDamage, critDamage, blockedDamage, finalDamage, hitLocation, success, critical, glancing, crushing, strikethrough, strikethroughAmmount, evadeResult, evadeAmmount, blockResult, block, dodge, parry, proc, spamType);
+	else if (dataType == dt_attackDataWeaponName)
+		return new MessageQueueCombatSpam(attacker, attackerPosition_w, defender, defenderPosition_w, weaponName, armor, attackName, rawDamage, damageType, elementalDamage, elementalDamageType, bleedDamage, critDamage, blockedDamage, finalDamage, hitLocation, success, critical, glancing, crushing, strikethrough, strikethroughAmmount, evadeResult, evadeAmmount, blockResult, block, dodge, parry, proc, spamType);
+	else
+		return new MessageQueueCombatSpam(attacker, attackerPosition_w, defender, defenderPosition_w, spamMessage, critical, glancing, proc, spamType);
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueCombatSpamArchive::put (const MessageQueue::Data * source, Archive::ByteStream & target)
+{
+	const MessageQueueCombatSpam * const msg = dynamic_cast<const MessageQueueCombatSpam  *>(source);
+	NOT_NULL (msg);
+
+	if (msg)
+	{
+		uint8 dataType;
+		if (msg->m_spamMessage.empty())
+		{
+			if (msg->m_weapon != NetworkId::cms_invalid)
+				dataType = dt_attackDataWeaponObject;
+			else
+				dataType = dt_attackDataWeaponName;
+		}
+		else
+			dataType = dt_messageData;
+		Archive::put(target, dataType);
+		Archive::put(target, msg->m_attacker);
+		Archive::put(target, msg->m_attackerPosition_w);
+		Archive::put(target, msg->m_defender);
+		Archive::put(target, msg->m_defenderPosition_w);
+		if (msg->m_spamMessage.empty())
+		{
+			if (msg->m_weapon != NetworkId::cms_invalid)
+				Archive::put(target, msg->m_weapon);
+			else
+				Archive::put(target, msg->m_weaponName);
+			Archive::put(target, msg->m_attackName);
+			Archive::put(target, msg->m_success);
+			if (msg->m_success)
+			{
+				Archive::put(target, msg->m_armor);
+				Archive::put(target, msg->m_rawDamage);
+				Archive::put(target, msg->m_damageType);
+				Archive::put(target, msg->m_elementalDamage);
+				Archive::put(target, msg->m_elementalDamageType);
+				Archive::put(target, msg->m_bleedDamage);
+				Archive::put(target, msg->m_critDamage);
+				Archive::put(target, msg->m_blockedDamage);
+				Archive::put(target, msg->m_finalDamage);
+				Archive::put(target, msg->m_hitLocation);
+				Archive::put(target, msg->m_crushing);
+				Archive::put(target, msg->m_strikethrough);
+				Archive::put(target, msg->m_strikethroughAmmount);
+				Archive::put(target, msg->m_evadeResult);
+				Archive::put(target, msg->m_evadeAmmount);
+				Archive::put(target, msg->m_blockResult);
+				Archive::put(target, msg->m_block);
+			}
+			else
+			{
+				Archive::put(target, msg->m_dodge);
+				Archive::put(target, msg->m_parry);
+			}
+		}
+		else
+		{
+			Archive::put(target, msg->m_spamMessage);
+		}
+		Archive::put(target, msg->m_critical);
+		Archive::put(target, msg->m_glancing);
+		Archive::put(target, msg->m_proc);
+		Archive::put(target, msg->m_spamType);
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpamArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpamArchive.h
new file mode 100644
index 00000000..41562338
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCombatSpamArchive.h
@@ -0,0 +1,28 @@
+//======================================================================
+//
+// MessageQueueCombatSpamArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueCombatSpamArchive_H
+#define INCLUDED_MessageQueueCombatSpamArchive_H
+
+#include "Archive/ByteStream.h"
+#include "sharedFoundation/MessageQueue.h"
+
+class MessageQueueCombatSpam;
+
+//======================================================================
+
+class MessageQueueCombatSpamArchive
+{
+public:
+
+	static MessageQueue::Data *     get (Archive::ReadIterator & source);
+	static void                     put (const MessageQueue::Data * source, Archive::ByteStream & target);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueEnqueue.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueEnqueue.cpp
new file mode 100644
index 00000000..01e037c9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueEnqueue.cpp
@@ -0,0 +1,108 @@
+// ======================================================================
+//
+// MessageQueueCommandQueueEnqueue.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCommandQueueEnqueue.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueCommandQueueEnqueue, CM_commandQueueEnqueue);
+
+//===================================================================
+
+
+
+
+// ----------------------------------------------------------------------
+
+MessageQueueCommandQueueEnqueue::MessageQueueCommandQueueEnqueue(
+	uint32 sequenceId, uint32 commandHash, NetworkId const &targetId,
+	Unicode::String const &params) :
+	MessageQueue::Data(),
+	m_sequenceId(sequenceId),
+	m_commandHash(commandHash),
+	m_targetId(targetId),
+	m_params(params)
+{
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueueCommandQueueEnqueue::MessageQueueCommandQueueEnqueue(
+	MessageQueueCommandQueueEnqueue const &source) :
+	MessageQueue::Data(),
+	m_sequenceId(source.m_sequenceId),
+	m_commandHash(source.m_commandHash),
+	m_targetId(source.m_targetId),
+	m_params(source.m_params)
+{
+}	
+
+// ----------------------------------------------------------------------
+
+uint32 MessageQueueCommandQueueEnqueue::getSequenceId() const
+{
+	return m_sequenceId;
+}
+
+// ----------------------------------------------------------------------
+
+uint32 MessageQueueCommandQueueEnqueue::getCommandHash() const
+{
+	return m_commandHash;
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const &MessageQueueCommandQueueEnqueue::getTargetId() const
+{
+	return m_targetId;
+}
+
+// ----------------------------------------------------------------------
+
+Unicode::String const &MessageQueueCommandQueueEnqueue::getParams() const
+{
+	return m_params;
+}
+//-----------------------------------------------------------------------
+
+void MessageQueueCommandQueueEnqueue::pack(const MessageQueue::Data* const data, Archive::ByteStream &target)
+{
+	MessageQueueCommandQueueEnqueue const* const msg = safe_cast<MessageQueueCommandQueueEnqueue const*> (data);
+	
+	if (msg)
+	{
+		Archive::put(target, msg->getSequenceId());
+		Archive::put(target, msg->getCommandHash());
+		Archive::put(target, msg->getTargetId());
+		Archive::put(target, msg->getParams());
+	}
+}
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueCommandQueueEnqueue::unpack(Archive::ReadIterator &source)
+{
+	uint32 sequenceId;
+	uint32 commandHash;
+	NetworkId targetId;
+	Unicode::String params;
+	
+	Archive::get(source, sequenceId);
+	Archive::get(source, commandHash);
+	Archive::get(source, targetId);
+	Archive::get(source, params);
+	
+	return new MessageQueueCommandQueueEnqueue(sequenceId, commandHash, targetId, params);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueEnqueue.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueEnqueue.h
new file mode 100644
index 00000000..489c7ec6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueEnqueue.h
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// MessageQueueCommandQueueEnqueue.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MessageQueueCommandQueueEnqueue_H
+#define INCLUDED_MessageQueueCommandQueueEnqueue_H
+
+// ======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+// ======================================================================
+
+class MessageQueueCommandQueueEnqueue: public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+
+public:
+
+	MessageQueueCommandQueueEnqueue(uint32 sequenceId, uint32 commandHash,
+		NetworkId const &targetId, Unicode::String const &params);
+	MessageQueueCommandQueueEnqueue(const MessageQueueCommandQueueEnqueue &source);
+
+	uint32 getSequenceId() const;
+	uint32 getCommandHash() const;
+	NetworkId const &getTargetId() const;
+	Unicode::String const &getParams() const;
+
+private:
+	MessageQueueCommandQueueEnqueue();
+	MessageQueueCommandQueueEnqueue &operator=(const MessageQueueCommandQueueEnqueue &source);
+
+	uint32           m_sequenceId;
+	uint32           m_commandHash;
+	NetworkId        m_targetId;
+	Unicode::String  m_params;
+};
+
+// ----------------------------------------------------------------------
+
+// ======================================================================
+
+#endif // INCLUDED_MessageQueueCommandQueueEnqueue_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueRemove.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueRemove.cpp
new file mode 100644
index 00000000..b4d6f8bf
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueRemove.cpp
@@ -0,0 +1,102 @@
+// ======================================================================
+//
+// MessageQueueCommandQueueRemove.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCommandQueueRemove.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+// ======================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueCommandQueueRemove, CM_commandQueueRemove);
+
+//===================================================================
+
+MessageQueueCommandQueueRemove::MessageQueueCommandQueueRemove(uint32 sequenceId, float waitTime, int status, int statusDetail) :
+	MessageQueue::Data(),
+	m_sequenceId(sequenceId),
+	m_waitTime(waitTime),
+	m_status(status),
+	m_statusDetail(statusDetail)
+{
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueueCommandQueueRemove::MessageQueueCommandQueueRemove(MessageQueueCommandQueueRemove const &source) :
+	MessageQueue::Data(),
+	m_sequenceId(source.m_sequenceId),
+	m_waitTime(source.m_waitTime),
+	m_status(source.m_status),
+	m_statusDetail(source.m_statusDetail)
+{
+}	
+
+// ----------------------------------------------------------------------
+
+uint32 MessageQueueCommandQueueRemove::getSequenceId() const
+{
+	return m_sequenceId;
+}
+
+// ----------------------------------------------------------------------
+
+float MessageQueueCommandQueueRemove::getWaitTime() const
+{
+	return m_waitTime;
+}
+
+// ----------------------------------------------------------------------
+
+int MessageQueueCommandQueueRemove::getStatus() const
+{
+	return m_status;
+}
+
+// ----------------------------------------------------------------------
+
+int MessageQueueCommandQueueRemove::getStatusDetail() const
+{
+	return m_statusDetail;
+}
+
+// ----------------------------------------------------------------------
+
+void MessageQueueCommandQueueRemove::pack(const MessageQueue::Data* const data, Archive::ByteStream &target)
+{
+	MessageQueueCommandQueueRemove const* const msg = safe_cast<MessageQueueCommandQueueRemove const*> (data);
+	
+	if (msg)
+	{
+		Archive::put(target, msg->getSequenceId());
+		Archive::put(target, msg->getWaitTime());
+		Archive::put(target, msg->getStatus());
+		Archive::put(target, msg->getStatusDetail());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueCommandQueueRemove::unpack(Archive::ReadIterator &source)
+{
+	uint32 sequenceId;
+	float waitTime;
+	int status, statusDetail;
+	
+	Archive::get(source, sequenceId);
+	Archive::get(source, waitTime);
+	Archive::get(source, status);
+	Archive::get(source, statusDetail);
+	
+	return new MessageQueueCommandQueueRemove(sequenceId, waitTime, status, statusDetail);
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueRemove.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueRemove.h
new file mode 100644
index 00000000..185283dd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCommandQueueRemove.h
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// MessageQueueCommandQueueRemove.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MessageQueueCommandQueueRemove_H
+#define INCLUDED_MessageQueueCommandQueueRemove_H
+
+// ======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+// ======================================================================
+
+class MemoryBlockManager;
+
+// ======================================================================
+
+class MessageQueueCommandQueueRemove: public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	MessageQueueCommandQueueRemove(uint32 sequenceId, float waitTime, int status, int statusDetail);
+	MessageQueueCommandQueueRemove(MessageQueueCommandQueueRemove const &source);
+
+	uint32 getSequenceId() const;
+	float getWaitTime() const;
+	int getStatus() const;
+	int getStatusDetail() const;
+
+private:
+	MessageQueueCommandQueueRemove();
+	MessageQueueCommandQueueRemove &operator=(MessageQueueCommandQueueRemove const &source);
+
+	uint32 m_sequenceId;
+	float m_waitTime;
+	int m_status;
+	int m_statusDetail;
+};
+
+// ======================================================================
+
+#endif // INCLUDED_MessageQueueCommandQueueRemove_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.cpp
new file mode 100644
index 00000000..6443eacf
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.cpp
@@ -0,0 +1,89 @@
+//========================================================================
+//
+// MessageQueueCraftCustomization.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCraftCustomization.h"
+
+#include "sharedObject/Object.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueCraftCustomization, CM_setCustomizationData);
+
+//===================================================================
+
+
+/**
+ * Class destructor.
+ */
+MessageQueueCraftCustomization::~MessageQueueCraftCustomization()
+{
+}	
+
+
+void MessageQueueCraftCustomization::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueCraftCustomization* const msg = safe_cast<const MessageQueueCraftCustomization*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->getName());
+		int8 temp8 = static_cast<int8>(msg->getAppearance());
+		Archive::put(target, temp8);
+		Archive::put(target, msg->getItemCount());
+		int count = msg->getCustomization().size();
+		temp8 = static_cast<int8>(count);
+		Archive::put(target, temp8);
+		for (int i = 0; i < count; ++i)
+		{
+			const Crafting::CustomValue & custom = msg->getCustomization()[i];
+			Archive::put(target, custom.property);
+			Archive::put(target, custom.value);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueCraftCustomization::unpack(Archive::ReadIterator & source)
+{
+int8 temp8;
+Unicode::String name;
+int property, value, itemCount;
+
+	UNREF(source);
+
+	MessageQueueCraftCustomization * msg = new MessageQueueCraftCustomization();
+	NOT_NULL(msg);
+	
+	Archive::get(source, name);
+	msg->setName(name);
+	
+	Archive::get(source, temp8);
+	msg->setAppearance(temp8);
+
+	Archive::get(source, itemCount);
+	msg->setItemCount(itemCount);
+
+	Archive::get(source, temp8);
+	int count = temp8;
+	for (int i = 0; i < count; ++i)
+	{
+		Archive::get(source, property);
+		Archive::get(source, value);
+		msg->addCustomization(property, value);
+	}
+
+	return msg;
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.h
new file mode 100644
index 00000000..912785ea
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftCustomization.h
@@ -0,0 +1,101 @@
+//========================================================================
+//
+// MessageQueueCraftCustomization.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueCraftCustomization_H
+#define INCLUDED_MessageQueueCraftCustomization_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedGame/CraftingData.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+class MessageQueueCraftCustomization : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	explicit MessageQueueCraftCustomization(void);
+	virtual ~MessageQueueCraftCustomization();
+
+	const Unicode::String &                    getName(void) const;
+	int                                        getAppearance(void) const;
+	const std::vector<Crafting::CustomValue> & getCustomization(void) const;
+	int                                        getItemCount(void) const;
+
+	void setName(const Unicode::String & name);
+	void setAppearance(int appearance);
+	void addCustomization(int property, int value);
+	void setItemCount(int count);
+
+private:
+	Unicode::String                    m_name;
+	int                                m_appearance;
+	std::vector<Crafting::CustomValue> m_customization;
+	int                                m_itemCount;
+};
+
+
+//----------------------------------------------------------------------
+
+inline MessageQueueCraftCustomization::MessageQueueCraftCustomization(void) :
+	MessageQueue::Data(),
+	m_name(),
+	m_appearance(-1),
+	m_customization(),
+	m_itemCount(1)
+{
+}
+
+inline const Unicode::String & MessageQueueCraftCustomization::getName(void) const
+{
+	return m_name;
+}
+
+inline int MessageQueueCraftCustomization::getAppearance(void) const
+{
+	return m_appearance;
+}
+
+inline const std::vector<Crafting::CustomValue> & MessageQueueCraftCustomization::getCustomization(void) const
+{
+	return m_customization;
+}
+
+inline int MessageQueueCraftCustomization::getItemCount(void) const
+{
+	return m_itemCount;
+}
+
+inline void MessageQueueCraftCustomization::setName(const Unicode::String & name)
+{
+	m_name = name;
+}
+
+inline void MessageQueueCraftCustomization::setAppearance(int appearance)
+{
+	m_appearance = appearance;
+}
+
+inline void MessageQueueCraftCustomization::addCustomization(int property, int value)
+{
+	m_customization.push_back(Crafting::CustomValue(property, value));
+}
+
+inline void MessageQueueCraftCustomization::setItemCount(int count)
+{
+	m_itemCount = count;
+}
+
+//----------------------------------------------------------------------
+
+
+#endif	// INCLUDED_MessageQueueCraftCustomization_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftEmptySlot.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftEmptySlot.cpp
new file mode 100644
index 00000000..dba86276
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftEmptySlot.cpp
@@ -0,0 +1,69 @@
+//========================================================================
+//
+// MessageQueueCraftEmptySlot.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCraftEmptySlot.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueCraftEmptySlot, CM_emptySchematicSlotMessage);
+
+//----------------------------------------------------------------------
+
+MessageQueueCraftEmptySlot::MessageQueueCraftEmptySlot (int slot, const NetworkId & targetContainer, uint8 sequenceId) :
+m_slot            (slot),
+m_targetContainer (targetContainer),
+m_sequenceId      (sequenceId)
+{
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+MessageQueueCraftEmptySlot::~MessageQueueCraftEmptySlot ()
+{
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueCraftEmptySlot::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueCraftEmptySlot* const msg = safe_cast<const MessageQueueCraftEmptySlot*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->getSlot ());
+		Archive::put(target, msg->getTargetContainer ());
+		Archive::put(target, msg->getSequenceId ());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueCraftEmptySlot::unpack (Archive::ReadIterator & source)
+{
+	int slot = 0;
+	uint8 sequenceId = 0;
+	NetworkId targetContainer;
+	
+	Archive::get(source, slot);
+	Archive::get(source, targetContainer);
+	Archive::get(source, sequenceId);
+	
+	return new MessageQueueCraftEmptySlot(slot, targetContainer, sequenceId);
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftEmptySlot.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftEmptySlot.h
new file mode 100644
index 00000000..c272fa71
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftEmptySlot.h
@@ -0,0 +1,65 @@
+//========================================================================
+//
+// MessageQueueCraftEmptySlot.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueCraftEmptySlot_H
+#define INCLUDED_MessageQueueCraftEmptySlot_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+class MessageQueueCraftEmptySlot : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueCraftEmptySlot (int slot, const NetworkId & targetContainer, uint8 sequenceId);
+	virtual ~MessageQueueCraftEmptySlot ();
+
+	int               getSlot            () const;
+	uint8             getSequenceId      () const;
+	const NetworkId & getTargetContainer () const;
+
+private:
+	int               m_slot;
+	NetworkId         m_targetContainer;
+	uint8             m_sequenceId;
+
+private:
+	MessageQueueCraftEmptySlot (const MessageQueueCraftEmptySlot &);
+	MessageQueueCraftEmptySlot & operator= (const MessageQueueCraftEmptySlot &);
+};
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueCraftEmptySlot::getSlot () const
+{
+	return m_slot;
+}
+
+//----------------------------------------------------------------------
+
+inline uint8 MessageQueueCraftEmptySlot::getSequenceId () const
+{
+	return m_sequenceId;
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueCraftEmptySlot::getTargetContainer () const
+{
+	return m_targetContainer;
+}
+
+//----------------------------------------------------------------------
+
+#endif	// INCLUDED_MessageQueueCraftEmptySlot_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.cpp
new file mode 100644
index 00000000..512c9e02
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.cpp
@@ -0,0 +1,80 @@
+//========================================================================
+//
+// MessageQueueCraftExperiment.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCraftExperiment.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueCraftExperiment, CM_experimentMessage);
+
+//===================================================================
+
+
+/**
+ * Class destructor.
+ */
+MessageQueueCraftExperiment::~MessageQueueCraftExperiment()
+{
+}	// MessageQueueCraftExperiment::~MessageQueueCraftExperiment
+//----------------------------------------------------------------------
+void MessageQueueCraftExperiment::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueCraftExperiment* const msg = safe_cast<const MessageQueueCraftExperiment*> (data);
+	if (msg)
+	{
+		Archive::put (target, msg->getSequenceId());
+		
+		const std::vector<MessageQueueCraftExperiment::ExperimentInfo> & experiments =
+			msg->getExperiments();
+		int count = experiments.size();
+		Archive::put (target, count);
+		std::vector<MessageQueueCraftExperiment::ExperimentInfo>::const_iterator iter;
+		for (iter = experiments.begin(); iter != experiments.end(); ++iter)
+		{
+			Archive::put (target, (*iter).attributeIndex);
+			Archive::put (target, (*iter).experimentPoints);
+		}
+
+		Archive::put(target, msg->getCoreLevel());
+	}
+}
+
+//-----------------------------------------------------------------------
+MessageQueue::Data* MessageQueueCraftExperiment::unpack(Archive::ReadIterator & source)
+{
+	uint8 sequenceId;
+	Archive::get(source, sequenceId);
+	MessageQueueCraftExperiment* const msg = new MessageQueueCraftExperiment(sequenceId);
+	NOT_NULL(msg);
+	
+	int count;
+	int attribute, points;
+	int corelevel;
+	Archive::get(source, count);
+	for (int i = 0; i < count; ++i)
+	{
+		Archive::get(source, attribute);
+		Archive::get(source, points);
+		msg->addExperiment(attribute, points);
+	}
+
+	Archive::get(source, corelevel);
+	msg->setCoreLevel(corelevel);
+	
+	return msg;
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.h
new file mode 100644
index 00000000..52b45613
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftExperiment.h
@@ -0,0 +1,98 @@
+//========================================================================
+//
+// MessageQueueCraftExperiment.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueCraftExperiment_H
+#define INCLUDED_MessageQueueCraftExperiment_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+class MessageQueueCraftExperiment : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	struct ExperimentInfo
+	{
+		const int	attributeIndex;		// which attribute is being experiemnted
+		const int   experimentPoints;	// how many experiment points are allocated
+
+		ExperimentInfo(int attribute, int points) :
+			attributeIndex(attribute),
+			experimentPoints(points)
+		{
+		}
+
+		private:
+			ExperimentInfo & operator = (const ExperimentInfo &);
+	};
+
+public:
+
+	         MessageQueueCraftExperiment(uint8 sequenceId);
+	virtual ~MessageQueueCraftExperiment();
+
+	void                                addExperiment(int attribute, int points);
+	const std::vector<ExperimentInfo> & getExperiments(void) const;
+	int                                 getTotalPoints(void) const;
+	uint8                               getSequenceId(void) const;
+	void								setCoreLevel(int level);
+	int									getCoreLevel(void) const;
+
+private:
+	std::vector<ExperimentInfo> m_experiments;
+	int                         m_totalPoints;
+	uint8                       m_sequenceId;
+	int							m_coreLevel;
+};
+
+
+inline MessageQueueCraftExperiment::MessageQueueCraftExperiment(uint8 sequenceId) :
+	m_totalPoints(0),
+	m_sequenceId(sequenceId),
+	m_coreLevel(0)
+{
+}	// MessageQueueCraftExperiment::MessageQueueCraftExperiment()
+
+inline void MessageQueueCraftExperiment::addExperiment(int attribute, int points)
+{
+	m_experiments.push_back(ExperimentInfo(attribute, points));
+	m_totalPoints += points;
+}	// MessageQueueCraftExperiment::addIngredient
+
+inline const std::vector<MessageQueueCraftExperiment::ExperimentInfo> & 
+	MessageQueueCraftExperiment::getExperiments(void) const
+{
+	return m_experiments;
+}	// MessageQueueCraftExperiment::getExperiments
+
+inline int MessageQueueCraftExperiment::getTotalPoints(void) const
+{
+	return m_totalPoints;
+}	// MessageQueueCraftExperiment::getTotalPoints
+
+inline uint8 MessageQueueCraftExperiment::getSequenceId(void) const
+{
+	return m_sequenceId;
+}	// MessageQueueCraftExperiment::getSequenceId
+
+inline void MessageQueueCraftExperiment::setCoreLevel(int level)
+{
+	m_coreLevel = level;
+}
+
+inline int MessageQueueCraftExperiment::getCoreLevel() const
+{
+	return m_coreLevel;
+}
+#endif	// INCLUDED_MessageQueueCraftExperiment_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftFillSlot.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftFillSlot.cpp
new file mode 100644
index 00000000..91c0dc53
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftFillSlot.cpp
@@ -0,0 +1,63 @@
+//========================================================================
+//
+// MessageQueueCraftFillSlot.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCraftFillSlot.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueCraftFillSlot, CM_fillSchematicSlotMessage);
+
+//===================================================================
+
+
+
+/**
+ * Class destructor. 
+ */
+MessageQueueCraftFillSlot::~MessageQueueCraftFillSlot()
+{
+}	// MessageQueueCraftFillSlot::~MessageQueueCraftFillSlot
+
+//-----------------------------------------------------------------------
+
+void MessageQueueCraftFillSlot::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueCraftFillSlot* const msg = safe_cast<const MessageQueueCraftFillSlot*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->getIngredient());
+		Archive::put(target, msg->getSlot());
+		Archive::put(target, msg->getOption());
+		Archive::put(target, msg->getSequenceId());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueCraftFillSlot::unpack(Archive::ReadIterator & source)
+{
+	NetworkId ingredient;
+	int slot, option;
+	uint8 sequenceId;
+	
+	Archive::get(source, ingredient);
+	Archive::get(source, slot);
+	Archive::get(source, option);
+	Archive::get(source, sequenceId);
+	
+	return new MessageQueueCraftFillSlot(ingredient, slot, option, sequenceId);
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftFillSlot.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftFillSlot.h
new file mode 100644
index 00000000..9b552b20
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftFillSlot.h
@@ -0,0 +1,74 @@
+//========================================================================
+//
+// MessageQueueCraftFillSlot.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueCraftFillSlot_H
+#define INCLUDED_MessageQueueCraftFillSlot_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+class MessageQueueCraftFillSlot : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueCraftFillSlot(const NetworkId & ingredient, int slot, int option, uint8 sequenceId);
+	virtual ~MessageQueueCraftFillSlot();
+
+	const NetworkId & getIngredient(void) const;
+	int               getSlot(void) const;
+	int               getOption(void) const;
+	uint8             getSequenceId(void) const;
+
+private:
+	NetworkId         m_ingredient;
+	int               m_slot;
+	int               m_option;
+	uint8             m_sequenceId;
+
+private:
+	MessageQueueCraftFillSlot (const MessageQueueCraftFillSlot &);
+	MessageQueueCraftFillSlot & operator= (const MessageQueueCraftFillSlot &);
+};
+
+
+inline MessageQueueCraftFillSlot::MessageQueueCraftFillSlot(const NetworkId & ingredient, int slot, int option, uint8 sequenceId) :
+	m_ingredient(ingredient),
+	m_slot(slot),
+	m_option(option),
+	m_sequenceId(sequenceId)
+{
+}	// MessageQueueCraftFillSlot::MessageQueueCraftFillSlot
+
+inline const NetworkId & MessageQueueCraftFillSlot::getIngredient(void) const
+{
+	return m_ingredient;
+}	// MessageQueueCraftFillSlot::getIngredient
+
+inline int MessageQueueCraftFillSlot::getSlot(void) const
+{
+	return m_slot;
+}	// MessageQueueCraftFillSlot::getSlot
+
+inline int MessageQueueCraftFillSlot::getOption(void) const
+{
+	return m_option;
+}	// MessageQueueCraftFillSlot::getOption
+
+inline uint8 MessageQueueCraftFillSlot::getSequenceId(void) const
+{
+	return m_sequenceId;
+}	// MessageQueueCraftFillSlot::getSequenceId
+
+
+#endif	// INCLUDED_MessageQueueCraftFillSlot_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.cpp
new file mode 100644
index 00000000..fc0fc49c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.cpp
@@ -0,0 +1,73 @@
+//========================================================================
+//
+// MessageQueueCraftIngredients.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCraftIngredients.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueCraftIngredients, CM_ingredientsHopperMessage);
+
+//===================================================================
+
+
+
+/**
+ * Class destructor.
+ */
+MessageQueueCraftIngredients::~MessageQueueCraftIngredients()
+{
+}	// MessageQueueCraftIngredients::~MessageQueueCraftIngredients
+
+void MessageQueueCraftIngredients::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueCraftIngredients* const msg = safe_cast<const MessageQueueCraftIngredients*> (data);
+	if (msg)
+	{
+		int count = msg->getIngredientCount();
+		Archive::put (target, count);
+		for (int i = 0; i < count; ++i)
+		{
+			const MessageQueueCraftIngredients::Ingredient & ingredient = msg->getIngredient(i);
+			uint8 type = static_cast<uint8>(ingredient.type);
+			Archive::put (target, ingredient.name);
+			Archive::put (target, type);
+			Archive::put (target, ingredient.quantity);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+
+MessageQueue::Data* MessageQueueCraftIngredients::unpack(Archive::ReadIterator & source)
+{
+	MessageQueueCraftIngredients* const msg = new MessageQueueCraftIngredients();
+	NOT_NULL(msg);
+	
+	int count;
+	Unicode::String name;
+	uint8 type;
+	int quantity;
+	
+	Archive::get(source, count);
+	for (int i = 0; i < count; ++i)
+	{
+		Archive::get(source, name);
+		Archive::get(source, type);
+		Archive::get(source, quantity);
+		msg->addIngredient(name, static_cast<MessageQueueCraftIngredients::IngredientType>(type), quantity);
+	}
+	return msg;
+}
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.h
new file mode 100644
index 00000000..9c4e3546
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftIngredients.h
@@ -0,0 +1,98 @@
+//========================================================================
+//
+// MessageQueueCraftIngredients.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueCraftIngredients_H
+#define INCLUDED_MessageQueueCraftIngredients_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedGame/CraftingData.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+class MessageQueueCraftIngredients : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	typedef Crafting::IngredientType IngredientType;
+
+	struct Ingredient
+	{
+		Unicode::String name;
+		union
+		{
+			int         type;
+			int         minValue;
+		};
+		union
+		{
+			int         quantity;
+			int         maxValue;
+		};
+
+		Ingredient::Ingredient(const Unicode::String & _name, IngredientType _type, int _quantity) :
+		name(_name),
+		type(_type),
+		quantity(_quantity)	
+		{
+		}
+
+		Ingredient::Ingredient(const Unicode::String & _name, int _minValue, int _maxValue) :
+		name(_name),
+		minValue(_minValue),
+		maxValue(_maxValue)
+		{
+		}
+	};
+
+public:
+
+	         MessageQueueCraftIngredients(void);
+	virtual ~MessageQueueCraftIngredients();
+
+	void               addIngredient(const Unicode::String & name, IngredientType type, int quantity);
+	void               addSchematicAttribute(const Unicode::String & name, int minValue, int maxValue);
+	int                getIngredientCount(void) const;
+	const Ingredient & getIngredient(int index) const;
+
+private:
+	std::vector<Ingredient> m_ingredients;
+};
+
+
+inline MessageQueueCraftIngredients::MessageQueueCraftIngredients()
+{
+}	// MessageQueueCraftIngredients::MessageQueueCraftIngredients()
+
+inline void MessageQueueCraftIngredients::addIngredient(const Unicode::String & name, IngredientType type, int quantity)
+{
+	m_ingredients.push_back(Ingredient(name, type, quantity));
+}	// MessageQueueCraftIngredients::addIngredient
+
+inline void MessageQueueCraftIngredients::addSchematicAttribute(const Unicode::String & name, int minValue, int maxValue)
+{
+	m_ingredients.push_back(Ingredient(name, minValue, maxValue));
+}	// MessageQueueCraftIngredients::addSchematicAttribute
+
+inline int MessageQueueCraftIngredients::getIngredientCount(void) const
+{
+	return m_ingredients.size();
+}	// MessageQueueCraftIngredients::getIngredientCount
+
+inline const MessageQueueCraftIngredients::Ingredient & MessageQueueCraftIngredients::getIngredient(int index) const
+{
+	DEBUG_FATAL(index < 0 || index >= static_cast<int>(m_ingredients.size()), 
+		("MessageQueueCraftIngredients::getIngredient index out of range"));
+	return m_ingredients.at(index);
+}	// MessageQueueCraftIngredients::getIngredient
+
+
+#endif	// INCLUDED_MessageQueueCraftIngredients_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftRequestSession.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftRequestSession.cpp
new file mode 100644
index 00000000..e66d478b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftRequestSession.cpp
@@ -0,0 +1,57 @@
+//========================================================================
+//
+// MessageQueueCraftRequestSession.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCraftRequestSession.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueCraftRequestSession, CM_requestCraftingSession);
+
+//===================================================================
+
+
+
+/**
+ * Class destructor.
+ */
+MessageQueueCraftRequestSession::~MessageQueueCraftRequestSession()
+{
+}	// MessageQueueCraftRequestSession::~MessageQueueCraftRequestSession
+
+//----------------------------------------------------------------------
+
+void MessageQueueCraftRequestSession::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueCraftRequestSession* const msg = safe_cast<const MessageQueueCraftRequestSession*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->getStationId());
+		Archive::put(target, msg->getSequenceId());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueCraftRequestSession::unpack (Archive::ReadIterator & source)
+{
+	NetworkId stationId;
+	uint8 sequenceId;
+	
+	Archive::get(source, stationId);
+	Archive::get(source, sequenceId);
+	
+	return new MessageQueueCraftRequestSession(stationId, sequenceId);
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftRequestSession.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftRequestSession.h
new file mode 100644
index 00000000..d432cc0c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftRequestSession.h
@@ -0,0 +1,58 @@
+//========================================================================
+//
+// MessageQueueCraftRequestSession.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueCraftRequestSession_H
+#define INCLUDED_MessageQueueCraftRequestSession_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+class MessageQueueCraftRequestSession : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueCraftRequestSession(const NetworkId & stationId, uint8 sequenceId);
+	virtual ~MessageQueueCraftRequestSession();
+
+	const NetworkId & getStationId(void) const;
+	uint8             getSequenceId(void) const;
+
+private:
+	NetworkId         m_stationId;
+	uint8             m_sequenceId;
+
+private:
+	MessageQueueCraftRequestSession (const MessageQueueCraftRequestSession &);
+	MessageQueueCraftRequestSession & operator= (const MessageQueueCraftRequestSession &);
+};
+
+
+inline MessageQueueCraftRequestSession::MessageQueueCraftRequestSession(const NetworkId & stationId, uint8 sequenceId) :
+	m_stationId(stationId),
+	m_sequenceId(sequenceId)
+{
+}	// MessageQueueCraftRequestSession::MessageQueueCraftRequestSession
+
+inline const NetworkId & MessageQueueCraftRequestSession::getStationId(void) const
+{
+	return m_stationId;
+}	// MessageQueueCraftRequestSession::getStationId
+
+inline uint8 MessageQueueCraftRequestSession::getSequenceId(void) const
+{
+	return m_sequenceId;
+}	// MessageQueueCraftRequestSession::getSequenceId
+
+
+#endif	// INCLUDED_MessageQueueCraftRequestSession_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftSelectSchematic.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftSelectSchematic.cpp
new file mode 100644
index 00000000..5386dbdd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftSelectSchematic.cpp
@@ -0,0 +1,55 @@
+//========================================================================
+//
+// MessageQueueCraftSelectSchematic.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCraftSelectSchematic.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueCraftSelectSchematic, CM_selectDraftSchematic);
+
+//===================================================================
+
+
+
+/**
+ * Class destructor.
+ */
+MessageQueueCraftSelectSchematic::~MessageQueueCraftSelectSchematic()
+{
+}	// MessageQueueCraftSelectSchematic::~MessageQueueCraftSelectSchematic
+
+
+void MessageQueueCraftSelectSchematic::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueCraftSelectSchematic* const msg = safe_cast<const MessageQueueCraftSelectSchematic*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->getSchematic());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+
+MessageQueue::Data* MessageQueueCraftSelectSchematic::unpack(Archive::ReadIterator & source)
+{
+	int schematic;
+	
+	Archive::get(source, schematic);
+	
+	return new MessageQueueCraftSelectSchematic(schematic);
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftSelectSchematic.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftSelectSchematic.h
new file mode 100644
index 00000000..4f4e71f5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCraftSelectSchematic.h
@@ -0,0 +1,55 @@
+//========================================================================
+//
+// MessageQueueCraftSelectSchematic.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueCraftSelectSchematic_H
+#define INCLUDED_MessageQueueCraftSelectSchematic_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//----------------------------------------------------------------------
+
+class MessageQueueCraftSelectSchematic : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueCraftSelectSchematic(int schematic);
+	virtual ~MessageQueueCraftSelectSchematic();
+
+	int               getSchematic(void) const;
+
+private:
+	int               m_schematic;
+
+private:
+	MessageQueueCraftSelectSchematic (const MessageQueueCraftSelectSchematic &);
+	MessageQueueCraftSelectSchematic & operator= (const MessageQueueCraftSelectSchematic &);
+};
+
+//----------------------------------------------------------------------
+
+inline MessageQueueCraftSelectSchematic::MessageQueueCraftSelectSchematic(int schematic) :
+m_schematic(schematic)
+{
+}	// MessageQueueCraftSelectSchematic::MessageQueueCraftSelectSchematic
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueCraftSelectSchematic::getSchematic(void) const
+{
+	return m_schematic;
+}	// MessageQueueCraftSelectSchematic::getSchematic
+
+//----------------------------------------------------------------------
+
+#endif	// INCLUDED_MessageQueueCraftSelectSchematic_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.cpp
new file mode 100644
index 00000000..3c7ad8b4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.cpp
@@ -0,0 +1,122 @@
+//========================================================================
+//
+// MessageQueueCreateSaga.cpp
+//
+// copyright 2009 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCreateSaga.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueCreateSaga, CM_createSaga);
+
+//===================================================================
+
+
+/**
+* Class destructor.
+*/
+MessageQueueCreateSaga::~MessageQueueCreateSaga()
+{
+}	// MessageQueueCreateSaga::~MessageQueueCreateSaga
+//----------------------------------------------------------------------
+void MessageQueueCreateSaga::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueCreateSaga* const msg = safe_cast<const MessageQueueCreateSaga*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->getQuestName());
+		Archive::put(target, msg->getQuestDescription());
+
+		const std::vector<MessageQueueCreateSaga::TaskInfo> & tasks =
+			msg->getTasks();
+		int count = static_cast<int>(tasks.size());
+		Archive::put (target, count);
+		std::vector<MessageQueueCreateSaga::TaskInfo>::const_iterator iter;
+		for (iter = tasks.begin(); iter != tasks.end(); ++iter)
+		{
+			Archive::put (target, (*iter).taskType);
+			Archive::put (target, (*iter).numParameters);
+			for(int i = 0; i < (*iter).numParameters; ++i)
+				Archive::put (target, (*iter).parameters[i]);
+		}
+
+		Archive::put(target, msg->getRewards());
+		Archive::put(target, msg->isRecipe());
+		Archive::put(target, msg->getRecipeOID());
+		Archive::put(target, msg->getShareAmount());
+	}
+}
+
+//-----------------------------------------------------------------------
+MessageQueue::Data* MessageQueueCreateSaga::unpack(Archive::ReadIterator & source)
+{
+	MessageQueueCreateSaga* const msg = new MessageQueueCreateSaga();
+	NOT_NULL(msg);
+	
+	std::string questName;
+	std::string questDescription;
+
+	Archive::get(source, questName);
+
+	msg->setQuestName(questName);
+
+	Archive::get(source, questDescription);
+
+	msg->setQuestDescription(questDescription);
+
+	int numTasks;
+	int taskType, numParameters;
+	std::string parameter;
+	Archive::get(source, numTasks);
+	msg->setTotalTasks(numTasks);
+	for (int i = 0; i < numTasks; ++i)
+	{
+		Archive::get(source, taskType);
+		Archive::get(source, numParameters);
+		std::string tempParam;
+		std::vector<std::string> paramVector;
+		for(int j = 0; j < numParameters; ++j)
+		{
+			Archive::get(source, tempParam);
+			paramVector.push_back(tempParam);
+		}
+
+		msg->addTask(taskType, paramVector);
+	}
+
+	std::string rewards;
+	Archive::get(source, rewards);
+	msg->setRewards(rewards);
+	
+	bool recipe;
+	Archive::get(source, recipe);
+	msg->setRecipe(recipe);
+
+	NetworkId recipeOID;
+	Archive::get(source, recipeOID);
+	msg->setRecipeOID(recipeOID);
+
+	int shareAmount;
+	Archive::get(source, shareAmount);
+	msg->setShareAmount(shareAmount);
+
+	return msg;
+}
+
+void MessageQueueCreateSaga::addTask(int taskType, std::vector<std::string> & parameters)
+{
+	m_tasks.push_back(TaskInfo(taskType, parameters));
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.h
new file mode 100644
index 00000000..b6ca6055
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.h
@@ -0,0 +1,170 @@
+//========================================================================
+//
+// MessageQueueCreateSaga.h
+//
+// copyright 2009 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueCreateSaga_H
+#define INCLUDED_MessageQueueCreateSaga_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+class MessageQueueCreateSaga : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	struct TaskInfo
+	{
+	public:
+		TaskInfo()
+		{
+
+		}
+
+		TaskInfo(int type, std::vector<std::string> params)
+		{
+			taskType = type;
+			numParameters = params.size();
+			for(int i = 0; i < numParameters; ++i)
+				parameters.push_back(params[i]);
+		}
+
+		int				  taskType; // Saga Task Type.
+		
+		int						  numParameters;
+		std::vector<std::string>  parameters;
+	private:
+		TaskInfo & operator = (const TaskInfo &);
+	};
+
+public:
+
+	MessageQueueCreateSaga();
+	virtual ~MessageQueueCreateSaga();
+
+	void							  setTotalTasks(int total);
+	int								  getTotalTasks() const;
+	
+	void							  addTask(int taskType, std::vector<std::string> & parameters);
+	const std::vector<TaskInfo> &     getTasks() const;
+
+	void							  setQuestName(std::string name);
+	std::string const &				  getQuestName() const;
+
+	void							  setQuestDescription(std::string desc);
+	std::string const &				  getQuestDescription() const;
+
+	void							  setRewards(std::string rewards);
+	std::string const &				  getRewards() const;
+
+	void							  setRecipe(bool recipe);
+	bool							  isRecipe() const;
+
+	void							  setRecipeOID(NetworkId const & id);
+	NetworkId const &				  getRecipeOID() const;
+
+	void							  setShareAmount(int amount);
+	int								  getShareAmount() const;
+
+private:
+	std::string					m_questName;
+	std::string					m_questDescription;
+	std::vector<TaskInfo>		m_tasks;
+	int                         m_totalTasks;
+	std::string					m_rewards;
+	int							m_recipe;
+	NetworkId					m_oldRecipeId;
+	int							m_shareAmount;
+};
+
+inline MessageQueueCreateSaga::MessageQueueCreateSaga()
+{
+
+}
+
+inline void MessageQueueCreateSaga::setRecipeOID(NetworkId const & id)
+{
+	m_oldRecipeId = id;
+}
+
+inline NetworkId const & MessageQueueCreateSaga::getRecipeOID() const
+{
+	return m_oldRecipeId;
+}
+
+inline void MessageQueueCreateSaga::setRecipe(bool recipe)
+{
+	m_recipe = recipe;
+}
+
+inline bool MessageQueueCreateSaga::isRecipe() const
+{
+	return m_recipe;
+}
+
+inline void MessageQueueCreateSaga::setTotalTasks(int total)
+{
+	m_totalTasks = total;
+}
+
+inline int MessageQueueCreateSaga::getTotalTasks() const
+{
+	return m_totalTasks;
+}
+
+inline void MessageQueueCreateSaga::setShareAmount(int amount)
+{
+	m_shareAmount = amount;
+}
+
+inline int MessageQueueCreateSaga::getShareAmount() const
+{
+	return m_shareAmount;
+}
+
+inline const std::vector<MessageQueueCreateSaga::TaskInfo> & MessageQueueCreateSaga::getTasks() const
+{
+	return m_tasks;
+}
+
+inline void MessageQueueCreateSaga::setQuestName(std::string name)
+{
+	m_questName = name;
+}
+
+inline std::string const & MessageQueueCreateSaga::getQuestName() const
+{
+	return m_questName;
+}
+
+inline void MessageQueueCreateSaga::setQuestDescription(std::string desc)
+{
+	m_questDescription = desc;
+}
+
+inline std::string const & MessageQueueCreateSaga::getQuestDescription() const
+{
+	return m_questDescription;
+}
+
+inline void MessageQueueCreateSaga::setRewards(std::string rewards)
+{
+	m_rewards = rewards;
+}
+
+inline std::string const & MessageQueueCreateSaga::getRewards() const
+{
+	return m_rewards;
+}
+
+#endif	// INCLUDED_MessageQueueCreateSaga_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsChangeRequest.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsChangeRequest.cpp
new file mode 100644
index 00000000..58d7567a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsChangeRequest.cpp
@@ -0,0 +1,58 @@
+//========================================================================
+//
+// MessageQueueCyberneticsChangeRequest.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCyberneticsChangeRequest.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueCyberneticsChangeRequest, CM_cyberneticsChangeRequest);
+
+//===================================================================
+
+/**
+ * Class destructor.
+ */
+MessageQueueCyberneticsChangeRequest::~MessageQueueCyberneticsChangeRequest()
+{
+}	// MessageQueueCyberneticsChangeRequest::~MessageQueueCyberneticsChangeRequest
+
+//----------------------------------------------------------------------
+
+void MessageQueueCyberneticsChangeRequest::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueCyberneticsChangeRequest* const msg = safe_cast<const MessageQueueCyberneticsChangeRequest*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->getChangeType());
+		Archive::put(target, msg->getCyberneticPiece());
+		Archive::put(target, msg->getTarget());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueCyberneticsChangeRequest::unpack (Archive::ReadIterator & source)
+{
+	int changeTypeInt = -1;
+	NetworkId cyberneticPiece;
+	NetworkId target;
+
+	Archive::get(source, changeTypeInt);
+	Archive::get(source, cyberneticPiece);
+	Archive::get(source, target);
+
+	return new MessageQueueCyberneticsChangeRequest(static_cast<ChangeType>(changeTypeInt), cyberneticPiece, target);
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsChangeRequest.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsChangeRequest.h
new file mode 100644
index 00000000..7f6ea909
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsChangeRequest.h
@@ -0,0 +1,83 @@
+//========================================================================
+//
+// MessageQueueCyberneticsChangeRequest.h
+//
+// copyright 2005 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#ifndef INCLUDED_MessageQueueCyberneticsChangeRequest_H
+#define INCLUDED_MessageQueueCyberneticsChangeRequest_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+//========================================================================
+
+class MessageQueueCyberneticsChangeRequest : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	enum ChangeType
+	{
+		CT_INSTALL,
+		CT_UNINSTALL,
+		CT_REPAIR
+	};
+
+public:
+	MessageQueueCyberneticsChangeRequest(ChangeType changeType, const NetworkId & cyberneticPiece, const NetworkId & npc);
+	virtual ~MessageQueueCyberneticsChangeRequest();
+
+	ChangeType getChangeType() const;
+	NetworkId const & getCyberneticPiece() const;
+	//this will be the npc id when coming from the client, then will be the player Id when forwarded to the auth server for the npc
+	NetworkId const & getTarget() const;
+
+private:
+	ChangeType m_changeType;
+	NetworkId  m_cyberneticPiece;
+	NetworkId  m_target;
+
+private:
+	MessageQueueCyberneticsChangeRequest (const MessageQueueCyberneticsChangeRequest &);
+	MessageQueueCyberneticsChangeRequest & operator= (const MessageQueueCyberneticsChangeRequest &);
+};
+
+//========================================================================
+
+inline MessageQueueCyberneticsChangeRequest::MessageQueueCyberneticsChangeRequest(MessageQueueCyberneticsChangeRequest::ChangeType const changeType, NetworkId const & cyberneticPiece, const NetworkId & target) :
+m_changeType(changeType),
+m_cyberneticPiece(cyberneticPiece),
+m_target(target)
+{
+}
+
+//------------------------------------------------------------------------
+
+inline MessageQueueCyberneticsChangeRequest::ChangeType  MessageQueueCyberneticsChangeRequest::getChangeType() const
+{
+	return m_changeType;
+}
+
+//------------------------------------------------------------------------
+
+inline NetworkId const & MessageQueueCyberneticsChangeRequest::getCyberneticPiece() const
+{
+	return m_cyberneticPiece;
+}
+
+//------------------------------------------------------------------------
+
+inline NetworkId const & MessageQueueCyberneticsChangeRequest::getTarget() const
+{
+	return m_target;
+}
+
+//========================================================================
+
+#endif	// INCLUDED_MessageQueueCyberneticsChangeRequest_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsOpen.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsOpen.cpp
new file mode 100644
index 00000000..9b668f67
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsOpen.cpp
@@ -0,0 +1,55 @@
+//========================================================================
+//
+// MessageQueueCyberneticsOpen.cpp
+//
+// copyright 2005 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueCyberneticsOpen.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueCyberneticsOpen, CM_cyberneticsOpen);
+
+//===================================================================
+
+/**
+ * Class destructor.
+ */
+MessageQueueCyberneticsOpen::~MessageQueueCyberneticsOpen()
+{
+}	// MessageQueueCyberneticsOpen::~MessageQueueCyberneticsOpen
+
+//----------------------------------------------------------------------
+
+void MessageQueueCyberneticsOpen::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueCyberneticsOpen* const msg = safe_cast<const MessageQueueCyberneticsOpen*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->getOpenType());
+		Archive::put(target, msg->getNPC());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueCyberneticsOpen::unpack (Archive::ReadIterator & source)
+{
+	int openTypeInt = -1;
+	NetworkId npc;
+
+	Archive::get(source, openTypeInt);
+	Archive::get(source, npc);
+
+	return new MessageQueueCyberneticsOpen(static_cast<OpenType>(openTypeInt), npc);
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsOpen.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsOpen.h
new file mode 100644
index 00000000..cd28f54d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCyberneticsOpen.h
@@ -0,0 +1,76 @@
+//========================================================================
+//
+// MessageQueueCyberneticsOpen.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueCyberneticsOpen_H
+#define INCLUDED_MessageQueueCyberneticsOpen_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+//===================================================================
+
+class MessageQueueCyberneticsOpen : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	enum OpenType
+	{
+		OT_INSTALL,
+		OT_UNINSTALL,
+		OT_REPAIR,
+		OT_VIEW
+	};
+
+public:
+
+	         MessageQueueCyberneticsOpen(OpenType openType, NetworkId const & npc);
+	virtual ~MessageQueueCyberneticsOpen();
+
+	OpenType getOpenType() const;
+	NetworkId const & getNPC() const;
+
+private:
+	OpenType m_openType;
+	NetworkId m_npc;
+
+private:
+	MessageQueueCyberneticsOpen (MessageQueueCyberneticsOpen const &);
+	MessageQueueCyberneticsOpen & operator= (MessageQueueCyberneticsOpen const &);
+};
+
+//===================================================================
+
+inline MessageQueueCyberneticsOpen::MessageQueueCyberneticsOpen(MessageQueueCyberneticsOpen::OpenType const openType, NetworkId const & npc) :
+m_openType(openType),
+m_npc(npc)
+{
+}	// MessageQueueCyberneticsOpen::MessageQueueCyberneticsOpen
+
+//----------------------------------------------------------------------
+
+inline MessageQueueCyberneticsOpen::OpenType MessageQueueCyberneticsOpen::getOpenType() const
+{
+	return m_openType;
+}
+
+//----------------------------------------------------------------------
+
+inline NetworkId const & MessageQueueCyberneticsOpen::getNPC() const
+{
+	return m_npc;
+}
+
+//===================================================================
+
+#endif	// INCLUDED_MessageQueueCyberneticsOpen_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransform.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransform.cpp
new file mode 100644
index 00000000..a5e81f61
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransform.cpp
@@ -0,0 +1,83 @@
+// ======================================================================
+//
+// MessageQueueDataTransform.cpp
+// copyright 2000 Verant Interactive
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueDataTransform.h"
+
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+// ======================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION (MessageQueueDataTransform, CM_netUpdateTransform);
+
+// ======================================================================
+
+MessageQueueDataTransform::MessageQueueDataTransform (const uint32 syncStamp, const int sequenceNumber, const Transform& source, const float speed,
+													  const float lookAtYaw, const bool useLookAtYaw) :
+	Data (),
+	m_syncStamp (syncStamp),
+	m_sequenceNumber (sequenceNumber),
+	m_transform (source),
+	m_speed (speed),
+	m_lookAtYaw (lookAtYaw),
+	m_useLookAtYaw (useLookAtYaw)
+{	
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueueDataTransform::~MessageQueueDataTransform ()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void MessageQueueDataTransform::pack (const MessageQueue::Data* const data, Archive::ByteStream& target)
+{
+	const MessageQueueDataTransform* const message = safe_cast<const MessageQueueDataTransform*> (data);
+	if (message)
+	{
+		Archive::put (target, message->getSyncStamp ());
+		Archive::put (target, message->getSequenceNumber ());
+		Archive::put (target, message->getTransform ());
+		Archive::put (target, message->getSpeed ());
+		Archive::put (target, message->getLookAtYaw());
+		Archive::put (target, message->getUseLookAtYaw());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueDataTransform::unpack (Archive::ReadIterator& source)
+{
+	uint32 syncStamp = 0;
+	Archive::get (source, syncStamp);
+
+	int sequenceNumber = 0;
+	Archive::get (source, sequenceNumber);
+
+	Transform transform;
+	Archive::get (source, transform);
+
+	float speed = 0.f;
+	Archive::get (source, speed);
+
+	float lookAtYaw = 0.f;
+	Archive::get (source, lookAtYaw);
+
+	bool useLookAtYaw = false;
+	Archive::get (source, useLookAtYaw);
+
+	return new MessageQueueDataTransform (syncStamp, sequenceNumber, transform, speed, lookAtYaw, useLookAtYaw);
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransform.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransform.h
new file mode 100644
index 00000000..2244d233
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransform.h
@@ -0,0 +1,99 @@
+// ======================================================================
+//
+// MessageQueueDataTransform.h
+// copyright 2000 Verant Interactive
+//
+// ======================================================================
+
+#ifndef	INCLUDED_MessageQueueDataTransform_H
+#define	INCLUDED_MessageQueueDataTransform_H
+
+// ======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedMath/Transform.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+class Transform;
+
+// ======================================================================
+
+class MessageQueueDataTransform : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	MessageQueueDataTransform (uint32 syncStamp, int sequenceNumber, const Transform& source, float speed, const float lookAtYaw, const bool useLookAtYaw);
+	virtual ~MessageQueueDataTransform ();
+
+	uint32           getSyncStamp () const;
+	int              getSequenceNumber () const;
+	const Transform& getTransform () const;
+	float            getSpeed () const;
+	float            getLookAtYaw () const;
+	bool             getUseLookAtYaw () const;
+
+private:
+
+	MessageQueueDataTransform ();
+	MessageQueueDataTransform& operator= (const MessageQueueDataTransform& source);
+	MessageQueueDataTransform (const MessageQueueDataTransform& source);
+
+private:
+
+	const uint32    m_syncStamp;
+	const int32     m_sequenceNumber;
+	const Transform m_transform;
+	const float     m_speed;
+	float           m_lookAtYaw;
+	bool            m_useLookAtYaw;
+};
+
+// ----------------------------------------------------------------------
+
+inline uint32 MessageQueueDataTransform::getSyncStamp () const
+{
+	return m_syncStamp;
+}
+
+// ----------------------------------------------------------------------
+
+inline int MessageQueueDataTransform::getSequenceNumber () const
+{
+	return m_sequenceNumber;
+}
+
+// ----------------------------------------------------------------------
+
+inline const Transform& MessageQueueDataTransform::getTransform () const
+{
+	return m_transform;
+}
+
+// ----------------------------------------------------------------------
+
+inline float MessageQueueDataTransform::getSpeed () const
+{
+	return m_speed;
+}
+
+// ----------------------------------------------------------------------
+
+inline float MessageQueueDataTransform::getLookAtYaw() const
+{
+	return m_lookAtYaw;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool MessageQueueDataTransform::getUseLookAtYaw() const
+{
+	return m_useLookAtYaw;
+}
+
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransformWithParent.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransformWithParent.cpp
new file mode 100644
index 00000000..11c6d313
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransformWithParent.cpp
@@ -0,0 +1,88 @@
+// ======================================================================
+//
+// MessageQueueDataTransformWithParent.cpp
+// copyright 2001, sony online entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueDataTransformWithParent.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+// ======================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION (MessageQueueDataTransformWithParent, CM_netUpdateTransformWithParent);
+
+// ======================================================================
+
+MessageQueueDataTransformWithParent::MessageQueueDataTransformWithParent (const uint32 syncStamp, const int sequenceNumber, const NetworkId& parent, const Transform& transform, const float speed,
+																		  const float lookAtYaw, const bool useLookAtYaw) :
+	Data (),
+	m_syncStamp (syncStamp),
+	m_sequenceNumber (sequenceNumber),
+	m_parent (parent),
+	m_transform (transform),
+	m_speed (speed),
+	m_lookAtYaw (lookAtYaw),
+	m_useLookAtYaw (useLookAtYaw)
+{
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueueDataTransformWithParent::~MessageQueueDataTransformWithParent ()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void MessageQueueDataTransformWithParent::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueDataTransformWithParent* const message = safe_cast<const MessageQueueDataTransformWithParent*> (data);
+	if (message)
+	{
+		Archive::put (target, message->getSyncStamp ());
+		Archive::put (target, message->getSequenceNumber ());
+		Archive::put (target, message->getParent ());
+		Archive::put (target, message->getTransform ());
+		Archive::put (target, message->getSpeed ());
+		Archive::put (target, message->getLookAtYaw ());
+		Archive::put (target, message->getUseLookAtYaw ());
+	}
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueDataTransformWithParent::unpack (Archive::ReadIterator & source)
+{
+	uint32 syncStamp = 0;
+	Archive::get (source, syncStamp);
+
+	int sequenceNumber = 0;
+	Archive::get (source, sequenceNumber);
+
+	NetworkId parent;
+	Archive::get (source, parent);
+
+	Transform transform;
+	Archive::get (source, transform);
+
+	float speed = 0.f;
+	Archive::get (source, speed);
+
+	float lookAtYaw = 0.f;
+	Archive::get (source, lookAtYaw);
+
+	bool useLookAtYaw = false;
+	Archive::get (source, useLookAtYaw);
+
+	return new MessageQueueDataTransformWithParent (syncStamp, sequenceNumber, parent, transform, speed, lookAtYaw, useLookAtYaw);
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransformWithParent.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransformWithParent.h
new file mode 100644
index 00000000..69689c76
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDataTransformWithParent.h
@@ -0,0 +1,109 @@
+// ======================================================================
+//
+// MessageQueueDataTransformWithParent.h
+// copyright 2001, sony online entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_MessageQueueDataTransformWithParent_H
+#define	INCLUDED_MessageQueueDataTransformWithParent_H
+
+// ======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Transform.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+// ======================================================================
+
+class MessageQueueDataTransformWithParent : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	MessageQueueDataTransformWithParent (uint32 syncStamp, int sequenceNumber, const NetworkId& parent, const Transform& transform, float speed, const float lookAtYaw, const bool lookAtYawIsValid);
+	virtual ~MessageQueueDataTransformWithParent ();
+
+	uint32           getSyncStamp () const;
+	int              getSequenceNumber () const;
+	const NetworkId& getParent () const;
+	const Transform& getTransform () const;
+	float            getSpeed () const;
+	float            getLookAtYaw () const;
+	bool             getUseLookAtYaw () const;
+
+private:
+
+	MessageQueueDataTransformWithParent ();
+	MessageQueueDataTransformWithParent& operator= (const MessageQueueDataTransformWithParent& source);
+	MessageQueueDataTransformWithParent (const MessageQueueDataTransformWithParent& source);
+
+private:
+
+	const uint32    m_syncStamp;
+	const int32     m_sequenceNumber;
+	const NetworkId m_parent;
+	const Transform m_transform;
+	const float     m_speed;
+	const float     m_lookAtYaw;
+	const bool      m_useLookAtYaw;
+};
+
+// ======================================================================
+
+inline const NetworkId& MessageQueueDataTransformWithParent::getParent () const
+{
+	return m_parent;
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 MessageQueueDataTransformWithParent::getSyncStamp () const
+{
+	return m_syncStamp;
+}
+
+// ----------------------------------------------------------------------
+
+inline int MessageQueueDataTransformWithParent::getSequenceNumber () const
+{
+	return m_sequenceNumber;
+}
+
+// ----------------------------------------------------------------------
+
+inline const Transform& MessageQueueDataTransformWithParent::getTransform () const
+{
+	return m_transform;
+}
+
+// ----------------------------------------------------------------------
+
+inline float MessageQueueDataTransformWithParent::getSpeed () const
+{
+	return m_speed;
+}
+
+// ----------------------------------------------------------------------
+
+inline float MessageQueueDataTransformWithParent::getLookAtYaw() const
+{
+	return m_lookAtYaw;
+}
+
+// ----------------------------------------------------------------------
+
+inline bool MessageQueueDataTransformWithParent::getUseLookAtYaw() const
+{
+	return m_useLookAtYaw;
+}
+
+// ======================================================================
+
+#endif
+
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.cpp
new file mode 100644
index 00000000..aacb3757
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.cpp
@@ -0,0 +1,112 @@
+//========================================================================
+//
+// MessageQueueDraftSchematics.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueDraftSchematics.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueDraftSchematics, CM_draftSchematicsMessage);
+
+//===================================================================
+
+
+/**
+* Class destructor.
+*/
+MessageQueueDraftSchematics::~MessageQueueDraftSchematics()
+{
+}	// MessageQueueDraftSchematics::~MessageQueueDraftSchematics
+
+//----------------------------------------------------------------------
+
+MessageQueueDraftSchematics::MessageQueueDraftSchematics(const NetworkId & toolId,
+	const NetworkId & stationId) :
+m_schematics (),
+m_toolId (toolId),
+m_stationId (stationId)
+{
+}	// MessageQueueDraftSchematics::MessageQueueDraftSchematics()
+
+//----------------------------------------------------------------------
+
+void MessageQueueDraftSchematics::addSchematic(const std::pair<uint32, uint32> & crc, 
+	int category)
+{
+	m_schematics.push_back(SchematicData(crc.first, crc.second, category));
+}	// MessageQueueDraftSchematics::addSchematic
+
+//----------------------------------------------------------------------
+
+int MessageQueueDraftSchematics::getSchematicCount(void) const
+{
+	return m_schematics.size();
+}	// MessageQueueDraftSchematics::getSchematicCount
+
+//----------------------------------------------------------------------
+
+const MessageQueueDraftSchematics::SchematicData & MessageQueueDraftSchematics::getSchematic(int index) const
+{
+	DEBUG_FATAL(index < 0 || index >= static_cast<int>(m_schematics.size()), 
+		("MessageQueueDraftSchematics::getSchematic index out of range"));
+	return m_schematics.at(index);
+}	// MessageQueueDraftSchematics::getSchematic
+
+//----------------------------------------------------------------------
+
+void MessageQueueDraftSchematics::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueDraftSchematics* const msg = safe_cast<const MessageQueueDraftSchematics*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->getToolId ());
+		Archive::put(target, msg->getStationId ());
+		
+		int count = msg->getSchematicCount();
+		Archive::put(target, count);
+		for (int i = 0; i < count; ++i)
+		{
+			const MessageQueueDraftSchematics::SchematicData & data = msg->getSchematic(i);
+			Archive::put(target, data.serverCrc);
+			Archive::put(target, data.sharedCrc);
+			Archive::put(target, data.category);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueDraftSchematics::unpack(Archive::ReadIterator & source)
+{
+	NetworkId toolId, stationId;
+	Archive::get(source, toolId);
+	Archive::get(source, stationId);
+	
+	MessageQueueDraftSchematics* const msg = new MessageQueueDraftSchematics(toolId, stationId);
+	NOT_NULL(msg);
+	
+	int count, category;
+	uint32 serverCrc, sharedCrc;
+	Archive::get(source, count);
+	for (int i = 0; i < count; ++i)
+	{
+		Archive::get(source, serverCrc);
+		Archive::get(source, sharedCrc);
+		Archive::get(source, category);
+		msg->addSchematic(std::make_pair(serverCrc, sharedCrc), category);
+	}
+	
+	return msg;
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.h
new file mode 100644
index 00000000..39acc351
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.h
@@ -0,0 +1,73 @@
+//========================================================================
+//
+// MessageQueueDraftSchematics.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueDraftSchematics_H
+#define INCLUDED_MessageQueueDraftSchematics_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/MessageQueueDraftSchematicsData.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//----------------------------------------------------------------------
+
+// @todo: can we get by with a single category value for the entire message?
+class MessageQueueDraftSchematics : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	typedef MessageQueueDraftSchematicsData SchematicData;
+
+	typedef stdvector<SchematicData>::fwd SchematicVector;
+
+public:
+
+	         MessageQueueDraftSchematics(const NetworkId & toolId, const NetworkId & stationId);
+	virtual ~MessageQueueDraftSchematics();
+
+	void                    addSchematic(const std::pair<uint32, uint32> & crc, int category);
+	int                     getSchematicCount(void) const;
+	const SchematicData &   getSchematic(int index) const;
+	const SchematicVector & getSchematics () const;
+	const NetworkId &       getToolId () const;
+	const NetworkId &       getStationId () const;
+
+private:
+	SchematicVector         m_schematics;
+	NetworkId               m_toolId;
+	NetworkId               m_stationId;
+};
+
+//----------------------------------------------------------------------
+
+inline const MessageQueueDraftSchematics::SchematicVector & MessageQueueDraftSchematics::getSchematics () const
+{
+	return m_schematics;
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueDraftSchematics::getToolId () const
+{
+	return m_toolId;
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueDraftSchematics::getStationId () const
+{
+	return m_stationId;
+}
+
+//----------------------------------------------------------------------
+
+
+#endif	// INCLUDED_MessageQueueDraftSchematics_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematicsData.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematicsData.cpp
new file mode 100644
index 00000000..c50d18c8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematicsData.cpp
@@ -0,0 +1,9 @@
+//======================================================================
+//
+// MessageQueueDraftSchematicsData.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueDraftSchematicsData.h"
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematicsData.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematicsData.h
new file mode 100644
index 00000000..170dc16e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematicsData.h
@@ -0,0 +1,33 @@
+//======================================================================
+//
+// MessageQueueDraftSchematicsData.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueDraftSchematicsData_H
+#define INCLUDED_MessageQueueDraftSchematicsData_H
+
+//======================================================================
+
+struct MessageQueueDraftSchematicsData
+{
+	uint32 serverCrc;
+	uint32 sharedCrc;
+	int    category;
+	
+	MessageQueueDraftSchematicsData(uint32 _serverCrc, uint32 _sharedCrc, int _category);
+};
+
+
+inline MessageQueueDraftSchematicsData::MessageQueueDraftSchematicsData(
+	uint32 _serverCrc, uint32 _sharedCrc, int _category) :
+	serverCrc(_serverCrc),
+	sharedCrc(_sharedCrc),
+	category(_category)
+{
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.cpp
new file mode 100644
index 00000000..d7c820d2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.cpp
@@ -0,0 +1,94 @@
+//========================================================================
+//
+// MessageQueueDraftSlots.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlots.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueCraftIngredients.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsDataArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueDraftSlots, CM_draftSlotsMessage);
+
+//===================================================================
+
+/**
+ * Class destructor.
+ */
+MessageQueueDraftSlots::~MessageQueueDraftSlots()
+{
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueDraftSlots::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueDraftSlots* const msg = safe_cast<const MessageQueueDraftSlots*> (data);
+	if (msg)
+	{
+		Archive::put (target, msg->getToolId());
+		Archive::put (target, msg->getManfSchemId());
+		Archive::put (target, msg->getPrototypeId());
+		Archive::put (target, msg->getVolume());
+		Archive::put (target, msg->canManufacture());
+		
+		int slotCount = msg->getSlotCount();
+		Archive::put (target, slotCount);
+
+		for (int i = 0; i < slotCount; ++i)
+		{
+			const MessageQueueDraftSlots::Slot & slot = msg->getSlot(i);
+			Archive::put (target, slot);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueDraftSlots::unpack(Archive::ReadIterator & source)
+{
+	NetworkId toolId;
+	NetworkId manfSchemId;
+	NetworkId testProtoId;
+	int       volume;
+	bool      canManufacture;
+	
+	Archive::get(source, toolId);
+	Archive::get(source, manfSchemId);
+	Archive::get(source, testProtoId);
+	Archive::get(source, volume);
+	Archive::get(source, canManufacture);
+	
+	MessageQueueDraftSlots * const msg = new MessageQueueDraftSlots(toolId, manfSchemId);
+	NOT_NULL(msg);
+
+	msg->setPrototypeId(testProtoId);
+	msg->setVolume(volume);
+	msg->setCanManufacture(canManufacture);
+	
+	MessageQueueDraftSlots::Slot slot;
+	
+	int slotCount = 0;
+	Archive::get(source, slotCount);
+	for (int i = 0; i < slotCount; ++i)
+	{
+		Archive::get(source, slot);
+		msg->addSlot (slot);
+		slot.options.clear ();
+	}
+	
+	return msg;
+}
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.h
new file mode 100644
index 00000000..8514b2f3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.h
@@ -0,0 +1,181 @@
+//========================================================================
+//
+// MessageQueueDraftSlots.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueDraftSlots_H
+#define INCLUDED_MessageQueueDraftSlots_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsData.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//----------------------------------------------------------------------
+
+class MessageQueueDraftSlots : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	typedef MessageQueueDraftSlotsData::Option Option;
+	typedef MessageQueueDraftSlotsData Slot;
+
+public:
+
+	explicit MessageQueueDraftSlots(const NetworkId & toolId, const NetworkId & manfSchemId);
+	virtual ~MessageQueueDraftSlots();
+
+	const NetworkId &  getToolId(void) const;
+
+	void               addSlot(const Slot & slot);
+	int                getSlotCount(void) const;
+	const Slot  &      getSlot(int index) const;
+
+	typedef stdvector<Slot>::fwd SlotVector;
+	const SlotVector & getSlots () const;
+	void               setSlots (const SlotVector & sv);
+
+	void               setManfSchemId (const NetworkId & id);
+	const NetworkId &  getManfSchemId () const;
+
+	void               setPrototypeId (const NetworkId & id);
+	const NetworkId &  getPrototypeId () const;
+
+	void               setVolume (int volume);
+	int                getVolume () const;
+
+	void               setCanManufacture(bool canManufacture);
+	bool               canManufacture() const;
+
+private:
+	std::vector<Slot>  m_slots;
+	NetworkId          m_toolId;
+	NetworkId          m_manfSchemId;
+	NetworkId          m_prototypeId;
+	int                m_volume;
+	bool               m_canManufacture;
+};
+
+
+//----------------------------------------------------------------------
+
+inline MessageQueueDraftSlots::MessageQueueDraftSlots(const NetworkId & toolId, const NetworkId & manfSchemId) :
+m_slots       (),
+m_toolId      (toolId),
+m_manfSchemId (manfSchemId),
+m_prototypeId (),
+m_volume      (1)
+{
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueDraftSlots::getToolId(void) const
+{
+	return m_toolId;
+}
+
+//----------------------------------------------------------------------
+
+inline void MessageQueueDraftSlots::addSlot(const MessageQueueDraftSlots::Slot & slot)
+{
+	m_slots.push_back(slot);
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueDraftSlots::getSlotCount(void) const
+{
+	return m_slots.size();
+}
+
+//----------------------------------------------------------------------
+
+inline const MessageQueueDraftSlots::Slot & MessageQueueDraftSlots::getSlot(int index) const
+{
+	DEBUG_FATAL(index < 0 || index >= static_cast<int>(m_slots.size()), ("MessageQueueDraftSlots::getSlot index out of range"));
+	return m_slots.at(index);
+}
+
+//----------------------------------------------------------------------
+
+inline void MessageQueueDraftSlots::setSlots (const SlotVector & sv)
+{
+	m_slots = sv;
+}
+
+//----------------------------------------------------------------------
+
+inline const MessageQueueDraftSlots::SlotVector & MessageQueueDraftSlots::getSlots () const
+{
+	return m_slots;
+}
+
+//----------------------------------------------------------------------
+
+inline void MessageQueueDraftSlots::setManfSchemId (const NetworkId & id)
+{
+	m_manfSchemId = id;
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId &  MessageQueueDraftSlots::getManfSchemId () const
+{
+	return m_manfSchemId;
+}
+
+//----------------------------------------------------------------------
+
+inline void MessageQueueDraftSlots::setPrototypeId (const NetworkId & id)
+{
+	m_prototypeId = id;
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId &  MessageQueueDraftSlots::getPrototypeId () const
+{
+	return m_prototypeId;
+}
+
+//----------------------------------------------------------------------
+
+inline void MessageQueueDraftSlots::setVolume (int volume)
+{
+	m_volume = volume;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueDraftSlots::getVolume () const
+{
+	return m_volume;
+}
+
+//----------------------------------------------------------------------
+
+inline void MessageQueueDraftSlots::setCanManufacture(bool canManufacture)
+{
+	m_canManufacture = canManufacture;
+}
+
+//----------------------------------------------------------------------
+
+inline bool MessageQueueDraftSlots::canManufacture() const
+{
+	return m_canManufacture;
+}
+
+//----------------------------------------------------------------------
+
+
+#endif	// INCLUDED_MessageQueueDraftSlots_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsData.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsData.cpp
new file mode 100644
index 00000000..e0c3b48c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsData.cpp
@@ -0,0 +1,21 @@
+//======================================================================
+//
+// MessageQueueDraftSlotsData.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsData.h"
+
+//======================================================================
+
+MessageQueueDraftSlotsData::MessageQueueDraftSlotsData () :
+name       (),
+optional   (false),
+options    (),
+hardpoint  ()
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsData.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsData.h
new file mode 100644
index 00000000..9fe29f99
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsData.h
@@ -0,0 +1,36 @@
+
+//======================================================================
+//
+// MessageQueueDraftSlotsData.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueDraftSlotsData_H
+#define INCLUDED_MessageQueueDraftSlotsData_H
+
+//======================================================================
+
+#include "sharedNetworkMessages/MessageQueueDraftSlotsDataOption.h"
+#include "StringId.h"
+#include <vector>
+
+//----------------------------------------------------------------------
+
+class MessageQueueDraftSlotsData
+{
+public:
+	typedef MessageQueueDraftSlotsDataOption Option;
+	typedef stdvector<Option>::fwd           OptionVector;
+	
+	StringId                   name;
+	bool                       optional;
+	OptionVector               options;
+	std::string                hardpoint;
+
+	MessageQueueDraftSlotsData ();
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataArchive.cpp
new file mode 100644
index 00000000..d4c5c66f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataArchive.cpp
@@ -0,0 +1,79 @@
+//======================================================================
+//
+// MessageQueueDraftSlotsDataArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsDataArchive.h"
+
+#include "sharedNetworkMessages/MessageQueueDraftSlotsData.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsDataOptionArchive.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsDataOption.h"
+#include "Archive/Archive.h"
+
+//======================================================================
+
+namespace Archive
+{
+	//----------------------------------------------------------------------
+
+	void get (ReadIterator & source, MessageQueueDraftSlotsData & target)
+	{
+		Archive::get(source, target.name);
+		Archive::get(source, target.optional);
+
+		int optionCount = 0;
+		Archive::get(source, optionCount);
+
+		MessageQueueDraftSlotsDataOption option;
+		bool componentSlot = false;
+
+		for (int j = 0; j < optionCount; ++j)
+		{
+			Archive::get (source, option);
+			if (option.type == Crafting::IT_item ||
+				option.type == Crafting::IT_template)
+			{
+				componentSlot = true;
+			}
+
+			target.options.push_back (option);
+		}
+
+		if (componentSlot)
+			Archive::get(source, target.hardpoint);	
+	}
+	
+	//----------------------------------------------------------------------
+
+	void put (ByteStream & target, const MessageQueueDraftSlotsData & source)
+	{
+		Archive::put (target, source.name);
+		Archive::put (target, source.optional);
+
+		int optionCount = source.options.size();
+		Archive::put (target, optionCount);
+
+		bool componentSlot = false;
+
+		for (int j = 0; j < optionCount; ++j)
+		{
+			const MessageQueueDraftSlotsDataOption & option = source.options[j];
+
+			Archive::put (target, option);
+
+			if (option.type == Crafting::IT_item ||
+				option.type == Crafting::IT_template)
+			{
+				componentSlot = true;
+			}
+		}
+
+		if (componentSlot)
+			Archive::put(target, source.hardpoint);
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataArchive.h
new file mode 100644
index 00000000..e9b51b99
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataArchive.h
@@ -0,0 +1,26 @@
+//======================================================================
+//
+// MessageQueueDraftSlotsDataArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueDraftSlotsDataArchive_H
+#define INCLUDED_MessageQueueDraftSlotsDataArchive_H
+
+//======================================================================
+
+class MessageQueueDraftSlotsData;
+
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+
+	void get (ReadIterator & source, MessageQueueDraftSlotsData & target);
+	void put (ByteStream & target, const MessageQueueDraftSlotsData & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataOption.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataOption.cpp
new file mode 100644
index 00000000..b247a0f0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataOption.cpp
@@ -0,0 +1,21 @@
+//======================================================================
+//
+// MessageQueueDraftSlotsDataOption.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsDataOption.h"
+
+//======================================================================
+
+MessageQueueDraftSlotsDataOption::MessageQueueDraftSlotsDataOption () :
+name          (),
+ingredient    (),
+type          (Crafting::IT_none),
+amountNeeded  (0)
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataOption.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataOption.h
new file mode 100644
index 00000000..db0c2d0f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataOption.h
@@ -0,0 +1,31 @@
+//======================================================================
+//
+// MessageQueueDraftSlotsDataOption.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueDraftSlotsDataOption_H
+#define INCLUDED_MessageQueueDraftSlotsDataOption_H
+
+//----------------------------------------------------------------------
+
+#include "sharedGame/CraftingData.h"
+#include "StringId.h"
+
+//======================================================================
+
+class MessageQueueDraftSlotsDataOption
+{
+public:
+	StringId                       name;
+	Unicode::String                ingredient;
+	Crafting::IngredientType       type;
+	int                            amountNeeded;
+
+	MessageQueueDraftSlotsDataOption ();
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataOptionArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataOptionArchive.cpp
new file mode 100644
index 00000000..e163437a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataOptionArchive.cpp
@@ -0,0 +1,46 @@
+//======================================================================
+//
+// MessageQueueDraftSlotsDataOptionArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsDataOptionArchive.h"
+
+#include "sharedNetworkMessages/MessageQueueDraftSlotsDataOption.h"
+#include "Archive/Archive.h"
+
+//======================================================================
+
+namespace Archive
+{
+	//----------------------------------------------------------------------
+
+	void get (ReadIterator & source, MessageQueueDraftSlotsDataOption & target)
+	{
+		Archive::get(source, target.name);
+		Archive::get(source, target.ingredient);
+
+		uint8 type = 0;
+		Archive::get(source, type);
+		target.type = static_cast<Crafting::IngredientType>(type);
+
+		Archive::get(source, target.amountNeeded);
+	}
+	
+	//----------------------------------------------------------------------
+
+	void put (ByteStream & target, const MessageQueueDraftSlotsDataOption & source)
+	{
+		Archive::put(target, source.name);
+		Archive::put(target, source.ingredient);
+
+		uint8 type = static_cast<uint8>(source.type);
+		Archive::put(target, type);
+
+		Archive::put(target, source.amountNeeded);
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataOptionArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataOptionArchive.h
new file mode 100644
index 00000000..36ecfbe8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsDataOptionArchive.h
@@ -0,0 +1,26 @@
+//======================================================================
+//
+// MessageQueueDraftSlotsDataOptionArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueDraftSlotsDataOptionArchive_H
+#define INCLUDED_MessageQueueDraftSlotsDataOptionArchive_H
+
+//======================================================================
+
+class MessageQueueDraftSlotsDataOption;
+
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+
+	void get (ReadIterator & source, MessageQueueDraftSlotsDataOption & target);
+	void put (ByteStream & target, const MessageQueueDraftSlotsDataOption & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.cpp
new file mode 100644
index 00000000..b20b7463
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.cpp
@@ -0,0 +1,112 @@
+//======================================================================
+//
+// MessageQueueDraftSlotsQueryResponse.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsQueryResponse.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsDataArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueDraftSlotsQueryResponse, CM_draftSlotsQueryResponse);
+
+
+//======================================================================
+
+MessageQueueDraftSlotsQueryResponse::MessageQueueDraftSlotsQueryResponse (const std::pair<uint32, uint32> & combinedCrc) :
+m_crc            (combinedCrc),
+m_slots          (),
+m_complexity     (0),
+m_volume         (1),
+m_canManufacture (true)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueDraftSlotsQueryResponse::~MessageQueueDraftSlotsQueryResponse ()
+{
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueDraftSlotsQueryResponse::setSlots (const SlotVector & sv)
+{
+	m_slots = sv;
+}
+
+//----------------------------------------------------------------------
+
+
+void MessageQueueDraftSlotsQueryResponse::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueDraftSlotsQueryResponse * const msg = safe_cast<const MessageQueueDraftSlotsQueryResponse*> (data);
+	if (msg)
+	{
+		Archive::put (target, msg->m_crc);
+		Archive::put (target, msg->getComplexity ());
+		Archive::put (target, msg->getVolume ());
+		Archive::put (target, msg->canManufacture ());
+		
+		const SlotVector & slots = msg->m_slots;
+		
+		const int slotCount = static_cast<int>(slots.size ());
+		Archive::put (target, slotCount);
+		
+		for (SlotVector::const_iterator it = slots.begin (); it != slots.end (); ++it)
+		{
+			const MessageQueueDraftSlotsQueryResponse::Slot & slot = *it;
+			Archive::put (target, slot);
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueDraftSlotsQueryResponse::unpack(Archive::ReadIterator & source)
+{
+	std::pair<uint32, uint32> crc;
+	int complexity, volume;
+	bool canManufacture;
+	
+	Archive::get(source, crc);
+	Archive::get(source, complexity);
+	Archive::get(source, volume);
+	Archive::get(source, canManufacture);
+	
+	MessageQueueDraftSlotsQueryResponse * const msg = new MessageQueueDraftSlotsQueryResponse (crc);
+	NOT_NULL(msg);
+	msg->setComplexity(complexity);
+	msg->setVolume(volume);
+	msg->setCanManufacture(canManufacture);
+	
+	MessageQueueDraftSlotsQueryResponse::Slot slot;
+	MessageQueueDraftSlotsQueryResponse::Option option;
+	
+	int slotCount = 0;
+	Archive::get(source, slotCount);
+
+	SlotVector slots;
+	slots.reserve (slotCount);
+
+	for (int i = 0; i < slotCount; ++i)
+	{
+		Archive::get (source, slot);
+		slots.push_back (slot);
+		slot.options.clear();
+	}
+
+	msg->setSlots (slots);
+	
+	return msg;
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.h
new file mode 100644
index 00000000..4d9df694
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.h
@@ -0,0 +1,121 @@
+//======================================================================
+//
+// MessageQueueDraftSlotsQueryResponse.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueDraftSlotsQueryResponse_H
+#define INCLUDED_MessageQueueDraftSlotsQueryResponse_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsData.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+//----------------------------------------------------------------------
+
+class MessageQueueDraftSlotsQueryResponse : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	typedef MessageQueueDraftSlotsData::Option Option;
+	typedef MessageQueueDraftSlotsData         Slot;
+	typedef stdvector<Slot>::fwd               SlotVector;
+
+public:
+
+	explicit MessageQueueDraftSlotsQueryResponse (const std::pair<uint32, uint32> & combinedCrc);
+	virtual ~MessageQueueDraftSlotsQueryResponse ();
+
+	void                  setComplexity(int complexity);
+	void                  setVolume (int volume);
+	void                  setCanManufacture(bool canManufacture);
+	void                  addSlot(const Slot & slot);
+
+	const std::pair<uint32, uint32> & getDraftSchematicCrc   () const;
+	int                               getComplexity          () const;
+	int                               getVolume              () const;
+	bool                              canManufacture         () const;
+	const SlotVector &                getSlots               () const;
+	void                              setSlots               (const SlotVector & sv);
+
+private:
+	std::pair<uint32, uint32> m_crc;
+	SlotVector                m_slots;
+	int                       m_complexity;
+	int                       m_volume;
+	bool                      m_canManufacture;
+};
+
+//----------------------------------------------------------------------
+
+inline void MessageQueueDraftSlotsQueryResponse::setComplexity(int complexity)
+{
+	m_complexity = complexity;
+}
+
+//----------------------------------------------------------------------
+
+inline void MessageQueueDraftSlotsQueryResponse::setVolume (int volume)
+{
+	m_volume = volume;
+}
+
+//----------------------------------------------------------------------
+
+inline void MessageQueueDraftSlotsQueryResponse::setCanManufacture(bool canManufacture)
+{
+	m_canManufacture = canManufacture;
+}
+
+//----------------------------------------------------------------------
+
+inline void MessageQueueDraftSlotsQueryResponse::addSlot(const MessageQueueDraftSlotsQueryResponse::Slot & slot)
+{
+	m_slots.push_back(slot);
+}
+
+//----------------------------------------------------------------------
+
+inline const std::pair<uint32, uint32> & MessageQueueDraftSlotsQueryResponse::getDraftSchematicCrc  () const
+{
+	return m_crc;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueDraftSlotsQueryResponse::getComplexity() const
+{
+	return m_complexity;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueDraftSlotsQueryResponse::getVolume () const
+{
+	return m_volume;
+}
+
+//----------------------------------------------------------------------
+
+inline bool MessageQueueDraftSlotsQueryResponse::canManufacture() const
+{
+	return m_canManufacture;
+}
+
+//----------------------------------------------------------------------
+
+inline const MessageQueueDraftSlotsQueryResponse::SlotVector & MessageQueueDraftSlotsQueryResponse::getSlots () const
+{
+	return m_slots;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGeneric.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGeneric.cpp
new file mode 100644
index 00000000..cfdb2101
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGeneric.cpp
@@ -0,0 +1,60 @@
+//======================================================================
+//
+// MessageQueueGeneric.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueGeneric.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_NO_INSTALL(MessageQueueGeneric);
+
+//===================================================================
+
+void MessageQueueGeneric::install() 
+{ 
+	installMemoryBlockManager();
+	ControllerMessageFactory::registerControllerMessageHandler(CM_nextCraftingStage, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_cancelCraftingSession, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_restartCraftingSession, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_createPrototype, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_createManfSchematic, pack, unpack); 
+	ExitChain::add(&remove, "MessageQueueGeneric::remove"); 
+} 
+
+//======================================================================
+
+MessageQueueGeneric::~MessageQueueGeneric ()
+{
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueGeneric::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueGeneric* const msg = safe_cast<const MessageQueueGeneric*> (data);
+	if (msg)
+	{
+		Archive::put (target, msg->getSequenceId());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+
+MessageQueue::Data* MessageQueueGeneric::unpack(Archive::ReadIterator & source)
+{
+	uint8 sequenceId;
+	Archive::get(source, sequenceId);
+	return new MessageQueueGeneric(sequenceId);
+}
+
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGeneric.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGeneric.h
new file mode 100644
index 00000000..50853530
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGeneric.h
@@ -0,0 +1,52 @@
+//======================================================================
+//
+// MessageQueueGeneric.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueGeneric_H
+#define INCLUDED_MessageQueueGeneric_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+class MessageQueueGeneric : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueGeneric (uint8 sequenceId);
+	virtual ~MessageQueueGeneric ();
+
+	uint8             getSequenceId ()    const;
+
+private:
+	MessageQueueGeneric (const MessageQueueGeneric &);
+	MessageQueueGeneric & operator= (const MessageQueueGeneric &);
+
+	uint8       m_sequenceId;
+};
+
+
+inline MessageQueueGeneric::MessageQueueGeneric (uint8 sequenceId) :
+m_sequenceId (sequenceId)
+{
+}
+
+//----------------------------------------------------------------------
+
+inline uint8 MessageQueueGeneric::getSequenceId ()    const
+{
+	return m_sequenceId;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponse.cpp
new file mode 100644
index 00000000..bdb9a6d7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponse.cpp
@@ -0,0 +1,36 @@
+//======================================================================
+//
+// MessageQueueGenericIntResponse.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueGenericIntResponse.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueGenericIntResponseArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_WITH_ARCHIVE_NO_INSTALL(MessageQueueGenericIntResponse);
+
+void MessageQueueGenericIntResponse::install() 
+{ 
+	installMemoryBlockManager();
+	ControllerMessageFactory::registerControllerMessageHandler(CM_craftingResult, pack, unpack);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_nextCraftingStageResult, pack, unpack);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_experimentResult, pack, unpack);
+	ExitChain::add(&remove, "MessageQueueGenericIntResponse::remove"); 
+} 
+
+
+//======================================================================
+
+MessageQueueGenericIntResponse::~MessageQueueGenericIntResponse ()
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponse.h
new file mode 100644
index 00000000..4cf9f3c5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponse.h
@@ -0,0 +1,74 @@
+//======================================================================
+//
+// MessageQueueGenericIntResponse.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueGenericIntResponse_H
+#define INCLUDED_MessageQueueGenericIntResponse_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+class MessageQueueGenericIntResponse : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueGenericIntResponse (int requestId, int response, uint8 sequenceId);
+	virtual ~MessageQueueGenericIntResponse ();
+
+	int               getResponse   () const;
+	uint8             getSequenceId () const;
+	int               getRequestId  () const;
+
+private:
+	MessageQueueGenericIntResponse (const MessageQueueGenericIntResponse &);
+	MessageQueueGenericIntResponse & operator= (const MessageQueueGenericIntResponse &);
+
+	int         m_requestId;
+	int         m_response;
+	uint8       m_sequenceId;
+};
+
+//----------------------------------------------------------------------
+
+inline MessageQueueGenericIntResponse::MessageQueueGenericIntResponse (int requestId, int response, uint8 sequenceId) :
+m_requestId (requestId),
+m_response (response),
+m_sequenceId (sequenceId)
+{
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueGenericIntResponse::getResponse ()       const
+{
+	return m_response;
+}
+
+//----------------------------------------------------------------------
+
+inline uint8 MessageQueueGenericIntResponse::getSequenceId ()    const
+{
+	return m_sequenceId;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueGenericIntResponse::getRequestId  () const
+{
+	return m_requestId;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponseArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponseArchive.cpp
new file mode 100644
index 00000000..98209254
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponseArchive.cpp
@@ -0,0 +1,42 @@
+//======================================================================
+//
+// MessageQueueGenericIntResponseArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueGenericIntResponseArchive.h"
+
+#include "sharedNetworkMessages/MessageQueueGenericIntResponse.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+//======================================================================
+
+MessageQueue::Data * MessageQueueGenericIntResponseArchive::get (Archive::ReadIterator & source)
+{
+	int   requestId;
+	int   response;
+	uint8 sequenceId;
+	Archive::get(source, requestId);
+	Archive::get(source, response);
+	Archive::get(source, sequenceId);
+	return new MessageQueueGenericIntResponse(requestId, response, sequenceId);
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueGenericIntResponseArchive::put (const MessageQueue::Data * source, Archive::ByteStream & target)
+{
+	const MessageQueueGenericIntResponse * const msg = dynamic_cast<const MessageQueueGenericIntResponse  *>(source);
+	NOT_NULL (msg);
+
+	if (msg)
+	{
+		Archive::put (target, msg->getRequestId());
+		Archive::put (target, msg->getResponse());
+		Archive::put (target, msg->getSequenceId());
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponseArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponseArchive.h
new file mode 100644
index 00000000..1d6da955
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericIntResponseArchive.h
@@ -0,0 +1,28 @@
+//======================================================================
+//
+// MessageQueueGenericIntResponseArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueGenericIntResponseArchive_H
+#define INCLUDED_MessageQueueGenericIntResponseArchive_H
+
+#include "Archive/ByteStream.h"
+#include "sharedFoundation/MessageQueue.h"
+
+class MessageQueueGenericIntResponse;
+
+//======================================================================
+
+class MessageQueueGenericIntResponseArchive
+{
+public:
+
+	static MessageQueue::Data *     get (Archive::ReadIterator & source);
+	static void                     put (const MessageQueue::Data * source, Archive::ByteStream & target);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponse.cpp
new file mode 100644
index 00000000..e6ebdd6f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponse.cpp
@@ -0,0 +1,36 @@
+//======================================================================
+//
+// MessageQueueGenericResponse.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueGenericResponse.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueGenericResponseArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_WITH_ARCHIVE_NO_INSTALL(MessageQueueGenericResponse);
+
+//===================================================================
+void MessageQueueGenericResponse::install() 
+{ 
+	installMemoryBlockManager();
+	ControllerMessageFactory::registerControllerMessageHandler(CM_nextStageReady, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientResourceHarvesterEmptyHopperResponse, pack, unpack); 
+	ExitChain::add(&remove, "MessageQueueGenericResponse::remove"); 
+} 
+
+
+//======================================================================
+
+MessageQueueGenericResponse::~MessageQueueGenericResponse ()
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponse.h
new file mode 100644
index 00000000..e77516fd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponse.h
@@ -0,0 +1,73 @@
+//======================================================================
+//
+// MessageQueueGenericResponse.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueGenericResponse_H
+#define INCLUDED_MessageQueueGenericResponse_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+class MessageQueueGenericResponse : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueGenericResponse (int requestId, bool success, uint8 sequenceId);
+	virtual ~MessageQueueGenericResponse ();
+
+	bool              getSuccess    () const;
+	uint8             getSequenceId () const;
+	int               getRequestId  () const;
+
+private:
+	MessageQueueGenericResponse (const MessageQueueGenericResponse &);
+	MessageQueueGenericResponse & operator= (const MessageQueueGenericResponse &);
+
+	int         m_requestId;
+	bool        m_success;
+	uint8       m_sequenceId;
+};
+
+//----------------------------------------------------------------------
+
+inline MessageQueueGenericResponse::MessageQueueGenericResponse (int requestId, bool success, uint8 sequenceId) :
+m_requestId (requestId),
+m_success (success),
+m_sequenceId (sequenceId)
+{
+}
+
+//----------------------------------------------------------------------
+
+inline bool MessageQueueGenericResponse::getSuccess ()       const
+{
+	return m_success;
+}
+
+//----------------------------------------------------------------------
+
+inline uint8 MessageQueueGenericResponse::getSequenceId ()    const
+{
+	return m_sequenceId;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueGenericResponse::getRequestId  () const
+{
+	return m_requestId;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponseArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponseArchive.cpp
new file mode 100644
index 00000000..37dff9a3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponseArchive.cpp
@@ -0,0 +1,42 @@
+//======================================================================
+//
+// MessageQueueGenericResponseArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueGenericResponseArchive.h"
+
+#include "sharedNetworkMessages/MessageQueueGenericResponse.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+//======================================================================
+
+MessageQueue::Data * MessageQueueGenericResponseArchive::get (Archive::ReadIterator & source)
+{
+	int   requestId;
+	bool  success;
+	uint8 sequenceId;
+	Archive::get(source, requestId);
+	Archive::get(source, success);
+	Archive::get(source, sequenceId);
+	return new MessageQueueGenericResponse(requestId, success, sequenceId);
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueGenericResponseArchive::put (const MessageQueue::Data * source, Archive::ByteStream & target)
+{
+	const MessageQueueGenericResponse * const msg = dynamic_cast<const MessageQueueGenericResponse  *>(source);
+	NOT_NULL (msg);
+
+	if (msg)
+	{
+		Archive::put (target, msg->getRequestId());
+		Archive::put (target, msg->getSuccess());
+		Archive::put (target, msg->getSequenceId());
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponseArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponseArchive.h
new file mode 100644
index 00000000..1059cca4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericResponseArchive.h
@@ -0,0 +1,28 @@
+//======================================================================
+//
+// MessageQueueGenericResponseArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueGenericResponseArchive_H
+#define INCLUDED_MessageQueueGenericResponseArchive_H
+
+#include "Archive/ByteStream.h"
+#include "sharedFoundation/MessageQueue.h"
+
+class MessageQueueGenericResponse;
+
+//======================================================================
+
+class MessageQueueGenericResponseArchive
+{
+public:
+
+	static MessageQueue::Data *     get (Archive::ReadIterator & source);
+	static void                     put (const MessageQueue::Data * source, Archive::ByteStream & target);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericString.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericString.cpp
new file mode 100644
index 00000000..11aa50e0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericString.cpp
@@ -0,0 +1,54 @@
+//======================================================================
+//
+// MessageQueueGenericString.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueGenericString.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_NO_INSTALL(MessageQueueGenericString);
+
+//===================================================================
+
+void MessageQueueGenericString::install() 
+{ 
+	installMemoryBlockManager();
+	ExitChain::add(&remove, "MessageQueueGenericString::remove"); 
+} 
+
+//-----------------------------------------------------------------------
+
+MessageQueueGenericString::~MessageQueueGenericString ()
+{
+}
+//-----------------------------------------------------------------------
+
+void MessageQueueGenericString::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueGenericString* const msg = safe_cast<const MessageQueueGenericString*> (data);
+	if (msg)
+	{
+		Archive::put (target, msg->getSequenceId());
+		Archive::put (target, msg->getString());
+	}
+}
+
+//-----------------------------------------------------------------------
+MessageQueue::Data* MessageQueueGenericString::unpack (Archive::ReadIterator & source)
+{
+	uint8 sequenceId;
+	Unicode::String string;
+	Archive::get(source, sequenceId);
+	Archive::get(source, string);
+	return new MessageQueueGenericString(string, sequenceId);
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericString.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericString.h
new file mode 100644
index 00000000..ed4d03eb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueGenericString.h
@@ -0,0 +1,71 @@
+//======================================================================
+//
+// MessageQueueGenericString.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueGenericString_H
+#define INCLUDED_MessageQueueGenericString_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+/**
+* A generic message queue data that contains a simple payload of one String.
+* The meaning of the String is context and message dependant.
+*
+*/
+
+class MessageQueueGenericString : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	explicit                MessageQueueGenericString (const Unicode::String & string, uint8 sequenceId);
+	virtual                ~MessageQueueGenericString();
+
+	uint8                       getSequenceId ()    const;
+	const Unicode::String &     getString(void) const;
+
+private:
+
+	MessageQueueGenericString&  operator= (const MessageQueueGenericString & source);
+	                     MessageQueueGenericString(const MessageQueueGenericString & source);
+
+	Unicode::String m_string;
+	uint8           m_sequenceId;
+};
+
+
+//-----------------------------------------------------------------------
+
+inline MessageQueueGenericString::MessageQueueGenericString (const Unicode::String & string, uint8 sequenceId) :
+	m_string(string),
+	m_sequenceId (sequenceId)
+{
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & MessageQueueGenericString::getString(void) const
+{
+	return m_string;
+}
+
+//-----------------------------------------------------------------------
+
+inline uint8 MessageQueueGenericString::getSequenceId ()    const
+{
+	return m_sequenceId;
+}
+
+
+//-----------------------------------------------------------------------
+
+#endif	// _MessageQueueGenericString_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueHarvesterResourceData.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueHarvesterResourceData.cpp
new file mode 100644
index 00000000..061c4139
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueHarvesterResourceData.cpp
@@ -0,0 +1,68 @@
+//======================================================================
+//
+// MessageQueueHarvesterResourceData.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueHarvesterResourceData.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedUtility/InstallationResourceDataArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueHarvesterResourceData, CM_clientResourceHarvesterResourceData);
+
+//===================================================================
+
+
+//-----------------------------------------------------------------------
+
+MessageQueueHarvesterResourceData::MessageQueueHarvesterResourceData (const NetworkId & harvesterId, const DataVector & data) :
+Data (),
+m_harvesterId (harvesterId),
+m_data (data)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueHarvesterResourceData::~MessageQueueHarvesterResourceData()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueueHarvesterResourceData::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueHarvesterResourceData* const msg = safe_cast<const MessageQueueHarvesterResourceData*> (data);
+	if (msg)
+	{
+		Archive::put (target, msg->getHarvesterId ());
+		Archive::AutoArray<InstallationResourceData> array;
+		array.set (msg->getDataVector ());
+		Archive::put (target, array);
+	}
+}
+
+//----------------------------------------------------------------------
+
+
+MessageQueue::Data* MessageQueueHarvesterResourceData::unpack(Archive::ReadIterator & source)
+{
+	NetworkId id;
+	Archive::get(source, id);
+	
+	Archive::AutoArray<InstallationResourceData> array;
+	Archive::get(source, array);
+
+	MessageQueue::Data * result = new MessageQueueHarvesterResourceData (id, array.get ());
+	return result;
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueHarvesterResourceData.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueHarvesterResourceData.h
new file mode 100644
index 00000000..bb1e435b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueHarvesterResourceData.h
@@ -0,0 +1,65 @@
+//======================================================================
+//
+// MessageQueueHarvesterResourceData.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueHarvesterResourceData_H
+#define INCLUDED_MessageQueueHarvesterResourceData_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedUtility/InstallationResourceData.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+/**
+* A generic message queue data that contains a simple payload of one NetworkId.
+* The meaning of the NetworkId is context and message dependant.
+*
+*/
+
+class MessageQueueHarvesterResourceData : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	typedef stdvector<InstallationResourceData>::fwd DataVector;
+
+	                        MessageQueueHarvesterResourceData (const NetworkId & id, const DataVector & data);
+	virtual                ~MessageQueueHarvesterResourceData();
+
+	const NetworkId &       getHarvesterId () const;
+	const DataVector &      getDataVector () const;
+
+private:
+
+	MessageQueueHarvesterResourceData&  operator= (const MessageQueueHarvesterResourceData & source);
+	MessageQueueHarvesterResourceData(const MessageQueueHarvesterResourceData & source);
+
+	NetworkId  m_harvesterId;
+	DataVector m_data;
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueHarvesterResourceData::getHarvesterId(void) const
+{
+	return m_harvesterId;
+}
+
+//----------------------------------------------------------------------
+
+inline const MessageQueueHarvesterResourceData::DataVector &      MessageQueueHarvesterResourceData::getDataVector () const
+{
+	return m_data;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _MessageQueueHarvesterResourceData_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequest.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequest.cpp
new file mode 100644
index 00000000..8d78511d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequest.cpp
@@ -0,0 +1,61 @@
+//======================================================================
+//
+// MessageQueueMissionCreateRequest.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionCreateRequest.h"
+
+#include "sharedNetworkMessages/MessageQueueMissionCreateRequestData.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueMissionCreateRequestDataArchive.h"
+
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueMissionCreateRequest, CM_missionCreateRequest);
+
+//======================================================================
+
+MessageQueueMissionCreateRequest::MessageQueueMissionCreateRequest (const MessageQueueMissionCreateRequestData & data, uint8 sequenceId) :
+m_data (new MessageQueueMissionCreateRequestData (data)),
+m_sequenceId (sequenceId)
+{
+
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueMissionCreateRequest::~MessageQueueMissionCreateRequest ()
+{
+	delete m_data;
+	m_data = 0;
+}
+//----------------------------------------------------------------------
+
+
+void MessageQueueMissionCreateRequest::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueMissionCreateRequest* const msg = NON_NULL(safe_cast<const MessageQueueMissionCreateRequest*> (data));
+	Archive::put(target, msg->getSequenceId ());
+	Archive::put(target, msg->getData ());
+}
+
+//----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueMissionCreateRequest::unpack(Archive::ReadIterator & source)
+{
+	uint8 sequenceId = 0;
+	MessageQueueMissionCreateRequestData data;
+	Archive::get(source, sequenceId);
+	Archive::get(source, data);
+	return new MessageQueueMissionCreateRequest (data, sequenceId);
+}
+
+//----------------------------------------------------------------------
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequest.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequest.h
new file mode 100644
index 00000000..e9ff7c21
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequest.h
@@ -0,0 +1,61 @@
+//======================================================================
+//
+// MessageQueueMissionCreateRequest.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueMissionCreateRequest_H
+#define INCLUDED_MessageQueueMissionCreateRequest_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+class MessageQueueMissionCreateRequestData;
+
+//-----------------------------------------------------------------------
+
+/**
+* The proper response to a MessageQueueMissionCreateRequest is a MessageQueueMissionGenericResponse
+*/
+
+class MessageQueueMissionCreateRequest : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	MessageQueueMissionCreateRequest (const MessageQueueMissionCreateRequestData & data, uint8 sequenceId);
+	~MessageQueueMissionCreateRequest ();
+
+	const MessageQueueMissionCreateRequestData & getData () const;
+	uint8             getSequenceId ()    const;
+
+private:
+	MessageQueueMissionCreateRequest (const MessageQueueMissionCreateRequest &);
+	MessageQueueMissionCreateRequest & operator= (const MessageQueueMissionCreateRequest &);
+
+	MessageQueueMissionCreateRequestData * m_data;
+	uint8                                  m_sequenceId;
+};
+
+//----------------------------------------------------------------------
+
+inline const MessageQueueMissionCreateRequestData & MessageQueueMissionCreateRequest::getData () const
+{
+	return *NON_NULL (m_data);
+}
+
+//----------------------------------------------------------------------
+
+inline uint8 MessageQueueMissionCreateRequest::getSequenceId () const
+{
+	return m_sequenceId;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestData.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestData.cpp
new file mode 100644
index 00000000..a3de4dc0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestData.cpp
@@ -0,0 +1,22 @@
+//======================================================================
+//
+// MessageQueueMissionCreateRequestData.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionCreateRequestData.h"
+
+//======================================================================
+
+MessageQueueMissionCreateRequestData::MessageQueueMissionCreateRequestData () :
+type (),
+idAssignee (NetworkId::cms_invalid),
+idTerminal (NetworkId::cms_invalid),
+idTarget (NetworkId::cms_invalid),
+reward (0)
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestData.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestData.h
new file mode 100644
index 00000000..002a7497
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestData.h
@@ -0,0 +1,31 @@
+//======================================================================
+//
+// MessageQueueMissionCreateRequestData.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueMissionCreateRequestData_H
+#define INCLUDED_MessageQueueMissionCreateRequestData_H
+
+//======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+
+//----------------------------------------------------------------------
+
+class MessageQueueMissionCreateRequestData
+{
+public:
+	MessageQueueMissionCreateRequestData ();
+
+	unsigned char  type;
+	NetworkId      idAssignee;
+	NetworkId      idTerminal;
+	NetworkId      idTarget;
+	uint32         reward;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestDataArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestDataArchive.cpp
new file mode 100644
index 00000000..d4368082
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestDataArchive.cpp
@@ -0,0 +1,36 @@
+//======================================================================
+//
+// MessageQueueMissionCreateRequestDataArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionCreateRequestDataArchive.h"
+
+#include "sharedNetworkMessages/MessageQueueMissionCreateRequestData.h"
+
+//======================================================================
+
+namespace Archive
+{
+	void get (ReadIterator & source, MessageQueueMissionCreateRequestData & target)
+	{
+		get (source, target.type);
+		get (source, target.idAssignee);
+		get (source, target.idTerminal);
+		get (source, target.idTarget);
+		get (source, target.reward);
+	}
+
+	void put (ByteStream & target, const MessageQueueMissionCreateRequestData & source)
+	{
+		put (target, source.type);
+		put (target, source.idAssignee);
+		put (target, source.idTerminal);
+		put (target, source.idTarget);
+		put (target, source.reward);
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestDataArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestDataArchive.h
new file mode 100644
index 00000000..61aff0fa
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionCreateRequestDataArchive.h
@@ -0,0 +1,27 @@
+//======================================================================
+//
+// MessageQueueMissionCreateRequestDataArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueMissionCreateRequestDataArchive_H
+#define INCLUDED_MessageQueueMissionCreateRequestDataArchive_H
+
+//======================================================================
+
+#include "Archive/ByteStream.h"
+
+class MessageQueueMissionCreateRequestData;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, MessageQueueMissionCreateRequestData & target);
+	void put (ByteStream & target, const MessageQueueMissionCreateRequestData & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsRequest.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsRequest.cpp
new file mode 100644
index 00000000..42bf16df
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsRequest.cpp
@@ -0,0 +1,66 @@
+// MessageQueueMissionDetailsRequest.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionDetailsRequest.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueMissionDetailsRequest, CM_missionDetailsRequest);
+
+//===================================================================
+
+
+//-----------------------------------------------------------------------
+
+MessageQueueMissionDetailsRequest::MessageQueueMissionDetailsRequest(const NetworkId & m, const NetworkId & t, const unsigned char s) :
+MessageQueue::Data(),
+missionData(m),
+terminalId(t),
+sequenceId(s)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueMissionDetailsRequest::~MessageQueueMissionDetailsRequest()
+{
+}
+
+//-----------------------------------------------------------------------
+
+
+void MessageQueueMissionDetailsRequest::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueMissionDetailsRequest* const message = safe_cast<const MessageQueueMissionDetailsRequest*> (data);
+	if(message)
+	{
+		Archive::put(target, message->getMissionData());
+		Archive::put(target, message->getTerminalId());
+		Archive::put(target, message->getSequenceId());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueMissionDetailsRequest::unpack(Archive::ReadIterator & source)
+{
+	NetworkId missionData;
+	NetworkId terminalId;
+	unsigned char sequenceId;
+	
+	Archive::get(source, missionData);
+	Archive::get(source, terminalId);
+	Archive::get(source, sequenceId);
+	
+	return new MessageQueueMissionDetailsRequest(missionData, terminalId, sequenceId);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsRequest.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsRequest.h
new file mode 100644
index 00000000..3bb40ad4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsRequest.h
@@ -0,0 +1,61 @@
+// MessageQueueMissionDetailsReqeust.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_MessageQueueMissionDetailsReqeust_H
+#define	_INCLUDED_MessageQueueMissionDetailsReqeust_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+class MessageQueueMissionDetailsRequest : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	MessageQueueMissionDetailsRequest(const NetworkId & missionData, const NetworkId & terminalId, const unsigned char sequenceId);
+	~MessageQueueMissionDetailsRequest();
+
+	const NetworkId &    getMissionData  () const;
+	const unsigned char  getSequenceId   () const;
+	const NetworkId &    getTerminalId   () const;
+
+private:
+	MessageQueueMissionDetailsRequest & operator = (const MessageQueueMissionDetailsRequest & rhs);
+	MessageQueueMissionDetailsRequest(const MessageQueueMissionDetailsRequest & source);
+
+	NetworkId      missionData;
+	NetworkId      terminalId;
+	unsigned char  sequenceId;
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueMissionDetailsRequest::getMissionData() const
+{
+	return missionData;
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned char MessageQueueMissionDetailsRequest::getSequenceId() const
+{
+	return sequenceId;
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueMissionDetailsRequest::getTerminalId() const
+{
+	return terminalId;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MessageQueueMissionDetailsReqeust_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponse.cpp
new file mode 100644
index 00000000..96c9e4c9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponse.cpp
@@ -0,0 +1,80 @@
+// MessageQueueMissionDetailsResponse.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionDetailsResponse.h"
+
+#include "sharedNetworkMessages/MessageQueueMissionDetailsResponseData.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueMissionDetailsResponseDataArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueMissionDetailsResponse, CM_missionDetailsResponse);
+
+//===================================================================
+
+
+//-----------------------------------------------------------------------
+
+MessageQueueMissionDetailsResponse::MessageQueueMissionDetailsResponse() :
+m_data(new MessageQueueMissionDetailsResponseData),
+m_sequenceId(0)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueMissionDetailsResponse::MessageQueueMissionDetailsResponse(const MessageQueueMissionDetailsResponseData & data, const uint8 sequenceId) :
+m_data(new MessageQueueMissionDetailsResponseData (data)),
+m_sequenceId(sequenceId)
+{
+}
+//-----------------------------------------------------------------------
+
+MessageQueueMissionDetailsResponse::~MessageQueueMissionDetailsResponse()
+{
+	delete m_data;
+	m_data = 0;
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueMissionDetailsResponse::set(const MessageQueueMissionDetailsResponseData & data, const uint8 sequenceId)
+{
+	*NON_NULL(m_data) = data;
+	m_sequenceId = sequenceId;
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueueMissionDetailsResponse::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueMissionDetailsResponse* const message = safe_cast<const MessageQueueMissionDetailsResponse*> (data);
+	if(message)
+	{
+		Archive::put(target, message->getSequenceId());
+		Archive::put(target, message->getData());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueMissionDetailsResponse::unpack(Archive::ReadIterator & source)
+{
+	uint8 sequenceId;
+	MessageQueueMissionDetailsResponseData data;
+	
+	Archive::get(source, sequenceId);
+	Archive::get(source, data);
+	
+	return new MessageQueueMissionDetailsResponse(data, sequenceId);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponse.h
new file mode 100644
index 00000000..4620d2b3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponse.h
@@ -0,0 +1,56 @@
+// MessageQueueMissionDetailsResponse.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_MessageQueueMissionDetailsResponse_H
+#define	_INCLUDED_MessageQueueMissionDetailsResponse_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+struct MessageQueueMissionDetailsResponseData;
+
+//-----------------------------------------------------------------------
+
+class MessageQueueMissionDetailsResponse : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	MessageQueueMissionDetailsResponse();
+	MessageQueueMissionDetailsResponse(const MessageQueueMissionDetailsResponseData & data, const uint8 sequenceId);
+	~MessageQueueMissionDetailsResponse();
+
+	const MessageQueueMissionDetailsResponseData & getData () const;
+	const uint8                                    getSequenceId() const;
+
+	void set(const MessageQueueMissionDetailsResponseData & data, const uint8 sequenceId);
+
+private:
+	MessageQueueMissionDetailsResponse & operator = (const MessageQueueMissionDetailsResponse & rhs);
+	MessageQueueMissionDetailsResponse(const MessageQueueMissionDetailsResponse & source);
+
+	MessageQueueMissionDetailsResponseData * m_data;
+	uint8                                    m_sequenceId;
+};
+
+//-----------------------------------------------------------------------
+
+inline const MessageQueueMissionDetailsResponseData & MessageQueueMissionDetailsResponse::getData() const
+{
+	return *NON_NULL(m_data);
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint8 MessageQueueMissionDetailsResponse::getSequenceId() const
+{
+	return m_sequenceId;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MessageQueueMissionDetailsResponse_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseData.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseData.cpp
new file mode 100644
index 00000000..7a199a5d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseData.cpp
@@ -0,0 +1,35 @@
+//======================================================================
+//
+// MessageQueueMissionDetailsResponseData.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionDetailsResponseData.h"
+
+//======================================================================
+
+MessageQueueMissionDetailsResponseData::MessageQueueMissionDetailsResponseData() :
+type (),
+idMissionData (),
+tokenOwner (),
+tokenTarget (),
+tokenStart (),
+tokenEnd (),
+targetCount (0),
+reward (0),
+bond (0),
+timeExpiration (0),
+timeLimit (0),
+profession (),
+rankMinimum (0),
+successRateMinimum (0),
+friendsList (false),
+tokenPlayerAssociation (),
+factionName (),
+factionDeclared (false)
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseData.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseData.h
new file mode 100644
index 00000000..63858407
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseData.h
@@ -0,0 +1,81 @@
+//======================================================================
+//
+// MessageQueueMissionDetailsResponseData.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueMissionDetailsResponseData_H
+#define INCLUDED_MessageQueueMissionDetailsResponseData_H
+
+//======================================================================
+
+#include "sharedMath/Vector.h"
+#include "sharedFoundation/NetworkId.h"
+#include "StringId.h"
+
+class Token;
+
+struct MessageQueueMissionDetailsResponseData
+{
+	struct TokenData
+	{
+		Unicode::String  objectName;
+		StringId         objectStringId;
+		std::string      targetTemplateName;
+		Vector           location;
+		std::string      planetName;
+	};
+
+	MessageQueueMissionDetailsResponseData ();
+
+	std::string type;
+
+	NetworkId   idMissionData;
+
+	//NetworkId   idOwner;
+	TokenData     tokenOwner;
+
+	//-- this NetworkId must be the NetworkId of a _TOKEN_
+	//NetworkId   idTarget;
+	TokenData     tokenTarget;
+
+	//-- these NetworkIds can be the NetworkIds of _TOKENS_ or _WAYPOINTS_
+	//NetworkId   idStart;
+	TokenData   tokenStart;
+	//NetworkId   idEnd;
+	TokenData   tokenEnd;
+
+	//-- zero targetCount indicates that the target is unique
+	//-- non-zero targetCount indicates a number of 'similar' targets
+	uint32      targetCount;
+
+	uint32      reward;
+	uint32      bond;
+
+	//-- this is an absolute point in time
+	uint32      timeExpiration;
+	//-- this is an elapsed time segment, not absolute point in time
+	uint32      timeLimit;
+
+	//-- an empty profession indicates no rank necessary
+	std::string profession;
+	uint32      rankMinimum;
+
+	//-- in percent units
+	uint8       successRateMinimum;
+
+	bool        friendsList;
+	TokenData   tokenPlayerAssociation;
+	//NetworkId   playerAssociation;
+
+	//-- an empty faction indicates no factional requirement
+	std::string factionName;
+	
+	//-- if factionName is nonempty, false indicates a sympathizer is required
+	bool        factionDeclared;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseDataArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseDataArchive.cpp
new file mode 100644
index 00000000..4e0195fe
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseDataArchive.cpp
@@ -0,0 +1,102 @@
+//======================================================================
+//
+// MessageQueueMissionDetailsResponseDataArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionDetailsResponseDataArchive.h"
+
+#include "localizationArchive/StringIdArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/MessageQueueMissionDetailsResponseData.h"
+
+//======================================================================
+
+namespace Archive
+{
+	void get (ReadIterator & source, MessageQueueMissionDetailsResponseData::TokenData & target)
+	{
+		get(source, target.objectName);
+		get(source, target.objectStringId);
+		get(source, target.targetTemplateName);
+		get(source, target.location);
+		get(source, target.planetName);
+	}
+
+	void put (ByteStream & target, const MessageQueueMissionDetailsResponseData::TokenData & source)
+	{
+		put(target, source.objectName);
+		put(target, source.objectStringId);
+		put(target, source.targetTemplateName);
+		put(target, source.location);
+		put(target, source.planetName);
+	}
+
+	void get (ReadIterator & source, MessageQueueMissionDetailsResponseData & target)
+	{
+		get (source, target.type);		
+		get (source, target.idMissionData);
+//		get (source, target.idOwner);
+		get (source, target.tokenOwner);
+
+//		get (source, target.idTarget);
+		get (source, target.tokenTarget);
+
+//		get (source, target.idStart);
+		get (source, target.tokenStart);
+
+//		get (source, target.idEnd);
+		get (source, target.tokenEnd);
+
+		get (source, target.targetCount);
+		get (source, target.reward);
+		get (source, target.bond);
+		get (source, target.timeExpiration);
+		get (source, target.timeLimit);
+		get (source, target.profession);
+		get (source, target.rankMinimum);
+		get (source, target.successRateMinimum);
+		get (source, target.friendsList);
+		//get (source, target.playerAssociation);
+		get (source, target.tokenPlayerAssociation);
+		get (source, target.factionName);
+		get (source, target.factionDeclared);
+	}
+
+	void put (ByteStream & target, const MessageQueueMissionDetailsResponseData & source)
+	{
+		put (target, source.type);
+		put (target, source.idMissionData);
+
+		put (target, source.tokenOwner);
+//		put (target, source.idOwner);
+
+		put (target, source.tokenTarget);
+//		put (target, source.idTarget);
+
+		put (target, source.tokenStart);
+//		put (target, source.idStart);
+
+		put (target, source.tokenEnd);
+//		put (target, source.idEnd);
+
+		put (target, source.targetCount);
+		put (target, source.reward);
+		put (target, source.bond);
+		put (target, source.timeExpiration);
+		put (target, source.timeLimit);
+		put (target, source.profession);
+		put (target, source.rankMinimum);
+		put (target, source.successRateMinimum);
+		put (target, source.friendsList);
+
+		put (target, source.tokenPlayerAssociation);
+//		put (target, source.playerAssociation);
+
+		put (target, source.factionName);
+		put (target, source.factionDeclared);
+	}
+}
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseDataArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseDataArchive.h
new file mode 100644
index 00000000..1a84566a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionDetailsResponseDataArchive.h
@@ -0,0 +1,27 @@
+//======================================================================
+//
+// MessageQueueMissionDetailsResponseDataArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueMissionDetailsResponseDataArchive_H
+#define INCLUDED_MessageQueueMissionDetailsResponseDataArchive_H
+
+//======================================================================
+
+#include "Archive/ByteStream.h"
+
+struct MessageQueueMissionDetailsResponseData;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, MessageQueueMissionDetailsResponseData & target);
+	void put (ByteStream & target, const MessageQueueMissionDetailsResponseData & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequest.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequest.cpp
new file mode 100644
index 00000000..60591dec
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequest.cpp
@@ -0,0 +1,83 @@
+//======================================================================
+//
+// MessageQueueMissionGenericRequest.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionGenericRequest.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueMissionGenericRequestArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_NO_INSTALL(MessageQueueMissionGenericRequest);
+
+//===================================================================
+void MessageQueueMissionGenericRequest::install() 
+{ 
+	installMemoryBlockManager();
+	ControllerMessageFactory::registerControllerMessageHandler(CM_missionAcceptRequest, pack, unpack, true); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_missionRemoveRequest, pack, unpack); 
+	ExitChain::add(&remove, "MessageQueueMissionGenericRequest::remove"); 
+} 
+
+//======================================================================
+
+MessageQueueMissionGenericRequest::MessageQueueMissionGenericRequest () :
+m_missionObjectId (new NetworkId),
+m_terminalId (new NetworkId),
+m_sequenceId (0)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueMissionGenericRequest::MessageQueueMissionGenericRequest (const NetworkId & missionObjectId, const NetworkId & terminalId, uint8 sequenceId) :
+m_missionObjectId (new NetworkId (missionObjectId)),
+m_terminalId (new NetworkId (terminalId)),
+m_sequenceId (sequenceId)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueMissionGenericRequest::~MessageQueueMissionGenericRequest ()
+{
+	delete m_missionObjectId;
+	m_missionObjectId = 0;
+	delete m_terminalId;
+	m_terminalId = 0;
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueMissionGenericRequest::set (const NetworkId & missionObjectId, const NetworkId & terminalId, uint8 sequenceId)
+{
+	*NON_NULL (m_missionObjectId) = missionObjectId;
+	*NON_NULL (m_terminalId)    = terminalId;
+	m_sequenceId                = sequenceId;
+}
+// ----------------------------------------------------------------------
+
+
+void MessageQueueMissionGenericRequest::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	Archive::put(target, *NON_NULL(safe_cast<const MessageQueueMissionGenericRequest*> (data)));
+}
+
+//----------------------------------------------------------------------
+
+
+MessageQueue::Data* MessageQueueMissionGenericRequest::unpack(Archive::ReadIterator & source)
+{
+	MessageQueueMissionGenericRequest* const req = new MessageQueueMissionGenericRequest;
+	Archive::get(source, *req);
+	return req;
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequest.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequest.h
new file mode 100644
index 00000000..4937f104
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequest.h
@@ -0,0 +1,67 @@
+//======================================================================
+//
+// MessageQueueMissionGenericRequest.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueMissionGenericRequest_H
+#define INCLUDED_MessageQueueMissionGenericRequest_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+class MessageQueueMissionGenericRequest : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	MessageQueueMissionGenericRequest ();
+	MessageQueueMissionGenericRequest (const NetworkId & missionObjectId, const NetworkId & terminalId, uint8 sequenceId);
+	~MessageQueueMissionGenericRequest ();
+
+	const NetworkId & getMissionObjectId () const;
+	const NetworkId & getTerminalId    () const;
+	uint8             getSequenceId ()    const;
+
+	void              set (const NetworkId & missionObjectId, const NetworkId & terminalId, uint8 sequenceId);
+
+private:
+	MessageQueueMissionGenericRequest (const MessageQueueMissionGenericRequest &);
+	MessageQueueMissionGenericRequest & operator= (const MessageQueueMissionGenericRequest &);
+
+	NetworkId * m_missionObjectId;
+	NetworkId * m_terminalId;
+	uint8       m_sequenceId;
+};
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueMissionGenericRequest::getMissionObjectId () const
+{
+	return *NON_NULL(m_missionObjectId);
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueMissionGenericRequest::getTerminalId () const
+{
+	return *NON_NULL(m_terminalId);
+}
+
+//----------------------------------------------------------------------
+
+inline uint8 MessageQueueMissionGenericRequest::getSequenceId ()    const
+{
+	return m_sequenceId;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequestArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequestArchive.cpp
new file mode 100644
index 00000000..7fd14e07
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequestArchive.cpp
@@ -0,0 +1,39 @@
+//======================================================================
+//
+// MessageQueueMissionGenericRequestArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionGenericRequestArchive.h"
+
+#include "sharedNetworkMessages/MessageQueueMissionGenericRequest.h"
+
+//======================================================================
+
+namespace Archive
+{
+	void get (ReadIterator & source, MessageQueueMissionGenericRequest & target)
+	{
+		NetworkId missionObjectId;
+		NetworkId terminalId;
+		uint8 sequenceId = 0;
+
+		get (source, missionObjectId);
+		get (source, terminalId);
+		get (source, sequenceId);
+
+		target.set (missionObjectId, terminalId, sequenceId);
+	}
+
+
+	void put (ByteStream & target, const MessageQueueMissionGenericRequest & source)
+	{
+		put (target, source.getMissionObjectId ());
+		put (target, source.getTerminalId ());
+		put (target, source.getSequenceId ());
+	}
+
+}
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequestArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequestArchive.h
new file mode 100644
index 00000000..c63ab544
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericRequestArchive.h
@@ -0,0 +1,26 @@
+//======================================================================
+//
+// MessageQueueMissionGenericRequestArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueMissionGenericRequestArchive_H
+#define INCLUDED_MessageQueueMissionGenericRequestArchive_H
+
+//======================================================================
+
+#include "Archive/ByteStream.h"
+class MessageQueueMissionGenericRequest;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, MessageQueueMissionGenericRequest & target);
+	void put (ByteStream & target, const MessageQueueMissionGenericRequest & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponse.cpp
new file mode 100644
index 00000000..131a0375
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponse.cpp
@@ -0,0 +1,98 @@
+//======================================================================
+//
+// MessageQueueMissionGenericResponse.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionGenericResponse.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueMissionGenericResponseArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_NO_INSTALL(MessageQueueMissionGenericResponse);
+
+//===================================================================
+void MessageQueueMissionGenericResponse::install() 
+{ 
+	installMemoryBlockManager();
+	ControllerMessageFactory::registerControllerMessageHandler(CM_missionAcceptResponse, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_missionRemoveResponse, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_missionCreateResponse, pack, unpack); 
+	ExitChain::add(&remove, "MessageQueueMissionGenericResponse::remove"); 
+} 
+
+
+//======================================================================
+
+MessageQueueMissionGenericResponse::MessageQueueMissionGenericResponse () :
+m_missionObjectId (new NetworkId),
+m_success (false),
+m_sequenceId (0)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueMissionGenericResponse::MessageQueueMissionGenericResponse (const NetworkId & id, bool success, uint8 sequenceId) :
+m_missionObjectId (new NetworkId (id)),
+m_success (success),
+m_sequenceId (sequenceId)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueMissionGenericResponse::~MessageQueueMissionGenericResponse ()
+{
+	delete m_missionObjectId;
+	m_missionObjectId = 0;
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueMissionGenericResponse::set (const NetworkId & missionObjectId, bool success, uint8 sequenceId)
+{
+	setMissionObjectId (missionObjectId);
+	setSuccess (success);
+	m_sequenceId                = sequenceId;
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueMissionGenericResponse::setSuccess (bool b)
+{
+	m_success                   = b;
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueMissionGenericResponse::setMissionObjectId (const NetworkId & missionObjectId)
+{
+	*NON_NULL(m_missionObjectId) = missionObjectId;
+}
+//----------------------------------------------------------------------
+
+
+void MessageQueueMissionGenericResponse::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	Archive::put(target, *NON_NULL(safe_cast<const MessageQueueMissionGenericResponse*> (data)));
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueMissionGenericResponse::unpack(Archive::ReadIterator & source)
+{
+	MessageQueueMissionGenericResponse* const rsp = new MessageQueueMissionGenericResponse;
+	Archive::get(source, *rsp);
+	return rsp;
+}
+
+
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponse.h
new file mode 100644
index 00000000..de42c95e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponse.h
@@ -0,0 +1,70 @@
+//======================================================================
+//
+// MessageQueueMissionGenericResponse.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueMissionGenericResponse_H
+#define INCLUDED_MessageQueueMissionGenericResponse_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+class MessageQueueMissionGenericResponse : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	MessageQueueMissionGenericResponse ();
+	MessageQueueMissionGenericResponse (const NetworkId & missionObjectId, bool success, uint8 sequenceId);
+	~MessageQueueMissionGenericResponse ();
+
+	const NetworkId & getMissionObjectId () const;
+	bool              getSuccess ()       const;
+	uint8             getSequenceId ()    const;
+
+	void              set (const NetworkId & missionObjectId, bool success, uint8 sequenceId);
+
+	void              setSuccess (bool b);
+	void              setMissionObjectId (const NetworkId & missionObjectId);
+
+private:
+	MessageQueueMissionGenericResponse (const MessageQueueMissionGenericResponse &);
+	MessageQueueMissionGenericResponse & operator= (const MessageQueueMissionGenericResponse &);
+
+	NetworkId * m_missionObjectId;
+	bool        m_success;
+	uint8       m_sequenceId;
+};
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueMissionGenericResponse::getMissionObjectId () const
+{
+	return *NON_NULL(m_missionObjectId);
+}
+
+//----------------------------------------------------------------------
+
+inline bool MessageQueueMissionGenericResponse::getSuccess ()       const
+{
+	return m_success;
+}
+
+//----------------------------------------------------------------------
+
+inline uint8 MessageQueueMissionGenericResponse::getSequenceId ()    const
+{
+	return m_sequenceId;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponseArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponseArchive.cpp
new file mode 100644
index 00000000..0ac86119
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponseArchive.cpp
@@ -0,0 +1,39 @@
+//======================================================================
+//
+// MessageQueueMissionGenericResponseArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionGenericResponseArchive.h"
+
+#include "sharedNetworkMessages/MessageQueueMissionGenericResponse.h"
+
+//======================================================================
+
+namespace Archive
+{
+	void get (ReadIterator & source, MessageQueueMissionGenericResponse & target)
+	{
+		NetworkId id;
+		bool  success = false;
+		uint8 sequenceId = 0;
+
+		get (source, id);
+		get (source, success);
+		get (source, sequenceId);
+
+		target.set (id, success, sequenceId);
+	}
+
+
+	void put (ByteStream & target, const MessageQueueMissionGenericResponse & source)
+	{
+		put (target, source.getMissionObjectId ());
+		put (target, source.getSuccess ());
+		put (target, source.getSequenceId ());
+	}
+
+}
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponseArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponseArchive.h
new file mode 100644
index 00000000..4ed01131
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionGenericResponseArchive.h
@@ -0,0 +1,26 @@
+//======================================================================
+//
+// MessageQueueMissionGenericResponseArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueMissionGenericResponseArchive_H
+#define INCLUDED_MessageQueueMissionGenericResponseArchive_H
+
+//======================================================================
+
+#include "Archive/ByteStream.h"
+class MessageQueueMissionGenericResponse;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, MessageQueueMissionGenericResponse & target);
+	void put (ByteStream & target, const MessageQueueMissionGenericResponse & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListRequest.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListRequest.cpp
new file mode 100644
index 00000000..22cae83a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListRequest.cpp
@@ -0,0 +1,66 @@
+// MessageQueueMissionListRequest.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionListRequest.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueMissionListRequest, CM_missionListRequest);
+
+//===================================================================
+
+
+//-----------------------------------------------------------------------
+
+MessageQueueMissionListRequest::MessageQueueMissionListRequest(const NetworkId & n, const uint8 f, const uint8 s) :
+MessageQueue::Data(),
+m_flags(f),
+m_sequenceId(s),
+m_terminalId(n)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueMissionListRequest::~MessageQueueMissionListRequest()
+{
+}
+
+//-----------------------------------------------------------------------
+
+
+void MessageQueueMissionListRequest::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueMissionListRequest* const message = safe_cast<const MessageQueueMissionListRequest*> (data);
+	if(message)
+	{
+		Archive::put(target, message->getFlags());
+		Archive::put(target, message->getSequenceId());
+		Archive::put(target, message->getTerminalId());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueMissionListRequest::unpack(Archive::ReadIterator & source)
+{
+	unsigned char flags;
+	unsigned char sequenceId;
+	NetworkId terminalId;
+	
+	Archive::get(source, flags);
+	Archive::get(source, sequenceId);
+	Archive::get(source, terminalId);
+	
+	return new MessageQueueMissionListRequest(terminalId, flags, sequenceId);
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListRequest.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListRequest.h
new file mode 100644
index 00000000..49894dac
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListRequest.h
@@ -0,0 +1,85 @@
+// MessageQueueMissionListRequest.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_MessageQueueMissionListRequest_H
+#define	_INCLUDED_MessageQueueMissionListRequest_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+class MessageQueueMissionListRequest : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	enum Flags
+	{
+		F_mineOnly  = 0x0001,
+	};
+
+	MessageQueueMissionListRequest(const NetworkId & terminalId, const uint8 flags, const uint8 sequenceId);
+	~MessageQueueMissionListRequest();
+
+	const uint8        getFlags       () const;
+	const uint8        getSequenceId  () const;
+	const NetworkId &  getTerminalId  () const;
+
+	bool               hasFlags       (Flags f) const;
+	bool               hasAnyFlags    (Flags f) const;
+
+private:
+	MessageQueueMissionListRequest & operator = (const MessageQueueMissionListRequest & rhs);
+	MessageQueueMissionListRequest(const MessageQueueMissionListRequest & source);
+
+	uint8       m_flags;
+	uint8       m_sequenceId;
+	NetworkId   m_terminalId;
+};
+
+//-----------------------------------------------------------------------
+
+inline const uint8 MessageQueueMissionListRequest::getFlags() const
+{
+	return m_flags;
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint8 MessageQueueMissionListRequest::getSequenceId() const
+{
+	return m_sequenceId;
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueMissionListRequest::getTerminalId() const
+{
+	return m_terminalId;
+}
+
+//----------------------------------------------------------------------
+
+inline bool MessageQueueMissionListRequest::hasFlags(Flags f) const
+{
+	return (m_flags & f) == f;
+}
+
+//----------------------------------------------------------------------
+
+inline bool MessageQueueMissionListRequest::hasAnyFlags(Flags f) const
+{
+	return (m_flags & f) != 0;
+}
+
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MessageQueueMissionListRequest_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponse.cpp
new file mode 100644
index 00000000..de73e6de
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponse.cpp
@@ -0,0 +1,73 @@
+// MessageQueueMissionListResponse.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionListResponse.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueMissionListResponseArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueMissionListResponse, CM_missionListResponse);
+
+//===================================================================
+
+
+//----------------------------------------------------------------------
+
+MessageQueueMissionListResponse::MessageQueueMissionListResponse() :
+m_response(),
+m_sequenceId(0),
+m_bountyTerminal(false)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueMissionListResponse::MessageQueueMissionListResponse(const DataVector & v, const uint8 s, const bool b) :
+m_response(v), 
+m_sequenceId(s),
+m_bountyTerminal(b)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueMissionListResponse::~MessageQueueMissionListResponse()
+{
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueMissionListResponse::set(const DataVector & response, const uint8 sequenceId, const bool b)
+{
+	m_response = response;
+	m_sequenceId = sequenceId;
+	m_bountyTerminal = b;
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueueMissionListResponse::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueMissionListResponse* const message = safe_cast<const MessageQueueMissionListResponse*> (data);
+	if(message)
+		Archive::put(target, *message);
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueMissionListResponse::unpack(Archive::ReadIterator & source)
+{
+	MessageQueueMissionListResponse* const rsp = new MessageQueueMissionListResponse;
+	Archive::get(source, *rsp);
+	return rsp;
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponse.h
new file mode 100644
index 00000000..1ad6b0ce
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponse.h
@@ -0,0 +1,72 @@
+// MessageQueueMissionListResponse.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_MessageQueueMissionListResponse_H
+#define	_INCLUDED_MessageQueueMissionListResponse_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/MessageQueueMissionListResponseData.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+#include <vector>
+
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+class MessageQueueMissionListResponse : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	typedef MessageQueueMissionListResponseData DataElement;
+	typedef stdvector<DataElement>::fwd         DataVector;
+
+public:
+	MessageQueueMissionListResponse();
+	MessageQueueMissionListResponse(const DataVector & response, const uint8 sequenceId, const bool isBountyTerminal);
+	~MessageQueueMissionListResponse();
+
+
+	const bool           getBountyTerminal  () const;
+	const DataVector &   getResponse        () const;
+	const uint8          getSequenceId      () const;
+
+	void                 set(const DataVector & response, const uint8 sequenceId, const bool isBountyTerminal);
+
+private:
+	MessageQueueMissionListResponse & operator = (const MessageQueueMissionListResponse & rhs);
+	MessageQueueMissionListResponse(const MessageQueueMissionListResponse & source);
+
+	DataVector   m_response;
+	uint8        m_sequenceId;
+	bool         m_bountyTerminal;
+};
+
+//-----------------------------------------------------------------------
+
+inline const bool MessageQueueMissionListResponse::getBountyTerminal() const
+{
+	return m_bountyTerminal;
+}
+
+//-----------------------------------------------------------------------
+
+inline const MessageQueueMissionListResponse::DataVector & MessageQueueMissionListResponse::getResponse() const
+{
+	return m_response;
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint8 MessageQueueMissionListResponse::getSequenceId() const
+{
+	return m_sequenceId;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MessageQueueMissionListResponse_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseArchive.cpp
new file mode 100644
index 00000000..34e7fa76
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseArchive.cpp
@@ -0,0 +1,63 @@
+//======================================================================
+//
+// MessageQueueMissionListResponseArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionListResponseArchive.h"
+
+#include "sharedNetworkMessages/MessageQueueMissionListResponse.h"
+#include "sharedNetworkMessages/MessageQueueMissionListResponseData.h"
+#include "sharedNetworkMessages/MessageQueueMissionListResponseDataArchive.h"
+
+//======================================================================
+
+namespace Archive
+{
+
+	//----------------------------------------------------------------------
+
+	void get (ReadIterator & source, MessageQueueMissionListResponse & target)
+	{
+		MessageQueueMissionListResponse::DataVector v;
+		size_t s = 0;
+		unsigned char sequenceId = 0;
+		bool b = false;
+
+		Archive::get(source, sequenceId);
+		Archive::get(source, b);
+		Archive::get(source, s);
+
+		v.reserve (s);
+
+		for(size_t i = 0; i < s; ++i)
+		{
+			MessageQueueMissionListResponse::DataElement r;
+			Archive::get(source, r);
+			v.push_back(r);		
+		}
+		
+		target.set (v, sequenceId, b);
+	}
+	
+	//----------------------------------------------------------------------
+
+	void put (ByteStream & target, const MessageQueueMissionListResponse & source)
+	{ 
+		Archive::put(target, source.getSequenceId());
+		Archive::put(target, source.getBountyTerminal());
+		Archive::put(target, source.getResponse().size());
+	
+		typedef MessageQueueMissionListResponse::DataVector DataVector;
+		const DataVector & v = source.getResponse();
+		
+		for(DataVector::const_iterator i = v.begin(); i != v.end(); ++i)
+		{
+			Archive::put(target, *i);
+		}
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseArchive.h
new file mode 100644
index 00000000..183bb866
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseArchive.h
@@ -0,0 +1,25 @@
+//======================================================================
+//
+// MessageQueueMissionListResponseArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueMissionListResponseArchive_H
+#define INCLUDED_MessageQueueMissionListResponseArchive_H
+
+//======================================================================
+
+class MessageQueueMissionListResponse;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, MessageQueueMissionListResponse & target);
+	void put (ByteStream & target, const MessageQueueMissionListResponse & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseData.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseData.cpp
new file mode 100644
index 00000000..a5bd7e11
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseData.cpp
@@ -0,0 +1,13 @@
+//======================================================================
+//
+// MessageQueueMissionListResponseData.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionListResponseData.h"
+
+//======================================================================
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseData.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseData.h
new file mode 100644
index 00000000..ccdce246
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseData.h
@@ -0,0 +1,38 @@
+//======================================================================
+//
+// MessageQueueMissionListResponseData.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueMissionListResponseData_H
+#define INCLUDED_MessageQueueMissionListResponseData_H
+
+//======================================================================
+
+#include "sharedFoundation/NetworkId.h"
+#include "StringId.h"
+
+//----------------------------------------------------------------------
+
+class MessageQueueMissionListResponseData
+{
+public:
+	int              bond;
+	Unicode::String  creatorName;
+	Unicode::String  targetName;
+	StringId         description;
+	int              difficulty;
+	std::string      endLocationPlanetName;
+	Unicode::String  endLocationRegionName;
+	NetworkId        missionData;
+	Unicode::String  missionType;
+	int              reward;
+	std::string      startLocationPlanetName;
+	Unicode::String  startLocationRegionName;
+	StringId         title;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseDataArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseDataArchive.cpp
new file mode 100644
index 00000000..76be8de9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseDataArchive.cpp
@@ -0,0 +1,54 @@
+//======================================================================
+//
+// MessageQueueMissionListResponseDataArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueMissionListResponseDataArchive.h"
+
+#include "sharedNetworkMessages/MessageQueueMissionListResponseData.h"
+#include "localizationArchive/StringIdArchive.h"
+
+//======================================================================
+
+namespace Archive
+{
+	void get (ReadIterator & source, MessageQueueMissionListResponseData & target)
+	{
+		Archive::get(source, target.bond);
+		Archive::get(source, target.creatorName);
+		Archive::get(source, target.targetName);
+		Archive::get(source, target.description);
+		Archive::get(source, target.difficulty);
+		Archive::get(source, target.endLocationPlanetName);
+		Archive::get(source, target.endLocationRegionName);
+		Archive::get(source, target.missionData);
+		Archive::get(source, target.missionType);
+		Archive::get(source, target.reward);
+		Archive::get(source, target.startLocationPlanetName);
+		Archive::get(source, target.startLocationRegionName);
+		Archive::get(source, target.title);
+	}
+	
+	void put (ByteStream & target, const MessageQueueMissionListResponseData & source)
+	{ 
+		Archive::put(target, source.bond);
+		Archive::put(target, source.creatorName);
+		Archive::put(target, source.targetName);
+		Archive::put(target, source.description);
+		Archive::put(target, source.difficulty);
+		Archive::put(target, source.endLocationPlanetName);
+		Archive::put(target, source.endLocationRegionName);
+		Archive::put(target, source.missionData);
+		Archive::put(target, source.missionType);
+		Archive::put(target, source.reward);
+		Archive::put(target, source.startLocationPlanetName);
+		Archive::put(target, source.startLocationRegionName);
+		Archive::put(target, source.title);
+	}
+	
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseDataArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseDataArchive.h
new file mode 100644
index 00000000..268c493b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponseDataArchive.h
@@ -0,0 +1,25 @@
+//======================================================================
+//
+// MessageQueueMissionListResponseDataArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueMissionListResponseDataArchive_H
+#define INCLUDED_MessageQueueMissionListResponseDataArchive_H
+
+//======================================================================
+
+class MessageQueueMissionListResponseData;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, MessageQueueMissionListResponseData & target);
+	void put (ByteStream & target, const MessageQueueMissionListResponseData & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkId.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkId.cpp
new file mode 100644
index 00000000..33078aaa
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkId.cpp
@@ -0,0 +1,72 @@
+//======================================================================
+//
+// MessageQueueNetworkId.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueNetworkId.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_NO_INSTALL(MessageQueueNetworkId);
+
+//===================================================================
+
+void MessageQueueNetworkId::install() 
+{ 
+	installMemoryBlockManager(); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_getTokenForObject, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_combatAimToClient, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_getWaypointForObject, pack, unpack, true); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientResourceHarvesterActivate, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientResourceHarvesterDeactivate, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientResourceHarvesterListen, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientResourceHarvesterStopListening, pack,unpack ); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientResourceHarvesterGetResourceData, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_missionAbort, pack, unpack, true); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setOwnerId, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientLookAtTarget, pack, unpack, true);	
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientIntendedTarget, pack, unpack, true);  
+	ExitChain::add(&remove, "MessageQueueNetworkId::remove"); 
+} 
+
+//-----------------------------------------------------------------------
+
+MessageQueueNetworkId::MessageQueueNetworkId (const NetworkId & id) :
+Data (),
+m_id (id)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueNetworkId::~MessageQueueNetworkId()
+{
+}
+
+//-----------------------------------------------------------------------
+void MessageQueueNetworkId::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueNetworkId* const msg = safe_cast<const MessageQueueNetworkId*> (data);
+	if (msg)
+		Archive::put (target, msg->getNetworkId ());
+}
+
+
+//----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueNetworkId::unpack(Archive::ReadIterator & source)
+{
+	NetworkId id;
+	Archive::get(source, id);
+	
+	return new MessageQueueNetworkId (id);
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkId.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkId.h
new file mode 100644
index 00000000..fe947beb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkId.h
@@ -0,0 +1,53 @@
+//======================================================================
+//
+// MessageQueueNetworkId.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueNetworkId_H
+#define INCLUDED_MessageQueueNetworkId_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+/**
+* A generic message queue data that contains a simple payload of one NetworkId.
+* The meaning of the NetworkId is context and message dependant.
+*
+*/
+
+class MessageQueueNetworkId : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	explicit                MessageQueueNetworkId (const NetworkId & id);
+	virtual                ~MessageQueueNetworkId();
+
+	const NetworkId &       getNetworkId(void) const;
+
+private:
+
+	MessageQueueNetworkId&  operator= (const MessageQueueNetworkId & source);
+	                        MessageQueueNetworkId(const MessageQueueNetworkId & source);
+
+	NetworkId m_id;
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueNetworkId::getNetworkId(void) const
+{
+	return m_id;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _MessageQueueNetworkId_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkIdPair.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkIdPair.cpp
new file mode 100644
index 00000000..8c515cce
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkIdPair.cpp
@@ -0,0 +1,67 @@
+//======================================================================
+//
+// MessageQueueNetworkIdPair.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueNetworkIdPair.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedMathArchive/TransformArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_NO_INSTALL(MessageQueueNetworkIdPair);
+
+//===================================================================
+
+void MessageQueueNetworkIdPair::install() 
+{ 
+	installMemoryBlockManager();
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientResourceHarvesterResourceSelect, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientResourceHarvesterSurvey, pack, unpack); 
+	ExitChain::add(&remove, "MessageQueueNetworkIdPair::remove"); 
+} 
+
+//-----------------------------------------------------------------------
+
+MessageQueueNetworkIdPair::MessageQueueNetworkIdPair (const NetworkId & first, const NetworkId & second) :
+Data (),
+m_firstId (first),
+m_secondId (second)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueNetworkIdPair::~MessageQueueNetworkIdPair()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueueNetworkIdPair::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueNetworkIdPair* const msg = safe_cast<const MessageQueueNetworkIdPair*> (data);
+	if (msg)
+	{
+		Archive::put (target, msg->getFirstNetworkId ());
+		Archive::put (target, msg->getSecondNetworkId ());
+	}
+}
+
+//----------------------------------------------------------------------
+MessageQueue::Data* MessageQueueNetworkIdPair::unpack(Archive::ReadIterator & source)
+{
+	NetworkId id [2];
+	Archive::get(source, id [0]);
+	Archive::get(source, id [1]);
+	MessageQueueNetworkIdPair* const message = new MessageQueueNetworkIdPair (id [0], id [1]);
+	return message;
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkIdPair.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkIdPair.h
new file mode 100644
index 00000000..f06e2b27
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNetworkIdPair.h
@@ -0,0 +1,62 @@
+//======================================================================
+//
+// MessageQueueNetworkIdPair.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueNetworkIdPair_H
+#define INCLUDED_MessageQueueNetworkIdPair_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+/**
+* A generic message queue data that contains a simple payload of one NetworkId.
+* The meaning of the NetworkId is context and message dependant.
+*
+*/
+
+class MessageQueueNetworkIdPair : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	explicit                MessageQueueNetworkIdPair (const NetworkId & first, const NetworkId & second);
+	virtual                ~MessageQueueNetworkIdPair();
+
+	const NetworkId &       getFirstNetworkId(void) const;
+	const NetworkId &       getSecondNetworkId(void) const;
+
+private:
+
+	MessageQueueNetworkIdPair&  operator= (const MessageQueueNetworkIdPair & source);
+	                        MessageQueueNetworkIdPair(const MessageQueueNetworkIdPair & source);
+
+	NetworkId m_firstId;
+	NetworkId m_secondId;
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueNetworkIdPair::getFirstNetworkId(void) const
+{
+	return m_firstId;
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueNetworkIdPair::getSecondNetworkId(void) const
+{
+	return m_secondId;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _MessageQueueNetworkIdPair_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.cpp
new file mode 100644
index 00000000..aed700ac
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.cpp
@@ -0,0 +1,57 @@
+//========================================================================
+//
+// MessageQueueNpcConversationMessage.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueNpcConversationMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueNpcConversationMessage, CM_npcConversationMessage);
+
+//===================================================================
+
+
+
+/**
+ * Class destructor.
+ */
+MessageQueueNpcConversationMessage::~MessageQueueNpcConversationMessage()
+{
+}	// MessageQueueNpcConversationMessage::~MessageQueueNpcConversationMessage
+
+
+void MessageQueueNpcConversationMessage::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueNpcConversationMessage* const msg = safe_cast<const MessageQueueNpcConversationMessage*> (data);
+	
+	if (msg)
+	{
+		Archive::put(target, msg->getNpcMessage());
+	}
+}	
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueNpcConversationMessage::unpack(Archive::ReadIterator & source)
+{
+	MessageQueueNpcConversationMessage * msg = new MessageQueueNpcConversationMessage;
+	NOT_NULL(msg);
+	
+	Unicode::String response;
+	Archive::get(source, response);
+	msg->setNpcMessage(response);
+	
+	return msg;
+}	
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.h
new file mode 100644
index 00000000..11fa0f1f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueNpcConversationMessage.h
@@ -0,0 +1,51 @@
+//========================================================================
+//
+// MessageQueueNpcConversationMessage.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueNpcConversationMessage_H
+#define INCLUDED_MessageQueueNpcConversationMessage_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+class MessageQueueNpcConversationMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueNpcConversationMessage(void);
+	virtual ~MessageQueueNpcConversationMessage();
+
+	void                    setNpcMessage(const Unicode::String & response);
+	const Unicode::String & getNpcMessage(void) const;
+
+private:
+	Unicode::String m_message;
+};
+
+
+inline MessageQueueNpcConversationMessage::MessageQueueNpcConversationMessage()
+{
+}	// MessageQueueNpcConversationMessage::MessageQueueNpcConversationMessage()
+
+inline void MessageQueueNpcConversationMessage::setNpcMessage(const Unicode::String & message)
+{
+	m_message = message;
+}	// MessageQueueNpcConversationMessage::addNpcResponse
+
+inline const Unicode::String & MessageQueueNpcConversationMessage::getNpcMessage(void) const
+{
+	return m_message;
+}	// MessageQueueNpcConversationMessage::getNpcResponse
+
+
+#endif	// INCLUDED_MessageQueueNpcConversationMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueObjectMenuRequest.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueObjectMenuRequest.cpp
new file mode 100644
index 00000000..d92aded3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueObjectMenuRequest.cpp
@@ -0,0 +1,78 @@
+// ======================================================================
+//
+// MessageQueueObjectMenuRequest.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueObjectMenuRequest.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_NO_INSTALL(MessageQueueObjectMenuRequest);
+
+//===================================================================
+
+void MessageQueueObjectMenuRequest::install() 
+{ 
+	installMemoryBlockManager();
+	ControllerMessageFactory::registerControllerMessageHandler(CM_objectMenuRequest, pack, unpack, true); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_objectMenuResponse, pack, unpack); 
+	ExitChain::add(&remove, "MessageQueueObjectMenuRequest::remove"); 
+} 
+
+//-----------------------------------------------------------------------
+
+MessageQueueObjectMenuRequest::MessageQueueObjectMenuRequest (const NetworkId & targetId, const NetworkId & requestorId, const stdvector<ObjectMenuRequestData>::fwd & data, uint8 sequence) :
+m_sequence (sequence),
+m_data (data),
+m_requestorId (requestorId),
+m_targetId (targetId)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueObjectMenuRequest::~MessageQueueObjectMenuRequest ()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueueObjectMenuRequest::pack(const MessageQueue::Data* data, Archive::ByteStream & target)
+{
+	const MessageQueueObjectMenuRequest * const msg = safe_cast<const MessageQueueObjectMenuRequest *>(data);
+	if(msg)
+	{
+		Archive::put(target, msg->getTargetId());
+		Archive::put(target, msg->getRequestorId());
+		Archive::put(target, msg->getData());
+		Archive::put(target, msg->m_sequence);
+	}
+}
+
+//-----------------------------------------------------------------------
+MessageQueue::Data * MessageQueueObjectMenuRequest::unpack(Archive::ReadIterator & source)
+{
+	NetworkId targetId;
+	NetworkId requestorId;
+	std::vector<ObjectMenuRequestData> requestData;
+	uint8 sequence;
+
+	Archive::get(source, targetId);
+	Archive::get(source, requestorId);
+	Archive::get(source, requestData);
+	Archive::get(source, sequence);
+
+	MessageQueue::Data * result = new MessageQueueObjectMenuRequest(targetId, requestorId, requestData, sequence);
+	return result;
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueObjectMenuRequest.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueObjectMenuRequest.h
new file mode 100644
index 00000000..cb7bad65
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueObjectMenuRequest.h
@@ -0,0 +1,83 @@
+
+// ======================================================================
+//
+// MessageQueueObjectMenuRequest.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MessageQueueObjectMenuRequest_H
+#define INCLUDED_MessageQueueObjectMenuRequest_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/ObjectMenuRequestDataArchive.h"
+#include "Unicode.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+class GameInByteStream;
+class GameOutByteStream;
+
+/**
+* This message is used in both directions for client-server communication regarding
+* scripted radial menus for objects.
+*
+*/
+
+class MessageQueueObjectMenuRequest : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	
+	           MessageQueueObjectMenuRequest (const NetworkId & id, const NetworkId & requestorId, const stdvector<ObjectMenuRequestData>::fwd & data, uint8 sequence);
+	virtual   ~MessageQueueObjectMenuRequest ();
+
+	const stdvector<ObjectMenuRequestData>::fwd &  getData         () const;
+	const NetworkId &                              getRequestorId  () const;
+	const NetworkId &                              getTargetId     () const;
+
+	uint8                                  m_sequence;
+
+private:
+
+	stdvector<ObjectMenuRequestData>::fwd  m_data;
+	NetworkId                              m_requestorId;
+	NetworkId                              m_targetId;
+
+private:
+	MessageQueueObjectMenuRequest(const MessageQueueObjectMenuRequest&);
+	MessageQueueObjectMenuRequest& operator= (const MessageQueueObjectMenuRequest&);
+};
+
+//----------------------------------------------------------------------
+
+inline const stdvector<ObjectMenuRequestData>::fwd &  MessageQueueObjectMenuRequest::getData () const
+{
+	return m_data;
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueObjectMenuRequest::getTargetId () const
+{
+	return m_targetId;
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueObjectMenuRequest::getRequestorId() const
+{
+	return m_requestorId;
+}
+
+//-----------------------------------------------------------------
+
+#endif
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.cpp
new file mode 100644
index 00000000..5acdb5ab
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.cpp
@@ -0,0 +1,69 @@
+//========================================================================
+//
+// MessageQueueOpponentInfo.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueOpponentInfo.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueOpponentInfo, CM_opponentInfo);
+
+//===================================================================
+
+
+
+/**
+ * Class destructor.
+ */
+MessageQueueOpponentInfo::~MessageQueueOpponentInfo()
+{
+}	// MessageQueueOpponentInfo::~MessageQueueOpponentInfo
+
+void MessageQueueOpponentInfo::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueOpponentInfo* const msg = safe_cast<const MessageQueueOpponentInfo*> (data);
+	
+	if (msg)
+	{
+		Archive::put(target, msg->getOpponent());
+		Archive::put(target, msg->getHealth());
+		Archive::put(target, msg->getAction());
+		Archive::put(target, msg->getMind());
+	}
+}
+
+//----------------------------------------------------------------------
+
+
+MessageQueue::Data* MessageQueueOpponentInfo::unpack(Archive::ReadIterator & source)
+{
+	NetworkId opponent;
+	uint16 health;
+	uint16 action;
+	uint16 mind;
+	
+	Archive::get(source, opponent);
+	Archive::get(source, health);
+	Archive::get(source, action);
+	Archive::get(source, mind);
+	
+	MessageQueueOpponentInfo * msg = new MessageQueueOpponentInfo();
+	msg->setOpponent(opponent);
+	msg->setAttributes(health, action, mind);
+	NOT_NULL(msg);
+	
+	return msg;
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.h
new file mode 100644
index 00000000..55de51af
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueOpponentInfo.h
@@ -0,0 +1,103 @@
+//========================================================================
+//
+// MessageQueueOpponentInfo.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueOpponentInfo_H
+#define INCLUDED_MessageQueueOpponentInfo_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+class MessageQueueOpponentInfo : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueOpponentInfo();
+	virtual ~MessageQueueOpponentInfo();
+
+	MessageQueueOpponentInfo&	operator=	(const MessageQueueOpponentInfo & source);
+	MessageQueueOpponentInfo(const MessageQueueOpponentInfo & source);
+
+	void setOpponent(const NetworkId & opponent);
+	void setAttributes(int health, int action, int mind);
+
+	const NetworkId & getOpponent(void) const;
+	uint16 getHealth(void) const;
+	uint16 getAction(void) const;
+	uint16 getMind(void) const;
+ 
+private:
+	NetworkId m_opponent;
+	uint16    m_health;
+	uint16    m_action;
+	uint16    m_mind;
+};
+
+
+inline MessageQueueOpponentInfo::MessageQueueOpponentInfo()
+{
+}
+
+inline MessageQueueOpponentInfo::MessageQueueOpponentInfo(
+	const MessageQueueOpponentInfo & source) :
+	MessageQueue::Data(source),
+	m_opponent(source.m_opponent),
+	m_health(source.m_health),
+	m_action(source.m_action),
+	m_mind(source.m_mind)
+{
+}
+
+inline MessageQueueOpponentInfo & MessageQueueOpponentInfo::operator=(
+	const MessageQueueOpponentInfo & source)
+{
+	m_opponent = source.m_opponent;
+	m_health = source.m_health;
+	m_action = source.m_action;
+	m_mind = source.m_mind;
+	return *this;
+}
+
+inline void MessageQueueOpponentInfo::setOpponent(const NetworkId & opponent)
+{
+	m_opponent = opponent;
+}
+
+inline void MessageQueueOpponentInfo::setAttributes(int health, int action, int mind)
+{
+	m_health = static_cast<uint16>(health);
+	m_action = static_cast<uint16>(action);
+	m_mind = static_cast<uint16>(mind);
+}
+
+inline const NetworkId & MessageQueueOpponentInfo::getOpponent(void) const
+{
+	return m_opponent;
+}
+
+inline uint16 MessageQueueOpponentInfo::getHealth(void) const
+{
+	return m_health;
+}
+
+inline uint16 MessageQueueOpponentInfo::getAction(void) const
+{
+	return m_action;
+}
+
+inline uint16 MessageQueueOpponentInfo::getMind(void) const
+{
+	return m_mind;
+}
+
+
+#endif	// INCLUDED_MessageQueueOpponentInfo_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePosture.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePosture.cpp
new file mode 100644
index 00000000..169f57a4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePosture.cpp
@@ -0,0 +1,51 @@
+//======================================================================
+//
+// MessageQueuePosture.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueuePosture.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueuePosture, CM_setPosture);
+
+//===================================================================
+
+
+MessageQueuePosture::~MessageQueuePosture ()
+{
+}
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueuePosture::unpack(Archive::ReadIterator & source)
+{
+	uint8 posture;
+	uint8 isClientImmediate;
+	
+	Archive::get(source, posture);
+	Archive::get(source, isClientImmediate);
+	
+	return new MessageQueuePosture(posture, isClientImmediate != 0);
+}
+
+//-----------------------------------------------------------------------
+void MessageQueuePosture::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueuePosture* const msg = safe_cast<const MessageQueuePosture*> (data);
+	if(msg)
+	{
+		uint8 const isClientImmediate = static_cast<uint8>(msg->isClientImmediate() ? 1 : 0);
+		
+		Archive::put(target, msg->getPosture());
+		Archive::put(target, isClientImmediate);
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePosture.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePosture.h
new file mode 100644
index 00000000..2c5b03ac
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePosture.h
@@ -0,0 +1,63 @@
+//======================================================================
+//
+// MessageQueuePosture.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueuePosture_H
+#define INCLUDED_MessageQueuePosture_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+class MessageQueuePosture : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueuePosture (uint8 posture, bool newIsClientImmediate);
+	virtual ~MessageQueuePosture ();
+
+	uint8             getPosture ()    const;
+	bool              isClientImmediate () const;
+
+private:
+	MessageQueuePosture (const MessageQueuePosture &);
+	MessageQueuePosture & operator= (const MessageQueuePosture &);
+
+	uint8       m_posture;
+	bool        m_isClientImmediate;
+};
+
+//----------------------------------------------------------------------
+
+inline MessageQueuePosture::MessageQueuePosture (uint8 posture, bool newIsClientImmediate):
+	m_posture (posture),
+	m_isClientImmediate (newIsClientImmediate)
+{
+}
+
+//----------------------------------------------------------------------
+
+inline uint8 MessageQueuePosture::getPosture ()    const
+{
+	return m_posture;
+}
+
+//----------------------------------------------------------------------
+
+inline bool MessageQueuePosture::isClientImmediate () const
+{
+	return m_isClientImmediate;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.cpp
new file mode 100644
index 00000000..e4db9b33
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.cpp
@@ -0,0 +1,84 @@
+//========================================================================
+//
+// MessageQueuePushCreature.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueuePushCreature.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueuePushCreature, CM_pushCreature);
+
+//===================================================================
+
+/**
+ * Class constructor.
+ */
+MessageQueuePushCreature::MessageQueuePushCreature(const NetworkId & attacker, const NetworkId & defender, const Vector & attackerPos, const Vector & defenderPos, float distance):
+	MessageQueue::Data(),
+	m_attacker(attacker),
+	m_defender(defender),
+	m_attackerPos(attackerPos),
+	m_defenderPos(defenderPos),
+	m_distance(distance)
+{
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Class destructor.
+ */
+MessageQueuePushCreature::~MessageQueuePushCreature()
+{
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueuePushCreature::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueuePushCreature* const msg = safe_cast<const MessageQueuePushCreature*> (data);
+	if (msg)
+	{
+		Archive::put (target, msg->getAttacker());
+		Archive::put (target, msg->getDefender());
+		Archive::put (target, msg->getAttackerPos());
+		Archive::put (target, msg->getDefenderPos());
+		Archive::put (target, msg->getDistance());
+	}
+}
+
+//----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueuePushCreature::unpack(Archive::ReadIterator & source)
+{
+	NetworkId attacker;
+	NetworkId defender;
+	Vector    attackerPos;
+	Vector    defenderPos;
+	float     distance;
+	
+	Archive::get(source, attacker);
+	Archive::get(source, defender);
+	Archive::get(source, attackerPos);
+	Archive::get(source, defenderPos);
+	Archive::get(source, distance);
+	
+	MessageQueuePushCreature * const msg = new MessageQueuePushCreature(attacker, defender, attackerPos, defenderPos, distance);
+	NOT_NULL(msg);
+
+	return msg;
+}
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.h
new file mode 100644
index 00000000..065038b0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueuePushCreature.h
@@ -0,0 +1,84 @@
+//========================================================================
+//
+// MessageQueuePushCreature.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueuePushCreature_H
+#define INCLUDED_MessageQueuePushCreature_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+//----------------------------------------------------------------------
+
+class MessageQueuePushCreature : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueuePushCreature(const NetworkId & attacker, const NetworkId & defender, const Vector & attackerPos, const Vector & defenderPos, float distance);
+	virtual ~MessageQueuePushCreature();
+
+	const NetworkId & getAttacker() const;
+	const NetworkId & getDefender() const;
+	const Vector & getAttackerPos() const;
+	const Vector & getDefenderPos() const;
+	float getDistance() const;
+
+private:
+	NetworkId m_attacker; 
+	NetworkId m_defender; 
+	Vector    m_attackerPos; 
+	Vector    m_defenderPos;
+	float     m_distance;
+};
+
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueuePushCreature::getAttacker() const
+{
+	return m_attacker;
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueuePushCreature::getDefender() const
+{
+	return m_defender;
+}
+
+//----------------------------------------------------------------------
+
+inline const Vector & MessageQueuePushCreature::getAttackerPos() const
+{
+	return m_attackerPos;
+}
+
+//----------------------------------------------------------------------
+
+inline const Vector & MessageQueuePushCreature::getDefenderPos() const
+{
+	return m_defenderPos;
+}
+
+//----------------------------------------------------------------------
+
+inline float MessageQueuePushCreature::getDistance() const
+{
+	return m_distance;
+}
+
+//----------------------------------------------------------------------
+
+#endif	// INCLUDED_MessageQueuePushCreature_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskCounterMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskCounterMessage.cpp
new file mode 100644
index 00000000..4349e9ad
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskCounterMessage.cpp
@@ -0,0 +1,81 @@
+//======================================================================
+//
+// MessageQueueQuestTaskCounterMessage.cpp
+// copyright (c) 2005 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueQuestTaskCounterMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueQuestTaskCounterMessage, CM_questTaskCounterData);
+
+//===================================================================
+
+
+//-----------------------------------------------------------------------
+
+MessageQueueQuestTaskCounterMessage::MessageQueueQuestTaskCounterMessage (std::string const & questName, int taskId, Unicode::String const & sourceName, int counter, int counterMax) :
+Data (),
+m_questName(questName),
+m_taskId(taskId),
+m_sourceName(sourceName),
+m_counterValue(counter),
+m_counterMax(counterMax)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueQuestTaskCounterMessage::~MessageQueueQuestTaskCounterMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueueQuestTaskCounterMessage::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueQuestTaskCounterMessage* const msg = safe_cast<const MessageQueueQuestTaskCounterMessage*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->getQuestName());
+		Archive::put(target, msg->getTaskId());
+		Archive::put(target, msg->getSourceName());
+		Archive::put(target, msg->getCounter());
+		Archive::put(target, msg->getCounterMax());
+	}
+}
+
+//----------------------------------------------------------------------
+
+
+MessageQueue::Data * MessageQueueQuestTaskCounterMessage::unpack(Archive::ReadIterator & source)
+{
+	std::string questName;
+	Archive::get(source, questName);
+
+	int taskId = 0;
+	Archive::get(source, taskId);
+
+	Unicode::String sourceName;
+	Archive::get(source, sourceName);
+
+	int counter = 0;
+	Archive::get(source, counter);
+
+	int counterMax = 0;
+	Archive::get(source, counterMax);
+
+	MessageQueue::Data * result = new MessageQueueQuestTaskCounterMessage (questName, taskId, sourceName, counter, counterMax);
+	return result;
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskCounterMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskCounterMessage.h
new file mode 100644
index 00000000..60fc624f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskCounterMessage.h
@@ -0,0 +1,88 @@
+//======================================================================
+//
+// MessageQueueQuestTaskCounterMessage.h
+// copyright (c) 2005 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueQuestTaskCounterMessage_H
+#define INCLUDED_MessageQueueQuestTaskCounterMessage_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+/**
+*
+*/
+
+class MessageQueueQuestTaskCounterMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	MessageQueueQuestTaskCounterMessage (std::string const & questName, int taskId, Unicode::String const & sourceName, int counter, int counterMax);
+	virtual                ~MessageQueueQuestTaskCounterMessage();
+
+	std::string const & getQuestName() const;
+	int getTaskId() const;
+	Unicode::String const & getSourceName() const;
+	int getCounter() const;
+	int getCounterMax() const;
+
+private:
+	//disabled
+	MessageQueueQuestTaskCounterMessage&  operator= (const MessageQueueQuestTaskCounterMessage & source);
+	MessageQueueQuestTaskCounterMessage(const MessageQueueQuestTaskCounterMessage & source);
+
+private:
+	std::string m_questName;
+	int m_taskId;
+	Unicode::String m_sourceName;
+	int m_counterValue;
+	int m_counterMax;
+};
+
+//-----------------------------------------------------------------------
+
+inline std::string const & MessageQueueQuestTaskCounterMessage::getQuestName() const
+{
+	return m_questName;
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageQueueQuestTaskCounterMessage::getTaskId() const
+{
+	return m_taskId;
+}
+
+//-----------------------------------------------------------------------
+
+inline Unicode::String const & MessageQueueQuestTaskCounterMessage::getSourceName() const
+{
+	return m_sourceName;
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageQueueQuestTaskCounterMessage::getCounter() const
+{
+	return m_counterValue;
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageQueueQuestTaskCounterMessage::getCounterMax() const
+{
+	return m_counterMax;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _MessageQueueQuestTaskCounterMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskLocationMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskLocationMessage.cpp
new file mode 100644
index 00000000..4dfeebd5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskLocationMessage.cpp
@@ -0,0 +1,70 @@
+//======================================================================
+//
+// MessageQueueQuestTaskLocationMessage.cpp
+// copyright (c) 2005 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueQuestTaskLocationMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueQuestTaskLocationMessage, CM_questTaskLocationData);
+
+//===================================================================
+
+
+//-----------------------------------------------------------------------
+
+MessageQueueQuestTaskLocationMessage::MessageQueueQuestTaskLocationMessage (std::string const & questName, int taskId, Location const & location)
+ : Data ()
+ , m_questName(questName)
+ , m_taskId(taskId)
+ , m_location(location)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueQuestTaskLocationMessage::~MessageQueueQuestTaskLocationMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueueQuestTaskLocationMessage::pack(MessageQueue::Data const * const data, Archive::ByteStream & target)
+{
+	const MessageQueueQuestTaskLocationMessage* const msg = safe_cast<const MessageQueueQuestTaskLocationMessage*>(data);
+	if (msg)
+	{
+		Archive::put(target, msg->getQuestName());
+		Archive::put(target, msg->getTaskId());
+		Archive::put(target, msg->getLocation());
+	}
+}
+
+//----------------------------------------------------------------------
+
+MessageQueue::Data * MessageQueueQuestTaskLocationMessage::unpack(Archive::ReadIterator & source)
+{
+	std::string questName;
+	Archive::get(source, questName);
+
+	int taskId = 0;
+	Archive::get(source, taskId);
+
+	Location location;
+	Archive::get(source, location);
+
+	MessageQueue::Data * result = new MessageQueueQuestTaskLocationMessage(questName, taskId, location);
+
+	return result;
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskLocationMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskLocationMessage.h
new file mode 100644
index 00000000..7e06e8d3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskLocationMessage.h
@@ -0,0 +1,70 @@
+//======================================================================
+//
+// MessageQueueQuestTaskLocationMessage.h
+// copyright (c) 2005 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueQuestTaskLocationMessage_H
+#define INCLUDED_MessageQueueQuestTaskLocationMessage_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+#include "sharedUtility/Location.h"
+
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+/**
+*
+*/
+
+class MessageQueueQuestTaskLocationMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	MessageQueueQuestTaskLocationMessage(std::string const & questName, int taskId, Location const & location);
+	virtual ~MessageQueueQuestTaskLocationMessage();
+
+	std::string const & getQuestName() const;
+	int getTaskId() const;
+	Location const & getLocation() const;
+
+private:
+	//disabled
+	MessageQueueQuestTaskLocationMessage&  operator= (const MessageQueueQuestTaskLocationMessage & source);
+	MessageQueueQuestTaskLocationMessage(const MessageQueueQuestTaskLocationMessage & source);
+
+private:
+	std::string m_questName;
+	int m_taskId;
+	Location m_location;
+};
+
+//-----------------------------------------------------------------------
+
+inline std::string const & MessageQueueQuestTaskLocationMessage::getQuestName() const
+{
+	return m_questName;
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageQueueQuestTaskLocationMessage::getTaskId() const
+{
+	return m_taskId;
+}
+
+//-----------------------------------------------------------------------
+
+inline Location const & MessageQueueQuestTaskLocationMessage::getLocation() const
+{
+	return m_location;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _MessageQueueQuestTaskLocationMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskTimerMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskTimerMessage.cpp
new file mode 100644
index 00000000..f233c3da
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskTimerMessage.cpp
@@ -0,0 +1,76 @@
+//======================================================================
+//
+// MessageQueueQuestTaskTimerMessage.cpp
+// copyright (c) 2005 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueQuestTaskTimerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/Crc.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueQuestTaskTimerMessage, CM_questTaskTimerData);
+
+//===================================================================
+
+
+//-----------------------------------------------------------------------
+
+MessageQueueQuestTaskTimerMessage::MessageQueueQuestTaskTimerMessage (std::string const & questName, int taskId, Unicode::String const & sourceName, int timerLength) :
+Data (),
+m_questName(questName),
+m_taskId(taskId),
+m_sourceName(sourceName),
+m_timerLength(timerLength)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueQuestTaskTimerMessage::~MessageQueueQuestTaskTimerMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueueQuestTaskTimerMessage::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueQuestTaskTimerMessage* const msg = safe_cast<const MessageQueueQuestTaskTimerMessage*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->getQuestName());
+		Archive::put(target, msg->getTaskId());
+		Archive::put(target, msg->getSourceName());
+		Archive::put(target, msg->getTimerLength());
+	}
+}
+
+//----------------------------------------------------------------------
+
+
+MessageQueue::Data * MessageQueueQuestTaskTimerMessage::unpack(Archive::ReadIterator & source)
+{
+	std::string questName;
+	Archive::get(source, questName);
+
+	int taskId = 0;
+	Archive::get(source, taskId);
+
+	Unicode::String sourceName;
+	Archive::get(source, sourceName);
+
+	int timerLength = 0;
+	Archive::get(source, timerLength);
+
+	MessageQueue::Data * result = new MessageQueueQuestTaskTimerMessage (questName, taskId, sourceName, timerLength);
+	return result;
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskTimerMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskTimerMessage.h
new file mode 100644
index 00000000..a3cc762a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueQuestTaskTimerMessage.h
@@ -0,0 +1,79 @@
+//======================================================================
+//
+// MessageQueueQuestTaskTimerMessage.h
+// copyright (c) 2005 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueQuestTaskTimerMessage_H
+#define INCLUDED_MessageQueueQuestTaskTimerMessage_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+/**
+*
+*/
+
+class MessageQueueQuestTaskTimerMessage : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	MessageQueueQuestTaskTimerMessage (std::string const & questName, int taskId, Unicode::String const & sourceName, int timerLength);
+	virtual                ~MessageQueueQuestTaskTimerMessage();
+
+	std::string const & getQuestName() const;
+	int getTaskId() const;
+	Unicode::String const & getSourceName() const;
+	int getTimerLength() const;
+
+private:
+	//disabled
+	MessageQueueQuestTaskTimerMessage&  operator= (const MessageQueueQuestTaskTimerMessage & source);
+	MessageQueueQuestTaskTimerMessage(const MessageQueueQuestTaskTimerMessage & source);
+
+private:
+	std::string m_questName;
+	int m_taskId;
+	Unicode::String m_sourceName;
+	int m_timerLength;
+};
+
+//-----------------------------------------------------------------------
+
+inline std::string const & MessageQueueQuestTaskTimerMessage::getQuestName() const
+{
+	return m_questName;
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageQueueQuestTaskTimerMessage::getTaskId() const
+{
+	return m_taskId;
+}
+
+//-----------------------------------------------------------------------
+
+inline Unicode::String const & MessageQueueQuestTaskTimerMessage::getSourceName() const
+{
+	return m_sourceName;
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageQueueQuestTaskTimerMessage::getTimerLength() const
+{
+	return m_timerLength;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _MessageQueueQuestTaskTimerMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopper.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopper.cpp
new file mode 100644
index 00000000..00575168
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopper.cpp
@@ -0,0 +1,57 @@
+//======================================================================
+//
+// MessageQueueResourceEmptyHopper.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueResourceEmptyHopper.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueResourceEmptyHopperArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION_WITH_ARCHIVE(MessageQueueResourceEmptyHopper, CM_clientResourceHarvesterEmptyHopper);
+
+//======================================================================
+
+MessageQueueResourceEmptyHopper::MessageQueueResourceEmptyHopper (const NetworkId & playerId, const NetworkId & harvesterId, const NetworkId & resourceId, int amount, bool discard, uint8 sequenceId) :
+MessageQueue::Data (),
+m_playerId (playerId),
+m_harvesterId (harvesterId),
+m_resourceId (resourceId),
+m_amount (amount),
+m_discard (discard),
+m_sequenceId (sequenceId)
+{
+	
+}
+
+//----------------------------------------------------------------------
+
+
+MessageQueueResourceEmptyHopper::MessageQueueResourceEmptyHopper () :
+MessageQueue::Data (),
+m_playerId     (),
+m_harvesterId  (),
+m_resourceId   (),
+m_amount       (0),
+m_discard      (false),
+m_sequenceId   (0)
+{
+	
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueResourceEmptyHopper::~MessageQueueResourceEmptyHopper ()
+{
+}
+
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopper.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopper.h
new file mode 100644
index 00000000..197fdb3d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopper.h
@@ -0,0 +1,106 @@
+//======================================================================
+//
+// MessageQueueResourceEmptyHopper.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueResourceEmptyHopper_H
+#define INCLUDED_MessageQueueResourceEmptyHopper_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//======================================================================
+
+/**
+* The proper response to a MessageQueueResourceEmptyHopper is a MessageQueueGenericResponse
+*/
+
+class MessageQueueResourceEmptyHopper : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	friend class MessageQueueResourceEmptyHopperArchive;
+
+	/**
+	*
+	* @param playerId
+	* @param harvesterId
+	* @param resourceId 
+	* @param amount a negative amount indicates that you are referring to _ALL_ of the specified resource in the hopper
+	* @param discard simply delete the resources, otherwise attempt to give it to player
+	*/
+
+	MessageQueueResourceEmptyHopper (const NetworkId & playerId, const NetworkId & harvesterId, const NetworkId & resourceId, int amount, bool discard, uint8 sequenceId);
+	~MessageQueueResourceEmptyHopper ();
+
+	uint8               getSequenceId  () const;
+	const NetworkId &   getPlayerId    () const;
+	const NetworkId &   getHarvesterId () const;
+	const NetworkId &   getResourceId  () const;
+	const int           getAmount      () const;
+	const bool          getDiscard     () const;
+
+private:
+	MessageQueueResourceEmptyHopper ();
+	MessageQueueResourceEmptyHopper (const MessageQueueResourceEmptyHopper &);
+	MessageQueueResourceEmptyHopper & operator= (const MessageQueueResourceEmptyHopper &);
+
+	NetworkId   m_playerId;
+	NetworkId   m_harvesterId;
+	NetworkId   m_resourceId;
+	int         m_amount;
+	bool        m_discard;
+
+	uint8       m_sequenceId;
+};
+
+//----------------------------------------------------------------------
+
+inline uint8               MessageQueueResourceEmptyHopper::getSequenceId  () const
+{
+	return m_sequenceId;
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId &   MessageQueueResourceEmptyHopper::getPlayerId    () const
+{
+	return m_playerId;
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId &   MessageQueueResourceEmptyHopper::getHarvesterId () const
+{
+	return m_harvesterId;
+}
+
+//----------------------------------------------------------------------
+
+inline const NetworkId &   MessageQueueResourceEmptyHopper::getResourceId  () const
+{
+	return m_resourceId;
+}
+
+//----------------------------------------------------------------------
+
+inline const int           MessageQueueResourceEmptyHopper::getAmount      () const
+{
+	return m_amount;
+}
+
+//----------------------------------------------------------------------
+
+inline const bool          MessageQueueResourceEmptyHopper::getDiscard     () const
+{
+	return m_discard;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.cpp
new file mode 100644
index 00000000..ecf00e74
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.cpp
@@ -0,0 +1,53 @@
+//======================================================================
+//
+// MessageQueueResourceEmptyHopperArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueResourceEmptyHopperArchive.h"
+
+#include "sharedNetworkMessages/MessageQueueResourceEmptyHopper.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+//======================================================================
+
+MessageQueue::Data * MessageQueueResourceEmptyHopperArchive::get (Archive::ReadIterator & source)
+{
+	NetworkId playerId;
+	NetworkId harvesterId;
+	NetworkId resourceId;
+	int       amount;
+	bool      discard;
+	uint8     sequenceId;
+
+	Archive::get (source, playerId);
+	Archive::get (source, harvesterId);
+	Archive::get (source, resourceId);
+	Archive::get (source, amount);
+	Archive::get (source, discard);
+	Archive::get (source, sequenceId);
+
+	return new MessageQueueResourceEmptyHopper (playerId, harvesterId, resourceId, amount, discard, sequenceId);
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueResourceEmptyHopperArchive::put (const MessageQueue::Data * source, Archive::ByteStream & target)
+{
+	const MessageQueueResourceEmptyHopper * msg = dynamic_cast<const MessageQueueResourceEmptyHopper *>(source);
+	NOT_NULL (msg);
+
+	if (msg)
+	{
+		Archive::put (target, msg->m_playerId);
+		Archive::put (target, msg->m_harvesterId);
+		Archive::put (target, msg->m_resourceId);
+		Archive::put (target, msg->m_amount);
+		Archive::put (target, msg->m_discard);
+		Archive::put (target, msg->m_sequenceId);
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.h
new file mode 100644
index 00000000..f4a866a7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceEmptyHopperArchive.h
@@ -0,0 +1,28 @@
+//======================================================================
+//
+// MessageQueueResourceEmptyHopperArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueResourceEmptyHopperArchive_H
+#define INCLUDED_MessageQueueResourceEmptyHopperArchive_H
+
+#include "Archive/ByteStream.h"
+#include "sharedFoundation/MessageQueue.h"
+
+class MessageQueueResourceEmptyHopper;
+
+//======================================================================
+
+class MessageQueueResourceEmptyHopperArchive
+{
+public:
+
+	static MessageQueue::Data *     get (Archive::ReadIterator & source);
+	static void                     put (const MessageQueue::Data * source, Archive::ByteStream & target);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceWeights.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceWeights.cpp
new file mode 100644
index 00000000..7ab63bac
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceWeights.cpp
@@ -0,0 +1,254 @@
+//========================================================================
+//
+// MessageQueueResourceWeights.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueResourceWeights.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueResourceWeights, CM_resourceWeights);
+
+//===================================================================
+
+//----------------------------------------------------------------------
+
+MessageQueueResourceWeights::MessageQueueResourceWeights(const std::pair<uint32, uint32> & combinedCrc) :
+MessageQueue::Data    (),
+m_assemblyWeights     (),
+m_resourceMaxWeights  (),
+m_crc                 (combinedCrc),
+m_attribs             ()
+{
+}
+
+/**
+ * Class destructor.
+ */
+MessageQueueResourceWeights::~MessageQueueResourceWeights()
+{
+}
+
+//----------------------------------------------------------------------
+
+/**
+ * Adds a resource weight to the assembly weights list.
+ *
+ * @param attrib		the attribute the weight belongs to
+ * @param slot          the slot associated with the attribute (-1 = all slots)
+ * @param resource		the resource attribute id
+ * @param weight		the resource weight
+ */
+void MessageQueueResourceWeights::addAssemblyWeight(int attrib, int slot, int resource,
+	int weight)
+{
+	if (static_cast<int>(m_assemblyWeights.size()) <= attrib)
+		m_assemblyWeights.resize(attrib + 1);
+
+	m_attribs.insert(attrib);
+	std::pair<int, WeightVector> & weights = m_assemblyWeights[attrib];
+	weights.first = slot;
+	weights.second.push_back(std::make_pair(resource, weight));
+}	// MessageQueueResourceWeights::addAssemblyWeight
+
+//----------------------------------------------------------------------
+
+/**
+ * Adds a resource weight to the resource max weights list.
+ *
+ * @param attrib		the attribute the weight belongs to
+ * @param slot          the slot associated with the attribute (-1 = all slots)
+ * @param resource		the resource attribute id
+ * @param weight		the resource weight
+ */
+void MessageQueueResourceWeights::addResourceMaxWeight(int attrib, int slot,
+	int resource, int weight)
+{
+	if (static_cast<int>(m_resourceMaxWeights.size()) <= attrib)
+		m_resourceMaxWeights.resize(attrib + 1);
+
+	std::pair<int, WeightVector> & weights = m_resourceMaxWeights[attrib];
+	weights.first = slot;
+	weights.second.push_back(std::make_pair(resource, weight));
+}	// MessageQueueResourceWeights::addResourceMaxWeight
+
+//----------------------------------------------------------------------
+
+void MessageQueueResourceWeights::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueResourceWeights* const msg = safe_cast<const MessageQueueResourceWeights*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->m_crc);
+
+		int8  idata = 0;
+		uint8 udata = 0;
+
+		size_t attribCount = msg->m_attribs.size();
+		if (attribCount > msg->m_assemblyWeights.size() || msg->m_assemblyWeights.size() != msg->m_resourceMaxWeights.size())
+		{
+			WARNING(true, ("MessageQueueResourceWeights::pack has mismatching "
+				"weight arrays! Attrib count = %u, assembly weights = %u, "
+				"resource weights = %u", attribCount, msg->m_assemblyWeights.size(),
+				msg->m_resourceMaxWeights.size()));
+			udata = 0;
+			Archive::put(target, udata);	
+			return;
+		}
+
+		udata = static_cast<uint8>(attribCount);
+		Archive::put(target, udata);
+
+		// write m_assemblyWeights info
+		int assemblyCount = 0;
+		int resourceCount = 0;
+		{
+			int count = msg->m_assemblyWeights.size();
+			for (int i = 0; i < count; ++i)
+			{
+				const std::pair<int, WeightVector> & weights = msg->m_assemblyWeights[i];
+				const int weightCount = weights.second.size();
+				if (weightCount == 0)
+					continue;
+				++assemblyCount;
+				// write attribute index
+				udata = static_cast<uint8>(i);
+				Archive::put (target, udata);
+				// write the attribute slot
+				idata = static_cast<int8>(weights.first);
+				Archive::put (target, idata);
+				// write the assembly weights
+				udata = static_cast<uint8>(weightCount);
+				Archive::put (target, udata);
+				for (int j = 0; j < weightCount; ++j)
+				{
+					const std::pair<int, int> & weight = weights.second[j];
+					udata = static_cast<uint8>(((weight.first << 4) & 0x00f0) | 
+						(weight.second & 0x000f));
+					Archive::put (target, udata);
+				}
+			}
+		}
+
+		// write m_resourceMaxWeights info
+		{
+			int count = msg->m_resourceMaxWeights.size();
+			for (int i = 0; i < count; ++i)
+			{
+				const std::pair<int, WeightVector> & weights = msg->m_resourceMaxWeights[i];
+				const int weightCount = weights.second.size();
+				if (weightCount == 0)
+					continue;
+				++resourceCount;
+				// write attribute index
+				udata = static_cast<uint8>(i);
+				Archive::put (target, udata);
+				// write the attribute slot
+				idata = static_cast<int8>(weights.first);
+				Archive::put (target, idata);
+				// write the assembly weights
+				udata = static_cast<uint8>(weightCount);
+				Archive::put (target, udata);
+				for (int j = 0; j < weightCount; ++j)
+				{
+					const std::pair<int, int> & weight = weights.second[j];
+					udata = static_cast<uint8>(((weight.first << 4) & 0x00f0) | 
+						(weight.second & 0x000f));
+					Archive::put (target, udata);
+				}
+			}
+		}
+
+		int missingCount = attribCount * 2 - assemblyCount - resourceCount;
+		if (missingCount > 0)
+		{
+			WARNING(true, ("MessageQueueResourceWeights::pack for schematic "
+				"template crc %u has mismatching weight counts! Attrib count = %d, "
+				"assembly count = %d, resource count = %d", msg->m_crc.first,
+				attribCount, assemblyCount, resourceCount));
+			// fill in the byte stream with some dummy data
+			for (int i = 0; i < missingCount; ++i)
+			{
+				udata = static_cast<uint8>(-1);
+				Archive::put (target, udata);
+				idata = static_cast<int8>(-1);
+				Archive::put (target, idata);
+				udata = static_cast<uint8>(0);
+				Archive::put (target, udata);
+			}
+		}
+	}
+}
+
+//----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueResourceWeights::unpack(Archive::ReadIterator & source)
+{
+	UNREF(source);
+
+	std::pair<uint32, uint32> crc;
+	Archive::get(source, crc);
+
+	MessageQueueResourceWeights * const msg = new MessageQueueResourceWeights(crc);
+
+	int8  idata = 0;
+	uint8 udata = 0;
+
+	Archive::get(source, udata);
+	int attribCount = udata;
+
+	// read m_assemblyWeights info
+	{
+		for (int i = 0; i < attribCount; ++i)
+		{
+			Archive::get(source, udata);
+			const int attribute = udata;
+			Archive::get(source, idata);
+			const int slot = idata;
+			Archive::get(source, udata);
+			const int weightCount = udata;
+			for (int j = 0; j < weightCount; ++j)
+			{
+				Archive::get(source, udata);
+				int resource = ((udata & 0xf0) >> 4);
+				int weight = (udata & 0x0f);
+				msg->addAssemblyWeight(attribute, slot, resource, weight);
+			}
+		}
+	}
+
+	// read m_resourceMaxWeights info
+	{
+		for (int i = 0; i < attribCount; ++i)
+		{
+			Archive::get(source, udata);
+			const int attribute = udata;
+			Archive::get(source, idata);
+			const int slot = idata;
+			Archive::get(source, udata);
+			const int weightCount = udata;
+			for (int j = 0; j < weightCount; ++j)
+			{
+				Archive::get(source, udata);
+				int resource = ((udata & 0xf0) >> 4);
+				int weight = (udata & 0x0f);
+				msg->addResourceMaxWeight(attribute, slot, resource, weight);
+			}
+		}
+	}
+
+	return msg;
+}
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceWeights.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceWeights.h
new file mode 100644
index 00000000..b0960ad2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceWeights.h
@@ -0,0 +1,112 @@
+//========================================================================
+//
+// MessageQueueResourceWeights.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueResourceWeights_H
+#define INCLUDED_MessageQueueResourceWeights_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+#include <vector>
+
+class MemoryBlockManager;
+
+//----------------------------------------------------------------------
+
+class MessageQueueResourceWeights : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	explicit MessageQueueResourceWeights (const std::pair<uint32, uint32> & combinedCrc);
+	virtual ~MessageQueueResourceWeights ();
+
+	typedef stdvector<std::pair<int, int> >::fwd WeightVector;
+	typedef stdvector<std::pair<int, WeightVector> >::fwd AttribWeightVector;
+
+	void                          addAssemblyWeight     (int attrib, int slot, int resource, int weight);
+	void                          addResourceMaxWeight  (int attrib, int slot, int resource, int weight);
+
+	const AttribWeightVector &    getAllAssemblyWeights    () const;
+	const AttribWeightVector &    getAllResourceMaxWeights () const;
+
+	const int                     getAssemblyWeightSlot    (int attrib) const;
+	const int                     getResourceMaxWeightSlot (int attrib) const;
+	const WeightVector &          getAssemblyWeights       (int attrib) const;
+	const WeightVector &          getResourceMaxWeights    (int attrib) const;
+	
+	const std::pair<uint32, uint32> & getDraftSchematicCrc() const;
+
+private:
+	AttribWeightVector            m_assemblyWeights;
+	AttribWeightVector            m_resourceMaxWeights;
+	std::pair<uint32, uint32>     m_crc;
+	stdset<int>::fwd              m_attribs;
+};
+
+//----------------------------------------------------------------------
+
+inline const int MessageQueueResourceWeights::getAssemblyWeightSlot(int attrib) const
+{
+	DEBUG_FATAL (attrib < 0 || attrib >= static_cast<int>(m_assemblyWeights.size ()), ("bad index"));
+	return m_assemblyWeights[attrib].first;
+}
+
+//----------------------------------------------------------------------
+
+inline const int MessageQueueResourceWeights::getResourceMaxWeightSlot(int attrib) const
+{
+	DEBUG_FATAL (attrib < 0 || attrib >= static_cast<int>(m_assemblyWeights.size ()), ("bad index"));
+	return m_resourceMaxWeights[attrib].first;
+}
+
+//----------------------------------------------------------------------
+
+inline const MessageQueueResourceWeights::WeightVector & MessageQueueResourceWeights::getAssemblyWeights(int attrib) const
+{
+	DEBUG_FATAL (attrib < 0 || attrib >= static_cast<int>(m_assemblyWeights.size ()), ("bad index"));
+	return m_assemblyWeights[attrib].second;
+}
+
+//----------------------------------------------------------------------
+
+inline const MessageQueueResourceWeights::WeightVector & MessageQueueResourceWeights::getResourceMaxWeights(int attrib) const
+{
+	DEBUG_FATAL (attrib < 0 || attrib >= static_cast<int>(m_assemblyWeights.size ()), ("bad index"));
+	return m_resourceMaxWeights[attrib].second;
+}
+
+//----------------------------------------------------------------------
+
+inline const MessageQueueResourceWeights::AttribWeightVector & MessageQueueResourceWeights::getAllAssemblyWeights    () const
+{
+	return m_assemblyWeights;
+}
+
+//----------------------------------------------------------------------
+
+inline const MessageQueueResourceWeights::AttribWeightVector & MessageQueueResourceWeights::getAllResourceMaxWeights () const
+{
+	return m_resourceMaxWeights;
+}
+
+//----------------------------------------------------------------------
+
+inline const std::pair<uint32, uint32> & MessageQueueResourceWeights::getDraftSchematicCrc() const
+{
+	return m_crc;
+}
+
+//----------------------------------------------------------------------
+
+
+#endif	// INCLUDED_MessageQueueResourceWeights_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSecureTrade.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSecureTrade.cpp
new file mode 100644
index 00000000..3b2f7ad0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSecureTrade.cpp
@@ -0,0 +1,108 @@
+// ======================================================================
+//
+// MessageQueueSecureTrade.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueSecureTrade.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueSecureTrade, CM_secureTrade);
+
+//===================================================================
+
+
+
+
+MessageQueueSecureTrade::MessageQueueSecureTrade(TradeMessageId messageType, const NetworkId & initiator, const NetworkId & recipient) :
+MessageQueue::Data(),
+	m_id(messageType),
+	m_initiator(initiator),
+	m_recipient(recipient)
+{
+}	
+
+MessageQueueSecureTrade::MessageQueueSecureTrade(const MessageQueueSecureTrade & source) :
+	MessageQueue::Data(),
+	m_id(source.m_id),
+	m_initiator(source.m_initiator),
+	m_recipient(source.m_recipient)
+{
+}	
+
+MessageQueueSecureTrade & MessageQueueSecureTrade::operator= (const MessageQueueSecureTrade & source)
+{
+	if (this == &source)
+		return *this;
+	m_id = source.m_id;
+	m_initiator = source.m_initiator;
+	m_recipient = source.m_recipient;
+	return *this;
+}	
+
+MessageQueueSecureTrade::~MessageQueueSecureTrade()
+{
+};
+
+// -----------------------------------------------------------
+
+MessageQueueSecureTrade::TradeMessageId MessageQueueSecureTrade::getTradeMessageId() const
+{
+	return m_id;
+}
+
+// -----------------------------------------------------------
+
+const NetworkId & MessageQueueSecureTrade::getInitiator() const
+{
+	return m_initiator;
+}
+
+// -----------------------------------------------------------
+
+const NetworkId & MessageQueueSecureTrade::getRecipient() const
+{
+	return m_recipient;
+}
+
+// -----------------------------------------------------------
+
+
+void MessageQueueSecureTrade::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueSecureTrade* const msg = safe_cast<const MessageQueueSecureTrade*> (data);
+	
+	if (msg)
+	{
+		Archive::put(target, static_cast<int>(msg->getTradeMessageId()));
+		Archive::put(target, msg->getInitiator());
+		Archive::put(target, msg->getRecipient());
+	}
+}
+
+
+//-----------------------------------------------------------------------
+MessageQueue::Data* MessageQueueSecureTrade::unpack(Archive::ReadIterator & source)
+{
+	int id;
+	NetworkId initiator;
+	NetworkId recipient;
+	
+	Archive::get(source, id);
+	Archive::get(source, initiator);
+	Archive::get(source, recipient);
+	
+	WARNING_STRICT_FATAL(id < 0 || id >= MessageQueueSecureTrade::TMI_LastTradeMessageId, ("Invalid trade message type in control message %d", id));
+	
+	return new MessageQueueSecureTrade(static_cast<MessageQueueSecureTrade::TradeMessageId>(id), initiator, recipient);
+}
+
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSecureTrade.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSecureTrade.h
new file mode 100644
index 00000000..2b12c283
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSecureTrade.h
@@ -0,0 +1,57 @@
+//========================================================================
+//
+// MessageQueueSecureTrade.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueSecureTrade_H
+#define INCLUDED_MessageQueueSecureTrade_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+class MessageQueueSecureTrade : public MessageQueue::Data
+{
+
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	enum TradeMessageId
+	{
+		TMI_RequestTrade,
+		TMI_TradeRequested,
+		TMI_AcceptTrade,
+		TMI_DeniedTrade,
+		TMI_DeniedPlayerBusy,
+		TMI_DeniedPlayerUnreachable,
+		TMI_RequestTradeReversed,
+		TMI_LastTradeMessageId
+	};
+
+
+	MessageQueueSecureTrade(TradeMessageId messageType, const NetworkId & initiator, const NetworkId & recipient);
+	virtual ~MessageQueueSecureTrade();
+
+	MessageQueueSecureTrade&operator=(const MessageQueueSecureTrade & source);
+	MessageQueueSecureTrade(const MessageQueueSecureTrade & source);
+
+	TradeMessageId    getTradeMessageId() const;
+	const NetworkId & getInitiator() const;
+	const NetworkId & getRecipient() const;
+
+
+private:
+	MessageQueueSecureTrade();
+	
+	TradeMessageId    m_id;
+	NetworkId         m_initiator; 
+	NetworkId         m_recipient;
+
+};
+
+#endif	
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.cpp
new file mode 100644
index 00000000..f1743e23
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.cpp
@@ -0,0 +1,58 @@
+//========================================================================
+//
+// MessageQueueSelectCurrentWorkingSkill.cpp
+//
+// copyright 2005 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueSelectCurrentWorkingSkill.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueSelectCurrentWorkingSkill, CM_setCurrentWorkingSkill);
+
+//----------------------------------------------------------------------
+
+MessageQueueSelectCurrentWorkingSkill::MessageQueueSelectCurrentWorkingSkill(std::string const & currentWorkingSkill) :
+m_currentWorkingSkill(currentWorkingSkill)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueSelectCurrentWorkingSkill::~MessageQueueSelectCurrentWorkingSkill()
+{
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueSelectCurrentWorkingSkill::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	MessageQueueSelectCurrentWorkingSkill const * const msg = safe_cast<const MessageQueueSelectCurrentWorkingSkill*>(data);
+	if (msg)
+	{
+		Archive::put(target, msg->getCurrentWorkingSkill());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data * MessageQueueSelectCurrentWorkingSkill::unpack(Archive::ReadIterator & source)
+{
+	std::string currentWorkingSkill;
+
+	Archive::get(source, currentWorkingSkill);
+	
+	return new MessageQueueSelectCurrentWorkingSkill(currentWorkingSkill);
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.h
new file mode 100644
index 00000000..0df635df
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectCurrentWorkingSkill.h
@@ -0,0 +1,49 @@
+//========================================================================
+//
+// MessageQueueSelectCurrentWorkingSkill.h
+//
+// copyright 2005 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueSelectCurrentWorkingSkill_H
+#define INCLUDED_MessageQueueSelectCurrentWorkingSkill_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+class MessageQueueSelectCurrentWorkingSkill : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueSelectCurrentWorkingSkill(std::string const & currentWorkingSkill);
+	virtual ~MessageQueueSelectCurrentWorkingSkill();
+
+	std::string const & getCurrentWorkingSkill() const;
+
+private:
+
+	std::string m_currentWorkingSkill;
+
+private:
+	MessageQueueSelectCurrentWorkingSkill();
+	MessageQueueSelectCurrentWorkingSkill(const MessageQueueSelectCurrentWorkingSkill &);
+	MessageQueueSelectCurrentWorkingSkill & operator=(const MessageQueueSelectCurrentWorkingSkill &);
+};
+
+//----------------------------------------------------------------------
+
+inline std::string const & MessageQueueSelectCurrentWorkingSkill::getCurrentWorkingSkill() const
+{
+	return m_currentWorkingSkill;
+}
+
+//----------------------------------------------------------------------
+
+#endif	// INCLUDED_MessageQueueSelectCurrentWorkingSkill_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectProfessionTemplate.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectProfessionTemplate.cpp
new file mode 100644
index 00000000..ad3ef349
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectProfessionTemplate.cpp
@@ -0,0 +1,58 @@
+//========================================================================
+//
+// MessageQueueSelectProfessionTemplate.cpp
+//
+// copyright 2005 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueSelectProfessionTemplate.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueSelectProfessionTemplate, CM_setProfessionTemplate);
+
+//----------------------------------------------------------------------
+
+MessageQueueSelectProfessionTemplate::MessageQueueSelectProfessionTemplate(std::string const & professionTemplate) :
+m_professionTemplate(professionTemplate)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueSelectProfessionTemplate::~MessageQueueSelectProfessionTemplate()
+{
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueSelectProfessionTemplate::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	MessageQueueSelectProfessionTemplate const * const msg = safe_cast<const MessageQueueSelectProfessionTemplate*>(data);
+	if (msg)
+	{
+		Archive::put(target, msg->getProfessionTemplate());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data * MessageQueueSelectProfessionTemplate::unpack(Archive::ReadIterator & source)
+{
+	std::string professionTemplate;
+
+	Archive::get(source, professionTemplate);
+	
+	return new MessageQueueSelectProfessionTemplate(professionTemplate);
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectProfessionTemplate.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectProfessionTemplate.h
new file mode 100644
index 00000000..2f6d8639
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSelectProfessionTemplate.h
@@ -0,0 +1,49 @@
+//========================================================================
+//
+// MessageQueueSelectProfessionTemplate.h
+//
+// copyright 2005 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueSelectProfessionTemplate_H
+#define INCLUDED_MessageQueueSelectProfessionTemplate_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+class MessageQueueSelectProfessionTemplate : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueSelectProfessionTemplate(std::string const & professionTemplate);
+	virtual ~MessageQueueSelectProfessionTemplate();
+
+	std::string const & getProfessionTemplate() const;
+
+private:
+
+	std::string m_professionTemplate;
+
+private:
+	MessageQueueSelectProfessionTemplate();
+	MessageQueueSelectProfessionTemplate(const MessageQueueSelectProfessionTemplate &);
+	MessageQueueSelectProfessionTemplate & operator=(const MessageQueueSelectProfessionTemplate &);
+};
+
+//----------------------------------------------------------------------
+
+inline std::string const & MessageQueueSelectProfessionTemplate::getProfessionTemplate() const
+{
+	return m_professionTemplate;
+}
+
+//----------------------------------------------------------------------
+
+#endif	// INCLUDED_MessageQueueSelectProfessionTemplate_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShipHit.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShipHit.cpp
new file mode 100644
index 00000000..45365f93
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShipHit.cpp
@@ -0,0 +1,86 @@
+//======================================================================
+//
+// MessageQueueShipHit.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueShipHit.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//======================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_NO_INSTALL(MessageQueueShipHit);
+
+//===================================================================
+
+void MessageQueueShipHit::install() 
+{ 
+	installMemoryBlockManager();
+	ControllerMessageFactory::registerControllerMessageHandler(CM_spaceShipHit, pack, unpack); 	
+	ExitChain::add(&remove, "MessageQueueShipHit::remove"); 
+}
+
+//----------------------------------------------------------------------
+
+/**
+* @_type _must_ be one of ShipHitEffectsManager::HitType
+*/ 
+
+MessageQueueShipHit::MessageQueueShipHit(Vector const & _up_w, Vector const & _hitLocation_o, int _type, float _integrity, float _previousIntegrity) :
+up_w(_up_w),
+hitLocation_o(_hitLocation_o),
+type(_type),
+integrity(_integrity),
+previousIntegrity(_previousIntegrity)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueShipHit::MessageQueueShipHit() :
+up_w(),
+hitLocation_o(),
+type(0),
+integrity(1.0f),
+previousIntegrity(1.0f)
+{
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueShipHit::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueShipHit* const msg = safe_cast<const MessageQueueShipHit*> (data);
+	if (msg)
+	{
+		Archive::put(target, msg->up_w);
+		Archive::put(target, msg->hitLocation_o);
+		Archive::put(target, msg->type);
+		Archive::put(target, msg->integrity);
+		Archive::put(target, msg->previousIntegrity);
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data * MessageQueueShipHit::unpack(Archive::ReadIterator & source)
+{
+	MessageQueueShipHit * const msg = new MessageQueueShipHit;
+
+	Archive::get(source, msg->up_w);
+	Archive::get(source, msg->hitLocation_o);
+	Archive::get(source, msg->type);
+	Archive::get(source, msg->integrity);
+	Archive::get(source, msg->previousIntegrity);
+
+	return msg;
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShipHit.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShipHit.h
new file mode 100644
index 00000000..573d10c2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShipHit.h
@@ -0,0 +1,50 @@
+//======================================================================
+//
+// MessageQueueShipHit.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueShipHit_H
+#define INCLUDED_MessageQueueShipHit_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+#include "sharedMath/Vector.h"
+
+class MemoryBlockManager;
+
+//----------------------------------------------------------------------
+
+/**
+* the 'type' field _must_ be one of ShipHitEffectsManager::HitType
+*/ 
+
+class MessageQueueShipHit: public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	MessageQueueShipHit(Vector const & _up_w, Vector const & _hitLocation_o, int _type, float _integrity, float _previousIntegrity);
+	MessageQueueShipHit();
+
+private:
+	MessageQueueShipHit (const MessageQueueShipHit & rhs);
+	MessageQueueShipHit & operator= (const MessageQueueShipHit & rhs);
+
+public:
+
+	Vector up_w;
+	Vector hitLocation_o;
+	int type;
+	float integrity;
+	float previousIntegrity;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatText.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatText.cpp
new file mode 100644
index 00000000..c151a3e1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatText.cpp
@@ -0,0 +1,52 @@
+//======================================================================
+//
+// MessageQueueShowCombatText.cpp
+// Copyright (c) 2005 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueShowCombatText.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueShowCombatTextArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_WITH_ARCHIVE(MessageQueueShowCombatText, CM_showCombatText);
+
+//===================================================================
+
+MessageQueueShowCombatText::MessageQueueShowCombatText (const NetworkId &defenderId, const NetworkId &attackerId, const StringId &outputTextId, float scale, int r, int g, int b, int flags) :
+	m_defenderId   (defenderId),
+	m_attackerId   (attackerId),
+	m_outputTextId (outputTextId),
+	m_outputTextOOB (),
+	m_scale        (scale),
+	m_r            (r),
+	m_g            (g),
+	m_b            (b),
+	m_flags        (flags)
+{
+}
+
+//======================================================================
+
+	MessageQueueShowCombatText::MessageQueueShowCombatText (const NetworkId &defenderId, const NetworkId &attackerId, const Unicode::String &outputTextOOB, float scale, int r, int g, int b, int flags) :
+	m_defenderId   (defenderId),
+	m_attackerId   (attackerId),
+	m_outputTextId (),
+	m_outputTextOOB (outputTextOOB),
+	m_scale        (scale),
+	m_r            (r),
+	m_g            (g),
+	m_b            (b),
+	m_flags        (flags)
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatText.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatText.h
new file mode 100644
index 00000000..151399e2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatText.h
@@ -0,0 +1,136 @@
+//======================================================================
+//
+// MessageQueueShowCombatText.h
+// copyright (c) 2005 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueShowCombatText_H
+#define INCLUDED_MessageQueueShowCombatText_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "StringId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+/**
+ * A message to instruct a client object to place fly text over it.
+ *
+ * Fly text is the text that shows up over an object, like the damage
+ * numbers over combatants, that moves upward and fades out over time.
+ **/
+
+class MessageQueueShowCombatText : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	
+	enum Flags
+	{
+		F_private        = 0x0001,
+	};
+
+	MessageQueueShowCombatText (const NetworkId &defenderId, const NetworkId &attackerId, const StringId &outputTextId, float scale, int r, int g, int b, int flags);
+	MessageQueueShowCombatText (const NetworkId &defenderId, const NetworkId &attackerId, const Unicode::String &outputTextOOB, float scale, int r, int g, int b, int flags);
+
+	const NetworkId & getDefenderId   () const;
+	const NetworkId & getAttackerId   () const;
+	const StringId &  getOutputTextId () const;
+	const Unicode::String & getOutputTextOOB() const;
+	float             getScale        () const;
+	int               getRed          () const;
+	int               getGreen        () const;
+	int               getBlue         () const;
+	int               getFlags        () const;
+
+private:
+
+	// Disabled.
+	MessageQueueShowCombatText ();
+	MessageQueueShowCombatText (const MessageQueueShowCombatText &);
+	MessageQueueShowCombatText& operator=(const MessageQueueShowCombatText&);
+
+private:
+
+	NetworkId m_defenderId;
+	NetworkId m_attackerId;
+	StringId  m_outputTextId;
+	Unicode::String m_outputTextOOB;
+	float     m_scale;
+	int       m_r;
+	int       m_g;
+	int       m_b;
+	int       m_flags;
+};
+
+//======================================================================
+
+inline const NetworkId &MessageQueueShowCombatText::getDefenderId() const
+{
+	return m_defenderId;
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId &MessageQueueShowCombatText::getAttackerId() const
+{
+	return m_attackerId;
+}
+
+// ----------------------------------------------------------------------
+
+inline const StringId &MessageQueueShowCombatText::getOutputTextId() const 
+{ 
+	return m_outputTextId;
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String &MessageQueueShowCombatText::getOutputTextOOB() const 
+{ 
+	return m_outputTextOOB;
+}
+
+//----------------------------------------------------------------------
+
+inline float MessageQueueShowCombatText::getScale() const
+{
+	return m_scale;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueShowCombatText::getRed() const
+{
+	return m_r;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueShowCombatText::getGreen() const
+{
+	return m_g;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueShowCombatText::getBlue() const
+{
+	return m_b;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueShowCombatText::getFlags        () const
+{
+	return m_flags;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatTextArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatTextArchive.cpp
new file mode 100644
index 00000000..a3ea9d8e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatTextArchive.cpp
@@ -0,0 +1,67 @@
+//======================================================================
+//
+// MessageQueueShowCombatTextArchive.cpp
+// Copyright (c) 2005 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueShowCombatTextArchive.h"
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/MessageQueueShowCombatText.h"
+
+//======================================================================
+
+MessageQueue::Data *MessageQueueShowCombatTextArchive::get(Archive::ReadIterator & source)
+{
+	NetworkId defenderId;
+	NetworkId attackerId;
+	StringId  outputTextId;
+	Unicode::String outputTextOOB;
+	float     scale;
+	uint8     red;
+	uint8     green;
+	uint8     blue;
+	uint8     flags;
+
+	Archive::get(source, defenderId);
+	Archive::get(source, attackerId);
+	Archive::get(source, outputTextId);
+	Archive::get(source, outputTextOOB);
+	Archive::get(source, scale);
+	Archive::get(source, red);
+	Archive::get(source, green);
+	Archive::get(source, blue);
+	Archive::get(source, flags);
+
+	if(outputTextId.isValid())
+		return new MessageQueueShowCombatText(defenderId, attackerId, outputTextId, scale, static_cast<int>(red), static_cast<int>(green), static_cast<int>(blue), static_cast<int>(flags));
+	else
+		return new MessageQueueShowCombatText(defenderId, attackerId, outputTextOOB, scale, static_cast<int>(red), static_cast<int>(green), static_cast<int>(blue), static_cast<int>(flags));
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueShowCombatTextArchive::put(const MessageQueue::Data *source, Archive::ByteStream &target)
+{
+	const MessageQueueShowCombatText * const message = dynamic_cast<const MessageQueueShowCombatText*>(source);
+	if (!message)
+	{
+		WARNING_STRICT_FATAL(true, ("attempted to pack ShowCombatText message queue message with wrong data type."));
+		return;
+	}
+
+	Archive::put(target, message->getDefenderId());
+	Archive::put(target, message->getAttackerId());
+	Archive::put(target, message->getOutputTextId());
+	Archive::put(target, message->getOutputTextOOB());
+	Archive::put(target, message->getScale());
+	Archive::put(target, static_cast<uint8>(message->getRed   ()));
+	Archive::put(target, static_cast<uint8>(message->getGreen ()));
+	Archive::put(target, static_cast<uint8>(message->getBlue  ()));
+	Archive::put(target, static_cast<uint8>(message->getFlags ()));
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatTextArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatTextArchive.h
new file mode 100644
index 00000000..8d3a1cc6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowCombatTextArchive.h
@@ -0,0 +1,34 @@
+//======================================================================
+//
+// MessageQueueShowCombatTextArchive.h
+// Copyright (c) 2005 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueShowCombatTextArchive_H
+#define INCLUDED_MessageQueueShowCombatTextArchive_H
+
+#include "sharedFoundation/MessageQueue.h"
+
+//======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+}
+
+//----------------------------------------------------------------------
+
+class MessageQueueShowCombatTextArchive
+{
+public:
+
+	static MessageQueue::Data *get(Archive::ReadIterator &source);
+	static void                put(const MessageQueue::Data *source, Archive::ByteStream &target);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyText.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyText.cpp
new file mode 100644
index 00000000..acdd041b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyText.cpp
@@ -0,0 +1,50 @@
+//======================================================================
+//
+// MessageQueueShowFlyText.cpp
+// Copyright (c) 2002 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueShowFlyText.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueShowFlyTextArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_WITH_ARCHIVE(MessageQueueShowFlyText, CM_showFlyText);
+
+//===================================================================
+
+MessageQueueShowFlyText::MessageQueueShowFlyText (const NetworkId &emitterId, const StringId &outputTextId, float scale, int r, int g, int b, int flags) :
+	m_emitterId    (emitterId),
+	m_outputTextId (outputTextId),
+	m_outputTextOOB (),
+	m_scale        (scale),
+	m_r            (r),
+	m_g            (g),
+	m_b            (b),
+	m_flags        (flags)
+{
+}
+
+//======================================================================
+
+MessageQueueShowFlyText::MessageQueueShowFlyText (const NetworkId &emitterId, const Unicode::String &outputTextOOB, float scale, int r, int g, int b, int flags) :
+	m_emitterId    (emitterId),
+	m_outputTextId (),
+	m_outputTextOOB (outputTextOOB),
+	m_scale        (scale),
+	m_r            (r),
+	m_g            (g),
+	m_b            (b),
+	m_flags        (flags)
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyText.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyText.h
new file mode 100644
index 00000000..66826515
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyText.h
@@ -0,0 +1,137 @@
+//======================================================================
+//
+// MessageQueueShowFlyText.h
+// copyright (c) 2002 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueShowFlyText_H
+#define INCLUDED_MessageQueueShowFlyText_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "StringId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+/**
+ * A message to instruct a client object to place fly text over it.
+ *
+ * Fly text is the text that shows up over an object, like the damage
+ * numbers over combatants, that moves upward and fades out over time.
+ **/
+
+class MessageQueueShowFlyText : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	
+	enum Flags
+	{
+		F_private            = 0x0001,
+		F_showInChatBox      = 0x0002,
+		F_isDamageFromPlayer = 0x0004,
+		F_isSnare            = 0x0008,
+		F_isGlancingBlow     = 0x0010,
+		F_isCriticalHit      = 0x0020,
+		F_isLucky            = 0x0040,
+		F_isDot              = 0x0080,
+		F_isBleed            = 0x0100,
+		F_isHeal             = 0x0200,
+		F_isFreeshot         = 0x0400
+	};
+
+	MessageQueueShowFlyText (const NetworkId &emitterId, const StringId &outputTextId, float scale, int r, int g, int b, int flags);
+	MessageQueueShowFlyText (const NetworkId &emitterId, const Unicode::String &outputTextOOB, float scale, int r, int g, int b, int flags);
+
+	const NetworkId & getEmitterId    () const;
+	const StringId &  getOutputTextId () const;
+	const Unicode::String & getOutputTextOOB () const;
+	float             getScale        () const;
+	int               getRed          () const;
+	int               getGreen        () const;
+	int               getBlue         () const;
+	int               getFlags        () const;
+
+private:
+
+	// Disabled.
+	MessageQueueShowFlyText ();
+	MessageQueueShowFlyText (const MessageQueueShowFlyText &);
+	MessageQueueShowFlyText& operator=(const MessageQueueShowFlyText&);
+
+private:
+
+	NetworkId m_emitterId;
+	StringId  m_outputTextId;
+	Unicode::String m_outputTextOOB;
+	float     m_scale;
+	int       m_r;
+	int       m_g;
+	int       m_b;
+	int       m_flags;
+};
+
+//======================================================================
+
+inline const NetworkId &MessageQueueShowFlyText::getEmitterId() const
+{
+	return m_emitterId;
+}
+
+// ----------------------------------------------------------------------
+
+inline const StringId &MessageQueueShowFlyText::getOutputTextId() const 
+{ 
+	return m_outputTextId;
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String &MessageQueueShowFlyText::getOutputTextOOB() const 
+{ 
+	return m_outputTextOOB;
+}
+
+//----------------------------------------------------------------------
+
+inline float MessageQueueShowFlyText::getScale() const
+{
+	return m_scale;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueShowFlyText::getRed() const
+{
+	return m_r;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueShowFlyText::getGreen() const
+{
+	return m_g;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueShowFlyText::getBlue() const
+{
+	return m_b;
+}
+
+//----------------------------------------------------------------------
+
+inline int MessageQueueShowFlyText::getFlags        () const
+{
+	return m_flags;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyTextArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyTextArchive.cpp
new file mode 100644
index 00000000..c809abaa
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyTextArchive.cpp
@@ -0,0 +1,64 @@
+//======================================================================
+//
+// MessageQueueShowFlyTextArchive.cpp
+// Copyright (c) 2002 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueShowFlyTextArchive.h"
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/MessageQueueShowFlyText.h"
+
+//======================================================================
+
+MessageQueue::Data *MessageQueueShowFlyTextArchive::get(Archive::ReadIterator & source)
+{
+	NetworkId emitterId;
+	StringId  outputTextId;
+	Unicode::String outputTextOOB;
+	float     scale;
+	uint8     red;
+	uint8     green;
+	uint8     blue;
+	uint32     flags;
+
+	Archive::get(source, emitterId);
+	Archive::get(source, outputTextId);
+	Archive::get(source, outputTextOOB);
+	Archive::get(source, scale);
+	Archive::get(source, red);
+	Archive::get(source, green);
+	Archive::get(source, blue);
+	Archive::get(source, flags);
+
+	if(outputTextId.isValid())
+		return new MessageQueueShowFlyText(emitterId, outputTextId, scale, static_cast<int>(red), static_cast<int>(green), static_cast<int>(blue), static_cast<int>(flags));
+	else
+		return new MessageQueueShowFlyText(emitterId, outputTextOOB, scale, static_cast<int>(red), static_cast<int>(green), static_cast<int>(blue), static_cast<int>(flags));
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueShowFlyTextArchive::put(const MessageQueue::Data *source, Archive::ByteStream &target)
+{
+	const MessageQueueShowFlyText * const message = dynamic_cast<const MessageQueueShowFlyText*>(source);
+	if (!message)
+	{
+		WARNING_STRICT_FATAL(true, ("attempted to pack ShowFlyText message queue message with wrong data type."));
+		return;
+	}
+
+	Archive::put(target, message->getEmitterId());
+	Archive::put(target, message->getOutputTextId());
+	Archive::put(target, message->getOutputTextOOB());
+	Archive::put(target, message->getScale());
+	Archive::put(target, static_cast<uint8>(message->getRed   ()));
+	Archive::put(target, static_cast<uint8>(message->getGreen ()));
+	Archive::put(target, static_cast<uint8>(message->getBlue  ()));
+	Archive::put(target, static_cast<uint32>(message->getFlags ()));
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyTextArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyTextArchive.h
new file mode 100644
index 00000000..0305c414
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueShowFlyTextArchive.h
@@ -0,0 +1,34 @@
+//======================================================================
+//
+// MessageQueueShowFlyTextArchive.h
+// Copyright (c) 2002 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueShowFlyTextArchive_H
+#define INCLUDED_MessageQueueShowFlyTextArchive_H
+
+#include "sharedFoundation/MessageQueue.h"
+
+//======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+}
+
+//----------------------------------------------------------------------
+
+class MessageQueueShowFlyTextArchive
+{
+public:
+
+	static MessageQueue::Data *get(Archive::ReadIterator &source);
+	static void                put(const MessageQueue::Data *source, Archive::ByteStream &target);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObject.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObject.cpp
new file mode 100644
index 00000000..be5a9be9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObject.cpp
@@ -0,0 +1,35 @@
+//======================================================================
+//
+// MessageQueueSitOnObject.cpp
+// Copyright (c) 2002 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueSitOnObject.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueSitOnObjectArchive.h"
+
+// ======================================================================
+
+float const MessageQueueSitOnObject::cs_maximumChairRange        = 2.0f;
+float const MessageQueueSitOnObject::cs_maximumChairRangeSquared = cs_maximumChairRange * cs_maximumChairRange;
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_WITH_ARCHIVE(MessageQueueSitOnObject, CM_sitOnObject);
+
+//===================================================================
+
+MessageQueueSitOnObject::MessageQueueSitOnObject(NetworkId const &chairCellId, Vector const &chairPosition_p) :
+	MessageQueue::Data (),
+	m_chairCellId(chairCellId),
+	m_chairPosition_p(chairPosition_p)
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObject.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObject.h
new file mode 100644
index 00000000..eb4c0e3b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObject.h
@@ -0,0 +1,73 @@
+//======================================================================
+//
+// MessageQueueSitOnObject.h
+// copyright (c) 2002 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueSitOnObject_H
+#define INCLUDED_MessageQueueSitOnObject_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedMath/Vector.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+/**
+ * A message to instruct a CreatureObject to sit on another Object.
+ *
+ * This function is intended for use with the Postures::Sitting posture
+ * (e.g. sitting on a chair or couch).  It is not meant to handle the action 
+ * of mounting an Object.
+ */
+
+class MessageQueueSitOnObject : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	static float const cs_maximumChairRange;
+	static float const cs_maximumChairRangeSquared;
+
+public:
+	
+	explicit MessageQueueSitOnObject(NetworkId const &chairCellId, Vector const &chairPosition_p);
+
+	NetworkId const &getChairCellId() const;
+	Vector const    &getChairPosition_p() const;
+
+private:
+
+	// Disabled.
+	MessageQueueSitOnObject();
+	MessageQueueSitOnObject& operator=(const MessageQueueSitOnObject&);
+
+private:
+
+	NetworkId  m_chairCellId;
+	Vector     m_chairPosition_p;
+
+};
+
+//======================================================================
+
+inline NetworkId const &MessageQueueSitOnObject::getChairCellId() const
+{
+	return m_chairCellId;
+}
+
+// ----------------------------------------------------------------------
+
+inline Vector const &MessageQueueSitOnObject::getChairPosition_p() const 
+{ 
+	return m_chairPosition_p;
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObjectArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObjectArchive.cpp
new file mode 100644
index 00000000..2a42ecc2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObjectArchive.cpp
@@ -0,0 +1,47 @@
+//======================================================================
+//
+// MessageQueueSitOnObjectArchive.cpp
+// Copyright (c) 2002 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueSitOnObjectArchive.h"
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/MessageQueueSitOnObject.h"
+
+
+//======================================================================
+
+MessageQueue::Data *MessageQueueSitOnObjectArchive::get(Archive::ReadIterator & source)
+{
+	NetworkId  chairCellId;
+	Vector     chairPosition_p;
+
+	Archive::get(source, chairCellId);
+	Archive::get(source, chairPosition_p);
+	return new MessageQueueSitOnObject(chairCellId, chairPosition_p);
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueSitOnObjectArchive::put(const MessageQueue::Data *source, Archive::ByteStream &target)
+{
+	const MessageQueueSitOnObject * const message = dynamic_cast<const MessageQueueSitOnObject*>(source);
+	if (!message)
+	{
+		WARNING_STRICT_FATAL(true, ("attempted to pack SitOnObject message queue message with wrong data type."));
+		return;
+	}
+
+	NetworkId const &chairCellId      = message->getChairCellId();
+	Vector const    &chairPosition_p = message->getChairPosition_p();
+
+	Archive::put(target, chairCellId);
+	Archive::put(target, chairPosition_p);
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObjectArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObjectArchive.h
new file mode 100644
index 00000000..f0282b68
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSitOnObjectArchive.h
@@ -0,0 +1,29 @@
+//======================================================================
+//
+// MessageQueueSitOnObjectArchive.h
+// Copyright (c) 2002 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueSitOnObjectArchive_H
+#define INCLUDED_MessageQueueSitOnObjectArchive_H
+
+#include "Archive/ByteStream.h"
+#include "sharedFoundation/MessageQueue.h"
+
+class MessageQueueSpatialChat;
+
+//======================================================================
+
+class MessageQueueSitOnObjectArchive
+{
+public:
+
+	static MessageQueue::Data *get(Archive::ReadIterator &source);
+	static void                put(const MessageQueue::Data *source, Archive::ByteStream &target);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSlowDownEffect.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSlowDownEffect.cpp
new file mode 100644
index 00000000..8089e4b2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSlowDownEffect.cpp
@@ -0,0 +1,81 @@
+// ======================================================================
+//
+// MessageQueueSlowDownEffect.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueSlowDownEffect.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueSlowDownEffect, CM_slowDownEffect);
+
+//===================================================================
+
+
+
+MessageQueueSlowDownEffect::MessageQueueSlowDownEffect(const NetworkId & target, float coneLength, float coneAngle, float slopeAngle, unsigned long expireTime) :
+	MessageQueue::Data(),
+	m_target(target),
+	m_coneLength(coneLength),
+	m_coneAngle(coneAngle),
+	m_slopeAngle(slopeAngle),
+	m_expireTime(expireTime)
+{
+}
+
+// ----------------------------------------------------------------------
+
+MessageQueueSlowDownEffect::MessageQueueSlowDownEffect(
+	MessageQueueSlowDownEffect const &source) :
+	MessageQueue::Data(),
+	m_target(source.m_target),
+	m_coneLength(source.m_coneLength),
+	m_coneAngle(source.m_coneAngle),
+	m_slopeAngle(source.m_slopeAngle),
+	m_expireTime(source.m_expireTime)
+{
+}	
+
+// ----------------------------------------------------------------------
+
+void MessageQueueSlowDownEffect::pack(const MessageQueue::Data* data, Archive::ByteStream & target)
+{
+	const MessageQueueSlowDownEffect * const msg = safe_cast<const MessageQueueSlowDownEffect *>(data);
+	if (msg)
+	{
+		Archive::put(target, msg->getTarget());
+		Archive::put(target, msg->getConeLength());
+		Archive::put(target, msg->getConeAngle());
+		Archive::put(target, msg->getSlopeAngle());
+		Archive::put(target, msg->getExpireTime());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data * MessageQueueSlowDownEffect::unpack(Archive::ReadIterator & source)
+{
+	NetworkId target;
+	float coneLength;
+	float coneAngle;
+	float slopeAngle;
+	unsigned long expireTime;
+
+	Archive::get(source, target);
+	Archive::get(source, coneLength);
+	Archive::get(source, coneAngle);
+	Archive::get(source, slopeAngle);
+	Archive::get(source, expireTime);
+
+	return new MessageQueueSlowDownEffect(target, coneLength, coneAngle, slopeAngle, expireTime);
+}
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSlowDownEffect.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSlowDownEffect.h
new file mode 100644
index 00000000..fc4e9a67
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSlowDownEffect.h
@@ -0,0 +1,79 @@
+// ======================================================================
+//
+// MessageQueueSlowDownEffect.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_MessageQueueSlowDownEffect_H
+#define INCLUDED_MessageQueueSlowDownEffect_H
+
+// ======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+// ======================================================================
+
+class MessageQueueSlowDownEffect: public MessageQueue::Data
+{
+
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	MessageQueueSlowDownEffect(const NetworkId & target, float coneLength, float coneAngle, float slopeAngle, unsigned long expireTime);
+	MessageQueueSlowDownEffect(const MessageQueueSlowDownEffect &source);
+
+	const NetworkId & getTarget() const;
+	float getConeLength() const;
+	float getConeAngle() const;
+	float getSlopeAngle() const;
+	unsigned long getExpireTime() const;
+
+private:
+	MessageQueueSlowDownEffect();
+	MessageQueueSlowDownEffect &operator=(const MessageQueueSlowDownEffect &source);
+
+	NetworkId m_target;
+	float m_coneLength;
+	float m_coneAngle;
+	float m_slopeAngle;
+	unsigned long m_expireTime;
+};
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueSlowDownEffect::getTarget() const
+{
+	return m_target;
+}
+
+inline float MessageQueueSlowDownEffect::getConeLength() const
+{
+	return m_coneLength;
+}
+
+inline float MessageQueueSlowDownEffect::getConeAngle() const
+{
+	return m_coneAngle;
+}
+
+inline float MessageQueueSlowDownEffect::getSlopeAngle() const
+{
+	return m_slopeAngle;
+}
+
+inline unsigned long MessageQueueSlowDownEffect::getExpireTime() const
+{
+	return m_expireTime;
+}
+
+
+// ======================================================================
+
+#endif // INCLUDED_MessageQueueSlowDownEffect_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocial.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocial.cpp
new file mode 100644
index 00000000..9406e675
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocial.cpp
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// MessageQueueSocial.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueSocial.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueSocialArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_WITH_ARCHIVE(MessageQueueSocial, CM_socialReceive);
+
+//======================================================================
+
+MessageQueueSocial::MessageQueueSocial (const NetworkId & sourceId, const NetworkId & targetId, uint32 socialType, bool animationOk, bool textOk) :
+MessageQueue::Data (),
+m_sourceId    (sourceId),
+m_targetId    (targetId),
+m_socialType  (socialType),
+m_flags       (static_cast<uint8>((animationOk ? F_animationOk : 0) | (textOk ? F_textOk : 0)))
+{
+
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueSocial::MessageQueueSocial (const MessageQueueSocial& rhs) :
+MessageQueue::Data (),
+m_sourceId    (rhs.getSourceId   ()),
+m_targetId    (rhs.getTargetId   ()),
+m_socialType  (rhs.getSocialType ()),
+m_flags       (rhs.m_flags)
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocial.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocial.h
new file mode 100644
index 00000000..d2da5327
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocial.h
@@ -0,0 +1,75 @@
+//======================================================================
+//
+// MessageQueueSocial.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueSocial_H
+#define INCLUDED_MessageQueueSocial_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+/**
+* A social message is issued on an server object's MessageQueue if the object
+* observes 'source' performing social towards 'target'.
+*
+* A social message is issued on an client object's MessageQueue if it
+* wants to perform a social.
+*
+*/
+
+//----------------------------------------------------------------------
+
+class MessageQueueSocial : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	
+	MessageQueueSocial (const NetworkId & sourceId, const NetworkId & targetId, uint32 socialType, bool animationOk, bool textOk);
+	MessageQueueSocial (const MessageQueueSocial&);
+
+	const NetworkId &       getSourceId   () const;
+	const NetworkId &       getTargetId   () const;
+	const uint32            getSocialType () const;
+	const bool              isAnimationOk () const;
+	const bool              isTextOk      () const;
+
+private:
+
+	MessageQueueSocial ();
+	MessageQueueSocial& operator= (const MessageQueueSocial&);
+
+public:
+
+	enum Flags
+	{
+		F_animationOk   = 0x0001,
+		F_textOk        = 0x0002
+	};
+
+	NetworkId  m_sourceId;
+	NetworkId  m_targetId;
+	uint32     m_socialType;
+	uint8      m_flags;
+};
+
+//----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueSocial::getSourceId   () const { return m_sourceId; }
+inline const NetworkId & MessageQueueSocial::getTargetId   () const { return m_targetId; }
+inline const uint32      MessageQueueSocial::getSocialType () const { return m_socialType; }
+inline const bool        MessageQueueSocial::isAnimationOk () const { return (m_flags & F_animationOk) != 0; }
+inline const bool        MessageQueueSocial::isTextOk      () const { return (m_flags & F_textOk)      != 0; }
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocialArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocialArchive.cpp
new file mode 100644
index 00000000..bd242afd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocialArchive.cpp
@@ -0,0 +1,48 @@
+//======================================================================
+//
+// MessageQueueSocialArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueSocialArchive.h"
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/MessageQueueSocial.h"
+
+
+//======================================================================
+
+MessageQueue::Data * MessageQueueSocialArchive::get (Archive::ReadIterator & source)
+{
+	NetworkId sender;
+	NetworkId target;
+	uint32    socialType = 0;
+	uint8     flags = 0;
+
+	Archive::get(source, sender);
+	Archive::get(source, target);
+	Archive::get(source, socialType);
+	Archive::get(source, flags);
+
+	return new MessageQueueSocial (sender, target, socialType, (flags & MessageQueueSocial::F_animationOk) != 0, (flags & MessageQueueSocial::F_textOk) != 0);
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueSocialArchive::put (const MessageQueue::Data * source, Archive::ByteStream & target)
+{
+	const MessageQueueSocial * const msg = dynamic_cast<const MessageQueueSocial  *>(source);
+	NOT_NULL (msg);
+
+	if (msg)
+	{
+		Archive::put (target, msg->getSourceId());
+		Archive::put (target, msg->getTargetId());
+		Archive::put (target, msg->getSocialType());
+		Archive::put (target, msg->m_flags);
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocialArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocialArchive.h
new file mode 100644
index 00000000..218efd35
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSocialArchive.h
@@ -0,0 +1,33 @@
+//======================================================================
+//
+// MessageQueueSocialArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueSocialArchive_H
+#define INCLUDED_MessageQueueSocialArchive_H
+
+#include "sharedFoundation/MessageQueue.h"
+
+class MessageQueueSocial;
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+}
+
+//======================================================================
+
+class MessageQueueSocialArchive
+{
+public:
+
+	static MessageQueue::Data *     get (Archive::ReadIterator & source);
+	static void                     put (const MessageQueue::Data * source, Archive::ByteStream & target);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpaceMiningSellResource.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpaceMiningSellResource.cpp
new file mode 100644
index 00000000..e6ed3b3a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpaceMiningSellResource.cpp
@@ -0,0 +1,66 @@
+//======================================================================
+//
+// MessageQueueSpatialChat.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueSpaceMiningSellResource.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//----------------------------------------------------------------------
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueSpaceMiningSellResource, CM_spaceMiningSaleSellResource);
+
+//----------------------------------------------------------------------
+
+
+MessageQueueSpaceMiningSellResource::MessageQueueSpaceMiningSellResource(NetworkId const & shipId, NetworkId const & spaceStationId, NetworkId const & resourceId, int amount) :
+MessageQueue::Data(),
+m_shipId(shipId),
+m_spaceStationId(spaceStationId),
+m_resourceId(resourceId),
+m_amount(amount)
+{
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueSpaceMiningSellResource::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	MessageQueueSpaceMiningSellResource const * const msg = safe_cast<const MessageQueueSpaceMiningSellResource*> (data);
+
+	if (!msg)
+		return;
+
+	Archive::put(target, msg->m_shipId);
+	Archive::put(target, msg->m_spaceStationId);
+	Archive::put(target, msg->m_resourceId);
+	Archive::put(target, msg->m_amount);
+}	
+
+//-----------------------------------------------------------------------
+
+
+MessageQueue::Data* MessageQueueSpaceMiningSellResource::unpack(Archive::ReadIterator & source)
+{
+	NetworkId shipId;
+	NetworkId spaceStationId;
+	NetworkId resourceId;
+	int amount = 0;
+
+	Archive::get(source, shipId);
+	Archive::get(source, spaceStationId);
+	Archive::get(source, resourceId);
+	Archive::get(source, amount);
+
+	return new MessageQueueSpaceMiningSellResource(shipId, spaceStationId, resourceId, amount);
+}
+
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpaceMiningSellResource.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpaceMiningSellResource.h
new file mode 100644
index 00000000..b6b6b83a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpaceMiningSellResource.h
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// MessageQueueSpaceMiningSellResource.h
+// copyright (c) 2005 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueSpaceMiningSellResource_H
+#define INCLUDED_MessageQueueSpaceMiningSellResource_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+class MessageQueueSpaceMiningSellResource : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	MessageQueueSpaceMiningSellResource(NetworkId const & shipId, NetworkId const & spaceStationId, NetworkId const & resourceId, int amount);
+
+private:
+
+	MessageQueueSpaceMiningSellResource(MessageQueueSpaceMiningSellResource const &);
+	MessageQueueSpaceMiningSellResource();
+	MessageQueueSpaceMiningSellResource& operator=(MessageQueueSpaceMiningSellResource const &);
+
+public:
+
+	NetworkId m_shipId;
+	NetworkId m_spaceStationId;
+	NetworkId m_resourceId;
+	int m_amount;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChat.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChat.cpp
new file mode 100644
index 00000000..91e876bb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChat.cpp
@@ -0,0 +1,81 @@
+//======================================================================
+//
+// MessageQueueSpatialChat.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueSpatialChat.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/MessageQueueSpatialChatArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_WITH_ARCHIVE_NO_INSTALL(MessageQueueSpatialChat);
+
+//===================================================================
+
+void MessageQueueSpatialChat::install() 
+{ 
+	installMemoryBlockManager();
+	ControllerMessageFactory::registerControllerMessageHandler(CM_spatialChatSend, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_spatialChatReceive, pack, unpack); 
+	ExitChain::add(&remove, "MessageQueueSpatialChat::remove"); 
+} 
+
+//-----------------------------------------------------------------------
+
+MessageQueueSpatialChat::MessageQueueSpatialChat (const NetworkId & sourceId,
+						 const NetworkId & targetId,
+						 const Unicode::String & text,
+						 uint16 volume,
+						 uint16 chatType,
+						 uint16 moodType,
+						 uint32 flags,
+						 uint32 language,
+						 const Unicode::String & oob,
+						 const Unicode::String & sourceName) :
+MessageQueue::Data (),
+m_text         (text),
+m_sourceId     (sourceId),
+m_targetId     (targetId),
+m_flags        (flags),
+m_volume       (volume),
+m_chatType     (chatType),
+m_moodType     (moodType),
+m_language     (static_cast<uint8>(language)),
+m_outOfBand    (oob),
+m_sourceName   (sourceName)
+{
+	DEBUG_FATAL (language > 255, ("MessageQueueSpatialChat language %d out of 8 bit range.", language));
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueSpatialChat::MessageQueueSpatialChat (const MessageQueueSpatialChat& rhs) :
+MessageQueue::Data (),
+m_text         (rhs.getText ()),
+m_sourceId     (rhs.getSourceId ()),
+m_targetId     (rhs.getTargetId ()),
+m_flags        (rhs.getFlags ()),
+m_volume       (rhs.getVolume ()),
+m_chatType     (rhs.getChatType ()),
+m_moodType     (rhs.getMoodType ()),
+m_language     (rhs.m_language),
+m_outOfBand    (rhs.m_outOfBand),
+m_sourceName   (rhs.m_sourceName)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueSpatialChat::~MessageQueueSpatialChat ()
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChat.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChat.h
new file mode 100644
index 00000000..919638f3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChat.h
@@ -0,0 +1,109 @@
+//======================================================================
+//
+// MessageQueueSpatialChat.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueSpatialChat_H
+#define INCLUDED_MessageQueueSpatialChat_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+/**
+* A spatial chat message is issued on an server object's MessageQueue if the object
+* observes 'source' speaking to 'target'.
+*
+* A spatial chat message is issued on an client object's MessageQueue if it
+* wants to speak.
+*
+*/
+
+class MessageQueueSpatialChat : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	
+	enum Flags
+	{
+		F_isPrivate       = 0x0001,  // message text is intended for target only.
+		F_skipTarget      = 0x0002,
+		F_skipSource      = 0x0004,
+		F_targetOnly      = 0x0008,
+		F_targetGroupOnly = 0x0010,
+		F_shipPilot       = 0x0020,
+		F_shipOperations  = 0x0040,
+		F_shipGunner      = 0x0080,
+		F_ship            = F_shipPilot|F_shipOperations|F_shipGunner,
+		F_targetAndSourceGroup = 0x01000,
+	};
+
+	MessageQueueSpatialChat (const NetworkId & sourceId,
+		const NetworkId &       targetId,
+		const Unicode::String & text,
+		uint16                  volume,
+		uint16                  chatType,
+		uint16                  moodType,
+		uint32                  flags,
+		uint32                  language,
+		const Unicode::String & outOfBand,
+		const Unicode::String & sourceName = Unicode::emptyString);
+	
+	MessageQueueSpatialChat  (const MessageQueueSpatialChat&);
+	~MessageQueueSpatialChat ();
+
+	const NetworkId &             getSourceId     () const;
+	const NetworkId &             getTargetId     () const;
+	const Unicode::String &       getText         () const;
+	const uint16                  getVolume       () const;
+	const uint16                  getChatType     () const;
+	const uint16                  getMoodType     () const;
+	const uint32                  getFlags        () const;
+	const uint32                  getLanguage     () const;
+	const Unicode::String &       getOutOfBand    () const;
+	const Unicode::String &       getSourceName   () const;
+
+private:
+
+	MessageQueueSpatialChat();
+	MessageQueueSpatialChat& operator= (const MessageQueueSpatialChat&);
+
+private:
+
+	Unicode::String  m_text; 
+	NetworkId        m_sourceId;
+	NetworkId        m_targetId;
+	uint32           m_flags;
+	uint16           m_volume;
+	uint16           m_chatType;
+	uint16           m_moodType;
+	uint8            m_language;
+	Unicode::String  m_outOfBand;
+	Unicode::String  m_sourceName;
+};
+
+//----------------------------------------------------------------------
+
+inline const NetworkId &       MessageQueueSpatialChat::getSourceId     () const { return m_sourceId; }
+inline const NetworkId &       MessageQueueSpatialChat::getTargetId     () const { return m_targetId; }
+inline const Unicode::String & MessageQueueSpatialChat::getText         () const { return m_text; }
+inline const uint16            MessageQueueSpatialChat::getVolume       () const { return m_volume; }
+inline const uint16            MessageQueueSpatialChat::getChatType     () const { return m_chatType; }
+inline const uint16            MessageQueueSpatialChat::getMoodType     () const { return m_moodType; }
+inline const uint32            MessageQueueSpatialChat::getFlags        () const { return m_flags; }
+inline const Unicode::String & MessageQueueSpatialChat::getOutOfBand    () const { return m_outOfBand; }
+inline const uint32            MessageQueueSpatialChat::getLanguage     () const { return static_cast<uint32> (m_language); }
+inline const Unicode::String & MessageQueueSpatialChat::getSourceName   () const { return m_sourceName; }
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChatArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChatArchive.cpp
new file mode 100644
index 00000000..4945b35c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChatArchive.cpp
@@ -0,0 +1,81 @@
+//======================================================================
+//
+// MessageQueueSpatialChatArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueSpatialChatArchive.h"
+
+#include "Archive/ByteStream.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/MessageQueueSpatialChat.h"
+#include "sharedGame/ProsePackage.h"
+#include "sharedGame/ProsePackageArchive.h"
+
+//======================================================================
+
+MessageQueue::Data * MessageQueueSpatialChatArchive::get (Archive::ReadIterator & source)
+{
+	NetworkId sourceId;
+	NetworkId targetId;
+	Unicode::String text;
+	uint32          flags    = 0;
+	uint16          volume   = 0;
+	uint16          chatType = 0;
+	uint16          moodType = 0;
+	uint8           language = 0;
+	Unicode::String oob;
+	Unicode::String sourceName;
+
+	Archive::get(source, sourceId);
+	Archive::get(source, targetId);
+	Archive::get(source, text);
+	Archive::get(source, flags);
+	Archive::get(source, volume);
+	Archive::get(source, chatType);
+	Archive::get(source, moodType);
+	Archive::get(source, language);
+	Archive::get(source, oob);
+	Archive::get(source, sourceName);
+
+	MessageQueueSpatialChat * const msg = new MessageQueueSpatialChat (sourceId, targetId, text, volume, chatType, moodType, flags, language, oob, sourceName);
+	return msg;
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueSpatialChatArchive::put (const MessageQueue::Data * source, Archive::ByteStream & target)
+{
+	const MessageQueueSpatialChat * const message = dynamic_cast<const MessageQueueSpatialChat*>(source);
+	if (!message)
+	{
+		WARNING_STRICT_FATAL(true, ("attempted to pack SetTargetAndAttack message queue message with wrong data type"));
+		return;
+	}
+
+	const NetworkId &       sourceId = message->getSourceId  ();
+	const NetworkId &       targetId = message->getTargetId  ();
+	const Unicode::String & text     = message->getText      ();
+	const uint32            flags    = message->getFlags     ();
+	const uint16            volume   = message->getVolume    ();
+	const uint16            chatType = message->getChatType  ();
+	const uint16            moodtype = message->getMoodType  ();
+	const uint8             language = static_cast<uint8>(message->getLanguage ()); //language is only 8 bit on the network
+	const Unicode::String & oob      = message->getOutOfBand ();
+	const Unicode::String & sourceName = message->getSourceName ();
+
+	Archive::put(target, sourceId);
+	Archive::put(target, targetId);
+	Archive::put(target, text);
+	Archive::put(target, flags);
+	Archive::put(target, volume);
+	Archive::put(target, chatType);
+	Archive::put(target, moodtype);
+	Archive::put(target, language);
+	Archive::put(target, oob);
+	Archive::put(target, sourceName);
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChatArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChatArchive.h
new file mode 100644
index 00000000..2278344f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueSpatialChatArchive.h
@@ -0,0 +1,34 @@
+//======================================================================
+//
+// MessageQueueSpatialChatArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueSpatialChatArchive_H
+#define INCLUDED_MessageQueueSpatialChatArchive_H
+
+#include "sharedFoundation/MessageQueue.h"
+
+class MessageQueueSpatialChat;
+class MessageQueueData;
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+}
+
+//======================================================================
+
+class MessageQueueSpatialChatArchive
+{
+public:
+
+	static MessageQueue::Data *     get (Archive::ReadIterator & source);
+	static void                     put (const MessageQueue::Data * source, Archive::ByteStream & target);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.cpp
new file mode 100644
index 00000000..615eab73
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.cpp
@@ -0,0 +1,73 @@
+//========================================================================
+//
+// MessageQueueStartNpcConversation.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueStartNpcConversation.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueStartNpcConversation, CM_npcConversationStart);
+
+//===================================================================
+
+
+
+/**
+ * Class destructor.
+ */
+MessageQueueStartNpcConversation::~MessageQueueStartNpcConversation()
+{
+}	// MessageQueueStartNpcConversation::~MessageQueueStartNpcConversation
+
+void MessageQueueStartNpcConversation::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueStartNpcConversation* const msg = safe_cast<const MessageQueueStartNpcConversation*> (data);
+	
+	if (msg)
+	{
+		Archive::put(target, msg->getNpc());
+		uint8 temp8 = static_cast<uint8>(msg->getStarter());
+		Archive::put(target, temp8);
+		Archive::put(target, msg->getConversationName());
+		Archive::put(target, msg->getAppearanceOverrideTemplateCrc());
+	}
+}	// ControllerMessageFactory::packStartNpcConversation
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueStartNpcConversation::unpack(Archive::ReadIterator & source)
+{
+	MessageQueueStartNpcConversation * msg = new MessageQueueStartNpcConversation;
+	NOT_NULL(msg);
+	
+	NetworkId npc;
+	Archive::get(source, npc);
+	msg->setNpc(npc);
+
+	uint8 starter;
+	Archive::get(source, starter);
+	msg->setStarter(static_cast<NpcConversationData::ConversationStarter>(starter));
+	
+	std::string convo;
+	Archive::get(source, convo);
+	msg->setConversationName(convo);
+
+	uint32 appearanceOverrideCrc;
+	Archive::get(source, appearanceOverrideCrc);
+	msg->setAppearanceOverrideTemplateCrc(appearanceOverrideCrc);
+
+	return msg;
+}	// ControllerMessageFactory::unpackStartNpcConversation
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.h
new file mode 100644
index 00000000..31a04073
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStartNpcConversation.h
@@ -0,0 +1,96 @@
+//========================================================================
+//
+// MessageQueueStartNpcConversation.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueStartNpcConversation_H
+#define INCLUDED_MessageQueueStartNpcConversation_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedGame/NpcConversationData.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+
+class MemoryBlockManager;
+class MessageQueueStartNpcConversation : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueStartNpcConversation();
+	virtual ~MessageQueueStartNpcConversation();
+
+	const std::string &                      getConversationName() const;
+	const NetworkId &                        getNpc() const;
+	NpcConversationData::ConversationStarter getStarter() const;
+	uint32                                   getAppearanceOverrideTemplateCrc() const;
+	
+	void                 setConversationName(const std::string & name);
+	void                 setNpc(const NetworkId & npc);
+	void                 setStarter(NpcConversationData::ConversationStarter starter);
+	void                 setAppearanceOverrideTemplateCrc(uint32 crc);
+
+private:
+	NetworkId                                m_npc;
+	NpcConversationData::ConversationStarter m_starter;
+	std::string                              m_conversationName;
+	uint32                                   m_appearanceOverrideTemplateCrc;
+};
+
+
+inline MessageQueueStartNpcConversation::MessageQueueStartNpcConversation() :
+	MessageQueue::Data(),
+	m_npc(),
+	m_starter(NpcConversationData::CS_Player),
+	m_conversationName(),
+	m_appearanceOverrideTemplateCrc(0)
+{
+}	// MessageQueueStartNpcConversation::MessageQueueStartNpcConversation()
+
+inline const std::string & MessageQueueStartNpcConversation::getConversationName() const
+{
+	return m_conversationName;
+}
+
+inline const NetworkId & MessageQueueStartNpcConversation::getNpc() const
+{
+	return m_npc;
+}	// MessageQueueStartNpcConversation::getNpc
+
+inline NpcConversationData::ConversationStarter MessageQueueStartNpcConversation::getStarter() const
+{
+	return m_starter;
+}
+
+inline uint32 MessageQueueStartNpcConversation::getAppearanceOverrideTemplateCrc() const
+{
+	return m_appearanceOverrideTemplateCrc;
+}
+
+inline void MessageQueueStartNpcConversation::setConversationName(const std::string & c)
+{
+	m_conversationName = c;
+}
+
+inline void MessageQueueStartNpcConversation::setNpc(const NetworkId & npc)
+{
+	m_npc = npc;
+}	// MessageQueueStartNpcConversation::setNpc
+
+inline void MessageQueueStartNpcConversation::setStarter(NpcConversationData::ConversationStarter s)
+{
+	m_starter = s;
+}
+
+inline void MessageQueueStartNpcConversation::setAppearanceOverrideTemplateCrc(uint32 const crc)
+{
+	m_appearanceOverrideTemplateCrc = crc;
+}
+
+#endif	// INCLUDED_MessageQueueStartNpcConversation_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.cpp
new file mode 100644
index 00000000..49474703
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.cpp
@@ -0,0 +1,83 @@
+//========================================================================
+//
+// MessageQueueStopNpcConversation.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueStopNpcConversation.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueStopNpcConversation, CM_npcConversationStop);
+
+//===================================================================
+
+/**
+ * Class destructor.
+ */
+MessageQueueStopNpcConversation::~MessageQueueStopNpcConversation()
+{
+}	
+
+//-----------------------------------------------------------------------
+
+void MessageQueueStopNpcConversation::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueStopNpcConversation* const msg = safe_cast<const MessageQueueStopNpcConversation*> (data);
+	
+	if (msg)
+	{
+		Archive::put(target, msg->getNpc());
+		Archive::put(target, msg->getFinalMessageId());
+		Archive::put(target, msg->getFinalMessageProse());
+		Archive::put(target, msg->getFinalResponse());
+	}
+}	
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueStopNpcConversation::unpack(Archive::ReadIterator & source)
+{
+	MessageQueueStopNpcConversation * msg = new MessageQueueStopNpcConversation;
+	NOT_NULL(msg);
+
+	// npc
+	{
+		NetworkId npc;
+		Archive::get(source, npc);
+		msg->setNpc(npc);
+	}
+
+	// message string id
+	{
+		StringId finalMessageId;
+		Archive::get(source, finalMessageId);
+		msg->setFinalMessageId(finalMessageId);
+	}
+
+	// message prose package
+	{
+		Unicode::String finalMessageProse;
+		Archive::get(source, finalMessageProse);
+		msg->setFinalMessageProse(finalMessageProse);
+	}
+
+	// message final response
+	{
+		Unicode::String finalResponse;
+		Archive::get(source, finalResponse);
+		msg->setFinalResponse(finalResponse);
+	}
+	
+	return msg;
+}	
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.h
new file mode 100644
index 00000000..eb5cea38
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStopNpcConversation.h
@@ -0,0 +1,151 @@
+//========================================================================
+//
+// MessageQueueStopNpcConversation.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#ifndef INCLUDED_MessageQueueStopNpcConversation_H
+#define INCLUDED_MessageQueueStopNpcConversation_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+#include "StringId.h"
+
+//-----------------------------------------------------------------------
+
+class MemoryBlockManager;
+class MessageQueueStopNpcConversation : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	MessageQueueStopNpcConversation();
+	MessageQueueStopNpcConversation(NetworkId const & npc, StringId const & finalMessageId, Unicode::String const & finalProsePackage, Unicode::String const & finalResponse);
+	virtual ~MessageQueueStopNpcConversation();
+
+	MessageQueueStopNpcConversation&	operator=	(const MessageQueueStopNpcConversation & source);
+	MessageQueueStopNpcConversation(const MessageQueueStopNpcConversation & source);
+
+	const NetworkId & getNpc() const;
+	void setNpc(NetworkId const & npc);
+
+	void setFinalMessageId(StringId const & finalMessage);
+	StringId const & getFinalMessageId() const;
+
+	void setFinalMessageProse(Unicode::String const & finalMessage);
+	Unicode::String const & getFinalMessageProse() const;
+
+	void setFinalResponse(Unicode::String const & finalResponse);
+	Unicode::String const & getFinalResponse() const;
+
+private:
+	NetworkId m_npc;
+	StringId m_finalMessageId;
+	Unicode::String m_finalMessageProse;
+	Unicode::String m_finalResponse;
+};
+
+//-----------------------------------------------------------------------
+
+inline MessageQueueStopNpcConversation::MessageQueueStopNpcConversation()
+{
+}	// MessageQueueStopNpcConversation::MessageQueueStopNpcConversation()
+
+//-----------------------------------------------------------------------
+
+inline MessageQueueStopNpcConversation::MessageQueueStopNpcConversation(const MessageQueueStopNpcConversation & source) :
+	MessageQueue::Data(),
+	m_npc(source.m_npc),
+	m_finalMessageId(source.m_finalMessageId),
+	m_finalMessageProse(source.m_finalMessageProse),
+	m_finalResponse(source.m_finalResponse)
+{
+}	// MessageQueueStopNpcConversation::MessageQueueStopNpcConversation(const MessageQueueStopNpcConversation &)
+	
+//-----------------------------------------------------------------------
+	
+inline MessageQueueStopNpcConversation::MessageQueueStopNpcConversation(NetworkId const & npc, StringId const & finalMessage, Unicode::String const & finalProsePackage, Unicode::String const & finalResponse) :
+MessageQueue::Data(),
+m_npc(npc),
+m_finalMessageId(finalMessage),
+m_finalMessageProse(finalProsePackage),
+m_finalResponse(finalResponse)
+{
+}
+
+//-----------------------------------------------------------------------
+
+inline MessageQueueStopNpcConversation & MessageQueueStopNpcConversation::operator= (const MessageQueueStopNpcConversation & source)
+{
+	m_npc = source.m_npc;
+	m_finalMessageId = source.m_finalMessageId;
+	m_finalMessageProse = source.m_finalMessageProse;
+	m_finalResponse = source.m_finalResponse;
+	return *this;
+}	// MessageQueueStopNpcConversation::operator=
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueStopNpcConversation::getNpc() const
+{
+	return m_npc;
+}	// MessageQueueStopNpcConversation::getNpc
+
+//-----------------------------------------------------------------------
+
+inline void MessageQueueStopNpcConversation::setNpc(const NetworkId & npc)
+{
+	m_npc = npc;
+}	// MessageQueueStopNpcConversation::setNpc
+
+//-----------------------------------------------------------------------
+
+inline void MessageQueueStopNpcConversation::setFinalMessageId(StringId const & finalMessage)
+{
+	m_finalMessageId = finalMessage;
+}
+
+//-----------------------------------------------------------------------
+
+inline StringId const & MessageQueueStopNpcConversation::getFinalMessageId() const
+{
+	return m_finalMessageId;
+}
+
+//-----------------------------------------------------------------------
+
+inline void MessageQueueStopNpcConversation::setFinalMessageProse(Unicode::String const & finalMessage)
+{
+	m_finalMessageProse = finalMessage;
+}
+
+//-----------------------------------------------------------------------
+
+inline Unicode::String const & MessageQueueStopNpcConversation::getFinalMessageProse() const
+{
+	return m_finalMessageProse;
+}
+
+//-----------------------------------------------------------------------
+
+inline void MessageQueueStopNpcConversation::setFinalResponse(Unicode::String const & finalResponse)
+{
+	m_finalResponse = finalResponse;
+}
+
+//-----------------------------------------------------------------------
+
+inline Unicode::String const & MessageQueueStopNpcConversation::getFinalResponse() const
+{
+	return m_finalResponse;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// INCLUDED_MessageQueueStopNpcConversation_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueString.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueString.cpp
new file mode 100644
index 00000000..ef2ee0ac
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueString.cpp
@@ -0,0 +1,64 @@
+//======================================================================
+//
+// MessageQueueString.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueString.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_NO_INSTALL(MessageQueueString);
+
+//===================================================================
+
+void MessageQueueString::install() 
+{ 
+	installMemoryBlockManager();
+	ControllerMessageFactory::registerControllerMessageHandler(CM_attachScript, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_detachScript, pack, unpack); 
+	ControllerMessageFactory::registerControllerMessageHandler(CM_animationAction, pack, unpack); 
+	ExitChain::add(&remove, "MessageQueueString::remove"); 
+} 
+
+//-----------------------------------------------------------------------
+
+MessageQueueString::MessageQueueString (const std::string & str) :
+Data (),
+m_string (str)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueString::~MessageQueueString()
+{
+}
+
+//-----------------------------------------------------------------------
+void MessageQueueString::pack (const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueString* const msg = safe_cast<const MessageQueueString*> (data);
+	if (msg)
+	{
+		Archive::put (target, msg->getString ());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+
+MessageQueue::Data* MessageQueueString::unpack(Archive::ReadIterator & source)
+{
+	std::string str;
+	Archive::get(source, str);
+	return new MessageQueueString (str);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueString.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueString.h
new file mode 100644
index 00000000..92a6c0da
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueString.h
@@ -0,0 +1,52 @@
+//======================================================================
+//
+// MessageQueueString.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueString_H
+#define INCLUDED_MessageQueueString_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+/**
+* A generic message queue data that contains a simple payload of one String.
+* The meaning of the String is context and message dependant.
+*
+*/
+
+class MessageQueueString : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	explicit                MessageQueueString (const std::string & str);
+	virtual                ~MessageQueueString();
+
+	const std::string &     getString(void) const;
+
+private:
+
+	MessageQueueString&  operator= (const MessageQueueString & source);
+	                     MessageQueueString(const MessageQueueString & source);
+
+	std::string m_string;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & MessageQueueString::getString(void) const
+{
+	return m_string;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _MessageQueueString_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.cpp
new file mode 100644
index 00000000..e314288a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.cpp
@@ -0,0 +1,78 @@
+//========================================================================
+//
+// MessageQueueStringList.cpp
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueStringList.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_NO_INSTALL(MessageQueueStringList);
+
+//===================================================================
+
+void MessageQueueStringList::install() 
+{ 
+	installMemoryBlockManager();
+	ControllerMessageFactory::registerControllerMessageHandler(CM_npcConversationResponses, pack, unpack); 
+	ExitChain::add(&remove, "MessageQueueStringList::remove"); 
+} 
+
+/**
+ * Class destructor.
+ */
+MessageQueueStringList::~MessageQueueStringList()
+{
+}
+//-----------------------------------------------------------------------
+
+
+void MessageQueueStringList::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueStringList* const msg = safe_cast<const MessageQueueStringList*> (data);
+	
+	if (msg)
+	{
+		int count = msg->getStringCount();
+		uint8 temp8 = static_cast<uint8>(count);
+		Archive::put(target, temp8);
+		for (int i = 0; i < count; ++i)
+		{
+			const Unicode::String & string = msg->getString(i);
+			Archive::put(target, string);
+		}
+	}
+}	
+//-----------------------------------------------------------------------
+
+
+MessageQueue::Data* MessageQueueStringList::unpack(Archive::ReadIterator & source)
+{
+	MessageQueueStringList * msg = new MessageQueueStringList;
+	NOT_NULL(msg);
+	
+	uint8 count;
+	Unicode::String string;
+	Archive::get(source, count);
+	for (int i = 0; i < count; ++i)
+	{
+		Archive::get(source, string);
+		msg->addString(string);
+	}
+	
+	return msg;
+}	
+
+
+
+
+//========================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.h
new file mode 100644
index 00000000..fb74d8ae
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueStringList.h
@@ -0,0 +1,60 @@
+//========================================================================
+//
+// MessageQueueStringList.h
+//
+// copyright 2001 Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+
+#ifndef INCLUDED_MessageQueueStringList_H
+#define INCLUDED_MessageQueueStringList_H
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//========================================================================
+
+class MessageQueueStringList : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+
+	         MessageQueueStringList(void);
+	virtual ~MessageQueueStringList();
+
+	void                    addString(const Unicode::String & response);
+	int                     getStringCount(void) const;
+	const Unicode::String & getString(int index) const;
+
+private:
+	std::vector<Unicode::String> m_strings;
+};
+
+
+inline MessageQueueStringList::MessageQueueStringList()
+{
+}	// MessageQueueStringList::MessageQueueStringList()
+
+inline void MessageQueueStringList::addString(const Unicode::String & string)
+{
+	m_strings.push_back(string);
+}	// MessageQueueStringList::addString
+
+inline int MessageQueueStringList::getStringCount(void) const
+{
+	return m_strings.size();
+}	// MessageQueueStringList::getStringCount
+
+inline const Unicode::String & MessageQueueStringList::getString(int index) const
+{
+	DEBUG_FATAL(index < 0 || index >= static_cast<int>(m_strings.size()), 
+		("MessageQueueStringList::getString index out of range"));
+	return m_strings.at(index);
+}	// MessageQueueStringList::getString
+
+
+#endif	// INCLUDED_MessageQueueStringList_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueTeleportAck.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueTeleportAck.cpp
new file mode 100644
index 00000000..6f437b77
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueTeleportAck.cpp
@@ -0,0 +1,62 @@
+//======================================================================
+//
+// MessageQueueTeleportAck.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueTeleportAck.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(MessageQueueTeleportAck, CM_teleportAck);
+
+//===================================================================
+
+
+//----------------------------------------------------------------------
+
+MessageQueueTeleportAck::MessageQueueTeleportAck(int sequenceId) :
+	MessageQueue::Data(),
+	m_sequenceId(sequenceId)
+{
+}
+
+//----------------------------------------------------------------------
+
+MessageQueueTeleportAck::MessageQueueTeleportAck(MessageQueueTeleportAck const &rhs) :
+	MessageQueue::Data(),
+	m_sequenceId(rhs.m_sequenceId)
+{
+}
+
+//----------------------------------------------------------------------
+
+void MessageQueueTeleportAck::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueTeleportAck* const msg = safe_cast<const MessageQueueTeleportAck*> (data);
+	if(msg)
+	{
+		Archive::put(target, msg->getSequenceId());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+
+MessageQueue::Data* MessageQueueTeleportAck::unpack(Archive::ReadIterator & source)
+{
+	int sequenceId;
+	
+	Archive::get(source, sequenceId);
+	
+	return new MessageQueueTeleportAck(sequenceId);
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueTeleportAck.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueTeleportAck.h
new file mode 100644
index 00000000..c9eddecb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueTeleportAck.h
@@ -0,0 +1,56 @@
+//======================================================================
+//
+// MessageQueueTeleportAck.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueTeleportAck_H
+#define INCLUDED_MessageQueueTeleportAck_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+/**
+ * A teleport ack message is sent from a client to a game server to
+ * acknowledge receipt of a teleport message.
+ *
+ */
+
+class MessageQueueTeleportAck : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	
+	MessageQueueTeleportAck(int sequenceId);
+	MessageQueueTeleportAck(const MessageQueueTeleportAck&);
+
+	int getSequenceId() const;
+
+private:
+
+	MessageQueueTeleportAck();
+	MessageQueueTeleportAck &operator=(const MessageQueueTeleportAck &);
+
+private:
+	int m_sequenceId;
+};
+
+//----------------------------------------------------------------------
+
+
+inline int MessageQueueTeleportAck::getSequenceId() const
+{
+	return m_sequenceId;
+}
+
+//======================================================================
+
+#endif // INCLUDED_MessageQueueTeleportAck_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListCircleResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListCircleResponse.cpp
new file mode 100644
index 00000000..38a52a13
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListCircleResponse.cpp
@@ -0,0 +1,83 @@
+// MessageRegionListCircleResponse.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "MessageRegionListCircleResponse.h"
+
+//-----------------------------------------------------------------------
+
+MessageRegionListCircleResponse::MessageRegionListCircleResponse(float worldX, float worldZ, float radius, int pvp, int municipal, int buildable, int geographical, int minDifficulty, int maxDifficulty, int spawnable, int mission, const Unicode::String& name, const std::string& planet)
+: GameNetworkMessage("MessageRegionListCircleResponse"),
+  m_name(name),
+  m_planet(planet),
+  m_worldX(worldX),
+  m_worldZ(worldZ),
+  m_pvp(pvp),
+  m_buildable(buildable),
+  m_spawnable(spawnable),
+  m_mission(mission),
+  m_municipal(municipal),
+  m_geographical(geographical),
+  m_minDifficulty(minDifficulty),
+  m_maxDifficulty(maxDifficulty),
+  m_radius(radius)
+{
+	addVariable(m_name);
+	addVariable(m_planet);
+	addVariable(m_worldX);
+	addVariable(m_worldZ);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_municipal);
+	addVariable(m_geographical);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+	addVariable(m_radius);
+}
+
+//-----------------------------------------------------------------------
+
+MessageRegionListCircleResponse::MessageRegionListCircleResponse(Archive::ReadIterator & source)
+: GameNetworkMessage("MessageRegionListCircleResponse"),
+  m_name(),
+  m_planet(),
+  m_worldX(),
+  m_worldZ(),
+  m_pvp(),
+  m_buildable(),
+  m_spawnable(),
+  m_mission(),
+  m_municipal(),
+  m_geographical(),
+  m_minDifficulty(),
+  m_maxDifficulty(),
+  m_radius()
+{
+	addVariable(m_name);
+	addVariable(m_planet);
+	addVariable(m_worldX);
+	addVariable(m_worldZ);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_municipal);
+	addVariable(m_geographical);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+	addVariable(m_radius);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+MessageRegionListCircleResponse::~MessageRegionListCircleResponse()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListCircleResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListCircleResponse.h
new file mode 100644
index 00000000..3d3f5ef4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListCircleResponse.h
@@ -0,0 +1,148 @@
+// MessageRegionListCircleResponse.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef	_INCLUDED_MessageRegionListCircleResponse_H
+#define	_INCLUDED_MessageRegionListCircleResponse_H
+
+//-----------------------------------------------------------------------
+
+//#include "sharedNetworkMessages/MessageRegionListResponse.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class MessageRegionListCircleResponse : public GameNetworkMessage
+{
+public:
+	MessageRegionListCircleResponse(float worldX, float worldZ, float radius, int pvp, int municipal, int buildable, int geographical, int minDifficulty, int maxDifficulty, int spawnable, int mission, const Unicode::String & name, const std::string & planet);
+	MessageRegionListCircleResponse(Archive::ReadIterator & source);
+	~MessageRegionListCircleResponse();
+
+	const Unicode::String & getName         () const;
+	const std::string &     getPlanet       () const;
+	float                   getWorldX       () const;
+	float                   getWorldZ       () const;
+	int                     getPvP          () const;
+	int                     getBuildable    () const;
+	int                     getSpawnable    () const;
+	int                     getMission      () const;
+	int                     getMunicipal    () const;
+	int                     getGeographical () const;
+	int                     getMinDifficulty() const;
+	int                     getMaxDifficulty() const;
+	float                   getRadius       () const;
+
+private:
+	MessageRegionListCircleResponse & operator = (const MessageRegionListCircleResponse & rhs);
+	MessageRegionListCircleResponse(const MessageRegionListCircleResponse & source);
+	
+	Archive::AutoVariable<Unicode::String>  m_name;
+	Archive::AutoVariable<std::string>      m_planet;
+	Archive::AutoVariable<float>            m_worldX;
+	Archive::AutoVariable<float>            m_worldZ;
+	Archive::AutoVariable<int>              m_pvp;
+	Archive::AutoVariable<int>              m_buildable;
+	Archive::AutoVariable<int>              m_spawnable;
+	Archive::AutoVariable<int>              m_mission;
+	Archive::AutoVariable<int>              m_municipal;
+	Archive::AutoVariable<int>              m_geographical;
+	Archive::AutoVariable<int>              m_minDifficulty;
+	Archive::AutoVariable<int>              m_maxDifficulty;
+	Archive::AutoVariable<float>            m_radius;
+};
+
+//-----------------------------------------------------------------------
+
+inline float MessageRegionListCircleResponse::getRadius() const
+{
+	return m_radius.get();
+}
+
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & MessageRegionListCircleResponse::getName() const
+{
+	return m_name.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & MessageRegionListCircleResponse::getPlanet() const
+{
+	return m_planet.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline float MessageRegionListCircleResponse::getWorldX() const
+{
+	return m_worldX.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline float MessageRegionListCircleResponse::getWorldZ() const
+{
+	return m_worldZ.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListCircleResponse::getPvP() const
+{
+	return m_pvp.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListCircleResponse::getBuildable() const
+{
+	return m_buildable.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListCircleResponse::getSpawnable() const
+{
+	return m_spawnable.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListCircleResponse::getMission() const
+{
+	return m_mission.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListCircleResponse::getMunicipal() const
+{
+	return m_municipal.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListCircleResponse::getGeographical() const
+{
+	return m_geographical.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListCircleResponse::getMinDifficulty() const
+{
+	return m_minDifficulty.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListCircleResponse::getMaxDifficulty() const
+{
+	return m_maxDifficulty.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MessageRegionListCircleResponse_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListRectResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListRectResponse.cpp
new file mode 100644
index 00000000..83921ddd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListRectResponse.cpp
@@ -0,0 +1,89 @@
+// MessageRegionListRectResponse.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "MessageRegionListRectResponse.h"
+
+//-----------------------------------------------------------------------
+
+MessageRegionListRectResponse::MessageRegionListRectResponse(float worldX, float worldZ, float ur_worldX, float ur_worldZ, int pvp, int municipal, int buildable, int geographical, int minDifficulty, int maxDifficulty, int spawnable, int mission, const Unicode::String& name, const std::string& planet)
+: GameNetworkMessage("MessageRegionListRectResponse"),
+  m_name(name),
+  m_planet(planet),
+  m_worldX(worldX),
+  m_worldZ(worldZ),
+  m_pvp(pvp),
+  m_buildable(buildable),
+  m_spawnable(spawnable),
+  m_mission(mission),
+  m_municipal(municipal),
+  m_geographical(geographical),
+  m_minDifficulty(minDifficulty),
+  m_maxDifficulty(maxDifficulty),
+  m_ur_worldX(ur_worldX),
+  m_ur_worldZ(ur_worldZ)
+{
+	addVariable(m_name);
+	addVariable(m_planet);
+	addVariable(m_worldX);
+	addVariable(m_worldZ);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_municipal);
+	addVariable(m_geographical);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+	addVariable(m_radius);
+	addVariable(m_ur_worldX);
+	addVariable(m_ur_worldZ);
+}
+
+//-----------------------------------------------------------------------
+
+MessageRegionListRectResponse::MessageRegionListRectResponse(Archive::ReadIterator & source)
+: GameNetworkMessage("MessageRegionListRectResponse"),
+  m_name(),
+  m_planet(),
+  m_worldX(),
+  m_worldZ(),
+  m_pvp(),
+  m_buildable(),
+  m_spawnable(),
+  m_mission(),
+  m_municipal(),
+  m_geographical(),
+  m_minDifficulty(),
+  m_maxDifficulty(),
+  m_ur_worldX(),
+  m_ur_worldZ()
+{
+	addVariable(m_name);
+	addVariable(m_planet);
+	addVariable(m_worldX);
+	addVariable(m_worldZ);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_municipal);
+	addVariable(m_geographical);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+	addVariable(m_radius);
+	addVariable(m_ur_worldX);
+	addVariable(m_ur_worldZ);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+MessageRegionListRectResponse::~MessageRegionListRectResponse()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListRectResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListRectResponse.h
new file mode 100644
index 00000000..dd99eb3d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListRectResponse.h
@@ -0,0 +1,158 @@
+// MessageRegionListRectResponse.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef	_INCLUDED_MessageRegionListRectResponse_H
+#define	_INCLUDED_MessageRegionListRectResponse_H
+
+//-----------------------------------------------------------------------
+
+//#include "sharedNetworkMessages/MessageRegionListResponse.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class MessageRegionListRectResponse : public GameNetworkMessage
+{
+public:
+	MessageRegionListRectResponse(float ll_worldX, float ll_worldZ, float ur_worldX, float ur_worldZ, int pvp, int municipal, int buildable, int geographical, int minDifficulty, int maxDifficulty, int spawnable, int mission, const Unicode::String & name, const std::string & planet);
+	MessageRegionListRectResponse(Archive::ReadIterator & source);
+	~MessageRegionListRectResponse();
+
+	const Unicode::String & getName         () const;
+	const std::string &     getPlanet       () const;
+	float                   getWorldX       () const;
+	float                   getWorldZ       () const;
+	int                     getPvP          () const;
+	int                     getBuildable    () const;
+	int                     getSpawnable    () const;
+	int                     getMission      () const;
+	int                     getMunicipal    () const;
+	int                     getGeographical () const;
+	int                     getMinDifficulty() const;
+	int                     getMaxDifficulty() const;
+	float                   getURWorldX     () const;
+	float                   getURWorldZ     () const;
+
+private:
+	MessageRegionListRectResponse & operator = (const MessageRegionListRectResponse & rhs);
+	MessageRegionListRectResponse(const MessageRegionListRectResponse & source);
+	
+private:
+	Archive::AutoVariable<Unicode::String>  m_name;
+	Archive::AutoVariable<std::string>      m_planet;
+	Archive::AutoVariable<float>            m_worldX;
+	Archive::AutoVariable<float>            m_worldZ;
+	Archive::AutoVariable<int>              m_pvp;
+	Archive::AutoVariable<int>              m_buildable;
+	Archive::AutoVariable<int>              m_spawnable;
+	Archive::AutoVariable<int>              m_mission;
+	Archive::AutoVariable<int>              m_municipal;
+	Archive::AutoVariable<int>              m_geographical;
+	Archive::AutoVariable<int>              m_minDifficulty;
+	Archive::AutoVariable<int>              m_maxDifficulty;
+	Archive::AutoVariable<float>            m_radius;
+	Archive::AutoVariable<float>            m_ur_worldX;
+	Archive::AutoVariable<float>            m_ur_worldZ;
+};
+
+//-----------------------------------------------------------------------
+
+inline float MessageRegionListRectResponse::getURWorldX() const
+{
+	return m_ur_worldX.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline float MessageRegionListRectResponse::getURWorldZ() const
+{
+	return m_ur_worldZ.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & MessageRegionListRectResponse::getName() const
+{
+	return m_name.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & MessageRegionListRectResponse::getPlanet() const
+{
+	return m_planet.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline float MessageRegionListRectResponse::getWorldX() const
+{
+	return m_worldX.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline float MessageRegionListRectResponse::getWorldZ() const
+{
+	return m_worldZ.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListRectResponse::getPvP() const
+{
+	return m_pvp.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListRectResponse::getBuildable() const
+{
+	return m_buildable.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListRectResponse::getSpawnable() const
+{
+	return m_spawnable.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListRectResponse::getMission() const
+{
+	return m_mission.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListRectResponse::getMunicipal() const
+{
+	return m_municipal.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListRectResponse::getGeographical() const
+{
+	return m_geographical.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListRectResponse::getMinDifficulty() const
+{
+	return m_minDifficulty.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListRectResponse::getMaxDifficulty() const
+{
+	return m_maxDifficulty.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MessageRegionListRectResponse_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListRequest.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListRequest.cpp
new file mode 100644
index 00000000..45f0a5fb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListRequest.cpp
@@ -0,0 +1,31 @@
+// MessageRegionListRequest.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "MessageRegionListRequest.h"
+
+//-----------------------------------------------------------------------
+
+MessageRegionListRequest::MessageRegionListRequest()
+: GameNetworkMessage("MessageRegionListRequest")
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageRegionListRequest::MessageRegionListRequest(Archive::ReadIterator & source)
+: GameNetworkMessage("MessageRegionListRequest")
+{
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+MessageRegionListRequest::~MessageRegionListRequest()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListRequest.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListRequest.h
new file mode 100644
index 00000000..c5d0fea9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListRequest.h
@@ -0,0 +1,27 @@
+// MessageRegionListRequest.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef	_INCLUDED_MessageRegionListRequest_H
+#define	_INCLUDED_MessageRegionListRequest_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class MessageRegionListRequest : public GameNetworkMessage
+{
+public:
+	MessageRegionListRequest();
+	MessageRegionListRequest(Archive::ReadIterator & source);
+	~MessageRegionListRequest();
+
+private:
+	MessageRegionListRequest & operator = (const MessageRegionListRequest & rhs);
+	MessageRegionListRequest(const MessageRegionListRequest & source);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MessageRegionListRequest_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListResponse.cpp
new file mode 100644
index 00000000..5506c9ff
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListResponse.cpp
@@ -0,0 +1,117 @@
+// MessageRegionListResponse.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "MessageRegionListResponse.h"
+
+//-----------------------------------------------------------------------
+
+MessageRegionListResponse::MessageRegionListResponse(const NetworkId& networkId, int gameServerId, float worldX, float worldZ, int pvp, int municipal, int buildable, int geographical, int minDifficulty, int maxDifficulty, int spawnable, int mission, const Unicode::String& label)
+: GameNetworkMessage("MessageRegionListResponse"),
+  m_objectId(networkId),
+  m_label(label),
+  m_worldX(worldX),
+  m_worldZ(worldZ),
+  m_pvp(pvp),
+  m_buildable(buildable),
+  m_spawnable(spawnable),
+  m_mission(mission),
+  m_municipal(municipal),
+  m_geographical(geographical),
+  m_minDifficulty(minDifficulty),
+  m_maxDifficulty(maxDifficulty),
+  m_gameServerId(gameServerId)
+{
+	addVariable(m_objectId);
+	addVariable(m_label);
+	addVariable(m_gameServerId);
+	addVariable(m_worldX);
+	addVariable(m_worldZ);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_municipal);
+	addVariable(m_geographical);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+}
+
+//-----------------------------------------------------------------------
+
+MessageRegionListResponse::MessageRegionListResponse(Archive::ReadIterator & source)
+: GameNetworkMessage("MessageRegionListResponse"),
+  m_objectId(),
+  m_label(),
+  m_worldX(),
+  m_worldZ(),
+  m_pvp(),
+  m_buildable(),
+  m_spawnable(),
+  m_mission(),
+  m_municipal(),
+  m_geographical(),
+  m_minDifficulty(),
+  m_maxDifficulty(),
+  m_gameServerId()
+{
+	addVariable(m_objectId);
+	addVariable(m_label);
+	addVariable(m_gameServerId);
+	addVariable(m_worldX);
+	addVariable(m_worldZ);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_municipal);
+	addVariable(m_geographical);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+MessageRegionListResponse::MessageRegionListResponse(const std::string& messageName, const NetworkId& networkId, int gameServerId, float worldX, float worldZ, int pvp, int municipal, int buildable, int geographical, int minDifficulty, int maxDifficulty, int spawnable, int mission, const Unicode::String& label)
+: GameNetworkMessage(messageName.c_str()),
+  m_objectId(networkId),
+  m_label(label),
+  m_worldX(worldX),
+  m_worldZ(worldZ),
+  m_pvp(pvp),
+  m_buildable(buildable),
+  m_spawnable(spawnable),
+  m_mission(mission),
+  m_municipal(municipal),
+  m_geographical(geographical),
+  m_minDifficulty(minDifficulty),
+  m_maxDifficulty(maxDifficulty),
+  m_gameServerId(gameServerId)
+{
+	addVariable(m_objectId);
+	addVariable(m_label);
+	addVariable(m_gameServerId);
+	addVariable(m_worldX);
+	addVariable(m_worldZ);
+	addVariable(m_pvp);
+	addVariable(m_buildable);
+	addVariable(m_spawnable);
+	addVariable(m_mission);
+	addVariable(m_municipal);
+	addVariable(m_geographical);
+	addVariable(m_minDifficulty);
+	addVariable(m_maxDifficulty);
+}
+
+//-----------------------------------------------------------------------
+
+MessageRegionListResponse::~MessageRegionListResponse()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListResponse.h
new file mode 100644
index 00000000..86f00d09
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageRegionListResponse.h
@@ -0,0 +1,147 @@
+// MessageRegionListResponse.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+
+#ifndef	_INCLUDED_MessageRegionListResponse_H
+#define	_INCLUDED_MessageRegionListResponse_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class MessageRegionListResponse : public GameNetworkMessage
+{
+public:
+	MessageRegionListResponse(const NetworkId& networkId, int gameServerId, float worldX, float worldZ, int pvp, int municipal, int buildable, int geographical, int minDifficulty, int maxDifficulty, int spawnable, int mission, const Unicode::String& label);
+	MessageRegionListResponse(const std::string& messageName, const NetworkId& networkId, int gameServerId, float worldX, float worldZ, int pvp, int municipal, int buildable, int geographical, int minDifficulty, int maxDifficulty, int spawnable, int mission, const Unicode::String& label);
+	MessageRegionListResponse(Archive::ReadIterator & source);
+	~MessageRegionListResponse();
+
+	const NetworkId &        getNetworkId     () const;
+	const Unicode::String &  getLabel         () const;
+	float                    getWorldX        () const;
+	float                    getWorldZ        () const;
+	int                      getPvP           () const;
+	int                      getBuildable     () const;
+	int                      getSpawnable     () const;
+	int                      getMission       () const;
+	int                      getMunicipal     () const;
+	int                      getGeographical  () const;
+	int                      getMinDifficulty () const;
+	int                      getMaxDifficulty () const;
+	int                      getGameServerId  () const;
+
+private:
+	MessageRegionListResponse & operator = (const MessageRegionListResponse & rhs);
+	MessageRegionListResponse(const MessageRegionListResponse & source);
+	
+	Archive::AutoVariable<NetworkId>        m_objectId;
+	Archive::AutoVariable<Unicode::String>  m_label;
+	Archive::AutoVariable<float>            m_worldX;
+	Archive::AutoVariable<float>            m_worldZ;
+	Archive::AutoVariable<int>              m_pvp;
+	Archive::AutoVariable<int>              m_buildable;
+	Archive::AutoVariable<int>              m_spawnable;
+	Archive::AutoVariable<int>              m_mission;
+	Archive::AutoVariable<int>              m_municipal;
+	Archive::AutoVariable<int>              m_geographical;
+	Archive::AutoVariable<int>              m_minDifficulty;
+	Archive::AutoVariable<int>              m_maxDifficulty;
+	Archive::AutoVariable<int>              m_gameServerId;
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & MessageRegionListResponse::getNetworkId() const
+{
+	return m_objectId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Unicode::String & MessageRegionListResponse::getLabel() const
+{
+	return m_label.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline float MessageRegionListResponse::getWorldX() const
+{
+	return m_worldX.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline float MessageRegionListResponse::getWorldZ() const
+{
+	return m_worldZ.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListResponse::getPvP() const
+{
+	return m_pvp.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListResponse::getBuildable() const
+{
+	return m_buildable.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListResponse::getSpawnable() const
+{
+	return m_spawnable.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListResponse::getMission() const
+{
+	return m_mission.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListResponse::getMunicipal() const
+{
+	return m_municipal.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListResponse::getGeographical() const
+{
+	return m_geographical.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListResponse::getGameServerId() const
+{
+	return m_gameServerId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListResponse::getMinDifficulty() const
+{
+	return m_minDifficulty.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline int MessageRegionListResponse::getMaxDifficulty() const
+{
+	return m_maxDifficulty.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MessageRegionListResponse_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NebulaLightningData.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NebulaLightningData.cpp
new file mode 100644
index 00000000..5815b1bf
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NebulaLightningData.cpp
@@ -0,0 +1,50 @@
+//======================================================================
+//
+// NebulaLightningData.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/NebulaLightningData.h"
+
+#include "Archive/Archive.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+//======================================================================
+
+NebulaLightningData::NebulaLightningData() :
+lightningId(0),
+nebulaId(0),
+syncStampStart(0),
+syncStampEnd(0),
+endpoint0(),
+endpoint1()
+{
+}
+
+//----------------------------------------------------------------------
+
+void NebulaLightningData::get(Archive::ReadIterator & source)
+{
+	Archive::get(source, lightningId);
+	Archive::get(source, nebulaId);
+	Archive::get(source, syncStampStart);
+	Archive::get(source, syncStampEnd);
+	Archive::get(source, endpoint0);
+	Archive::get(source, endpoint1);
+}
+
+//----------------------------------------------------------------------
+
+void NebulaLightningData::put(Archive::ByteStream & target) const
+{
+	Archive::put(target, lightningId);
+	Archive::put(target, nebulaId);
+	Archive::put(target, syncStampStart);
+	Archive::put(target, syncStampEnd);
+	Archive::put(target, endpoint0);
+	Archive::put(target, endpoint1);
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NebulaLightningData.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NebulaLightningData.h
new file mode 100644
index 00000000..37dd75d0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NebulaLightningData.h
@@ -0,0 +1,57 @@
+//======================================================================
+//
+// NebulaLightningData.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_NebulaLightningData_H
+#define INCLUDED_NebulaLightningData_H
+
+//======================================================================
+
+#include "sharedMath/Vector.h"
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+}
+
+//----------------------------------------------------------------------
+
+class NebulaLightningData
+{
+public:
+
+	NebulaLightningData();
+
+	uint16 lightningId;
+	int nebulaId;
+	uint32 syncStampStart;
+	uint32 syncStampEnd;
+	Vector endpoint0;
+	Vector endpoint1;
+
+	void get(Archive::ReadIterator & source);
+	void put(Archive::ByteStream & target) const;
+};
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	inline void get(ReadIterator & source, NebulaLightningData & target)
+	{
+		target.get(source);
+	}
+
+	inline void put(ByteStream & target, NebulaLightningData const& source)
+	{
+		source.put(target);
+	}
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NebulaLightningHitData.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NebulaLightningHitData.cpp
new file mode 100644
index 00000000..30114487
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NebulaLightningHitData.cpp
@@ -0,0 +1,49 @@
+//======================================================================
+//
+// NebulaLightningHitData.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/NebulaLightningHitData.h"
+
+#include "Archive/Archive.h"
+
+//======================================================================
+
+NebulaLightningHitData::NebulaLightningHitData() :
+lightningId(0),
+side(0),
+damage(0.0f)
+{
+}
+
+//----------------------------------------------------------------------
+
+NebulaLightningHitData::NebulaLightningHitData(uint16 _lightningId, int8 _side, float _damage) :
+lightningId(_lightningId),
+side(_side),
+damage(_damage)
+{
+}
+
+//----------------------------------------------------------------------
+
+void NebulaLightningHitData::get(Archive::ReadIterator & source)
+{
+	Archive::get(source, lightningId);
+	Archive::get(source, side);
+	Archive::get(source, damage);
+}
+
+//----------------------------------------------------------------------
+
+void NebulaLightningHitData::put(Archive::ByteStream & target) const
+{
+	Archive::put(target, lightningId);
+	Archive::put(target, side);
+	Archive::put(target, damage);
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NebulaLightningHitData.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NebulaLightningHitData.h
new file mode 100644
index 00000000..3fb353c3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NebulaLightningHitData.h
@@ -0,0 +1,53 @@
+//======================================================================
+//
+// NebulaLightningHitData.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_NebulaLightningHitData_H
+#define INCLUDED_NebulaLightningHitData_H
+
+//======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+}
+
+//----------------------------------------------------------------------
+
+class NebulaLightningHitData
+{
+public:
+
+	NebulaLightningHitData();
+	NebulaLightningHitData(uint16 _lightningId, int8 _side, float _damage);
+
+	uint16 lightningId;
+	int8 side;
+	float damage;
+
+	void get(Archive::ReadIterator & source);
+	void put(Archive::ByteStream & target) const;
+};
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	inline void get(ReadIterator & source, NebulaLightningHitData & target)
+	{
+		target.get(source);
+	}
+
+	inline void put(ByteStream & target, NebulaLightningHitData const& source)
+	{
+		source.put(target);
+	}
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialEnableHudElement.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialEnableHudElement.cpp
new file mode 100644
index 00000000..f88cd5f6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialEnableHudElement.cpp
@@ -0,0 +1,69 @@
+// ==================================================================
+//
+// NewbieTutorialEnableHudElement.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/NewbieTutorialEnableHudElement.h"
+
+// ==================================================================
+
+const char* const NewbieTutorialEnableHudElement::cms_name = "NewbieTutorialEnableHudElement";
+
+// ==================================================================
+
+NewbieTutorialEnableHudElement::NewbieTutorialEnableHudElement (const std::string& name, const bool enable, const float blinkTime) :
+	GameNetworkMessage ("NewbieTutorialEnableHudElement"),
+	m_name (name),
+	m_enable (enable),
+	m_blinkTime (blinkTime)
+{
+	addVariable (m_name);
+	addVariable (m_enable);
+	addVariable (m_blinkTime);
+}
+
+// ------------------------------------------------------------------
+
+NewbieTutorialEnableHudElement::NewbieTutorialEnableHudElement (Archive::ReadIterator& source) :
+	GameNetworkMessage ("NewbieTutorialEnableHudElement"),
+	m_name (),
+	m_enable (),
+	m_blinkTime ()
+{
+	addVariable (m_name);
+	addVariable (m_enable);
+	addVariable (m_blinkTime);
+	unpack (source);
+}
+
+// ------------------------------------------------------------------
+
+NewbieTutorialEnableHudElement::~NewbieTutorialEnableHudElement ()
+{
+}
+
+// ------------------------------------------------------------------
+
+const std::string& NewbieTutorialEnableHudElement::getName () const
+{
+	return m_name.get ();
+}
+
+// ------------------------------------------------------------------
+
+bool NewbieTutorialEnableHudElement::getEnable () const
+{
+	return m_enable.get ();
+}
+
+// ------------------------------------------------------------------
+
+float NewbieTutorialEnableHudElement::getBlinkTime () const
+{
+	return m_blinkTime.get ();
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialEnableHudElement.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialEnableHudElement.h
new file mode 100644
index 00000000..aef634b3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialEnableHudElement.h
@@ -0,0 +1,49 @@
+// ==================================================================
+//
+// NewbieTutorialEnableHudElement.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_NewbieTutorialEnableHudElement_H
+#define	INCLUDED_NewbieTutorialEnableHudElement_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ==================================================================
+
+class NewbieTutorialEnableHudElement : public GameNetworkMessage
+{
+public: 
+
+	NewbieTutorialEnableHudElement (const std::string& name, bool enable, float blinkTime);
+	explicit NewbieTutorialEnableHudElement (Archive::ReadIterator &source);
+	virtual ~NewbieTutorialEnableHudElement ();
+
+	const std::string& getName () const;
+	bool               getEnable () const;
+	float              getBlinkTime () const;
+
+public:
+
+	static const char* const cms_name;
+
+private:
+
+	NewbieTutorialEnableHudElement ();
+	NewbieTutorialEnableHudElement (const NewbieTutorialEnableHudElement&);
+	NewbieTutorialEnableHudElement& operator= (const NewbieTutorialEnableHudElement&);
+
+private:
+
+	Archive::AutoVariable<std::string> m_name;
+	Archive::AutoVariable<bool>        m_enable;
+	Archive::AutoVariable<float>       m_blinkTime;
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialEnableInterfaceElement.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialEnableInterfaceElement.cpp
new file mode 100644
index 00000000..7e49e957
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialEnableInterfaceElement.cpp
@@ -0,0 +1,58 @@
+// ==================================================================
+//
+// NewbieTutorialEnableInterfaceElement.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/NewbieTutorialEnableInterfaceElement.h"
+
+// ==================================================================
+
+const char* const NewbieTutorialEnableInterfaceElement::cms_name = "NewbieTutorialEnableInterfaceElement";
+
+// ==================================================================
+
+NewbieTutorialEnableInterfaceElement::NewbieTutorialEnableInterfaceElement (const std::string& name, const bool enable) :
+	GameNetworkMessage ("NewbieTutorialEnableInterfaceElement"),
+	m_name (name),
+	m_enable (enable)
+{
+	addVariable (m_name);
+	addVariable (m_enable);
+}
+
+// ------------------------------------------------------------------
+
+NewbieTutorialEnableInterfaceElement::NewbieTutorialEnableInterfaceElement (Archive::ReadIterator& source) :
+	GameNetworkMessage ("NewbieTutorialEnableInterfaceElement"),
+	m_name (),
+	m_enable ()
+{
+	addVariable (m_name);
+	addVariable (m_enable);
+	unpack (source);
+}
+
+// ------------------------------------------------------------------
+
+NewbieTutorialEnableInterfaceElement::~NewbieTutorialEnableInterfaceElement ()
+{
+}
+
+// ------------------------------------------------------------------
+
+const std::string& NewbieTutorialEnableInterfaceElement::getName () const
+{
+	return m_name.get ();
+}
+
+// ------------------------------------------------------------------
+
+bool NewbieTutorialEnableInterfaceElement::getEnable () const
+{
+	return m_enable.get ();
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialEnableInterfaceElement.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialEnableInterfaceElement.h
new file mode 100644
index 00000000..ed37ee65
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialEnableInterfaceElement.h
@@ -0,0 +1,47 @@
+// ==================================================================
+//
+// NewbieTutorialEnableInterfaceElement.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_NewbieTutorialEnableInterfaceElement_H
+#define	INCLUDED_NewbieTutorialEnableInterfaceElement_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ==================================================================
+
+class NewbieTutorialEnableInterfaceElement : public GameNetworkMessage
+{
+public: 
+
+	NewbieTutorialEnableInterfaceElement (const std::string& name, bool enable);
+	explicit NewbieTutorialEnableInterfaceElement (Archive::ReadIterator &source);
+	virtual ~NewbieTutorialEnableInterfaceElement ();
+
+	const std::string& getName () const;
+	bool               getEnable () const;
+
+public:
+
+	static const char* const cms_name;
+
+private:
+
+	NewbieTutorialEnableInterfaceElement ();
+	NewbieTutorialEnableInterfaceElement (const NewbieTutorialEnableInterfaceElement&);
+	NewbieTutorialEnableInterfaceElement& operator= (const NewbieTutorialEnableInterfaceElement&);
+
+private:
+
+	Archive::AutoVariable<std::string> m_name;
+	Archive::AutoVariable<bool>        m_enable;
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialHighlightUIElement.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialHighlightUIElement.cpp
new file mode 100644
index 00000000..77ed99fc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialHighlightUIElement.cpp
@@ -0,0 +1,58 @@
+// ==================================================================
+//
+// NewbieTutorialHighlightUIElement.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/NewbieTutorialHighlightUIElement.h"
+
+// ==================================================================
+
+const char* const NewbieTutorialHighlightUIElement::cms_name = "NewbieTutorialHighlightUIElement";
+
+// ==================================================================
+
+NewbieTutorialHighlightUIElement::NewbieTutorialHighlightUIElement (const std::string & widgetPath, float time) :
+	GameNetworkMessage ("NewbieTutorialHighlightUIElement"),
+	m_time (time),
+	m_widgetPath (widgetPath)
+{
+	addVariable (m_time);
+	addVariable (m_widgetPath);
+}
+
+// ------------------------------------------------------------------
+
+NewbieTutorialHighlightUIElement::NewbieTutorialHighlightUIElement (Archive::ReadIterator& source) :
+	GameNetworkMessage ("NewbieTutorialHighlightUIElement"),
+	m_time (),
+	m_widgetPath ()
+{
+	addVariable(m_time);
+	addVariable (m_widgetPath);
+	unpack (source);
+}
+
+// ------------------------------------------------------------------
+
+NewbieTutorialHighlightUIElement::~NewbieTutorialHighlightUIElement ()
+{
+}
+
+// ------------------------------------------------------------------
+
+const std::string& NewbieTutorialHighlightUIElement::getWidgetPath () const
+{
+	return m_widgetPath.get ();
+}
+
+// ------------------------------------------------------------------
+
+float NewbieTutorialHighlightUIElement::getTime () const
+{
+	return m_time.get ();
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialHighlightUIElement.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialHighlightUIElement.h
new file mode 100644
index 00000000..cd4817e5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialHighlightUIElement.h
@@ -0,0 +1,48 @@
+// ==================================================================
+//
+// NewbieTutorialHighlightUIElement.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_NewbieTutorialHighlightUIElement_H
+#define	INCLUDED_NewbieTutorialHighlightUIElement_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ==================================================================
+
+class NewbieTutorialHighlightUIElement : public GameNetworkMessage
+{
+public: 
+
+	NewbieTutorialHighlightUIElement (const std::string &widgetPath, float time);
+	explicit NewbieTutorialHighlightUIElement (Archive::ReadIterator &source);
+	virtual ~NewbieTutorialHighlightUIElement ();
+
+	float              getTime () const;	
+	const std::string& getWidgetPath () const;
+	
+public:
+
+	static const char* const cms_name;
+
+private:
+
+	NewbieTutorialHighlightUIElement ();
+	NewbieTutorialHighlightUIElement (const NewbieTutorialHighlightUIElement&);
+	NewbieTutorialHighlightUIElement& operator= (const NewbieTutorialHighlightUIElement&);
+
+private:
+
+	Archive::AutoVariable<float>       m_time;
+	Archive::AutoVariable<std::string> m_widgetPath;
+	
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialRequest.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialRequest.cpp
new file mode 100644
index 00000000..d2e2e2db
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialRequest.cpp
@@ -0,0 +1,47 @@
+// ==================================================================
+//
+// NewbieTutorialRequest.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/NewbieTutorialRequest.h"
+
+// ==================================================================
+
+const char* const NewbieTutorialRequest::cms_name = "NewbieTutorialRequest";
+
+// ==================================================================
+
+NewbieTutorialRequest::NewbieTutorialRequest (const std::string& request) :
+	GameNetworkMessage ("NewbieTutorialRequest"),
+	m_request (request)
+{
+	addVariable (m_request);
+}
+
+// ------------------------------------------------------------------
+
+NewbieTutorialRequest::NewbieTutorialRequest (Archive::ReadIterator& source) :
+	GameNetworkMessage ("NewbieTutorialRequest"),
+	m_request ()
+{
+	addVariable (m_request);
+	unpack (source);
+}
+
+// ------------------------------------------------------------------
+
+NewbieTutorialRequest::~NewbieTutorialRequest ()
+{
+}
+
+// ------------------------------------------------------------------
+
+const std::string& NewbieTutorialRequest::getRequest () const
+{
+	return m_request.get ();
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialRequest.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialRequest.h
new file mode 100644
index 00000000..0ecbf9b8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialRequest.h
@@ -0,0 +1,45 @@
+// ==================================================================
+//
+// NewbieTutorialRequest.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_NewbieTutorialRequest_H
+#define	INCLUDED_NewbieTutorialRequest_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ==================================================================
+
+class NewbieTutorialRequest : public GameNetworkMessage
+{
+public: 
+
+	explicit NewbieTutorialRequest (const std::string& request);
+	explicit NewbieTutorialRequest (Archive::ReadIterator &source);
+	virtual ~NewbieTutorialRequest ();
+
+	const std::string& getRequest () const;
+
+public:
+
+	static const char* const cms_name;
+
+private:
+
+	NewbieTutorialRequest ();
+	NewbieTutorialRequest (const NewbieTutorialRequest&);
+	NewbieTutorialRequest& operator= (const NewbieTutorialRequest&);
+
+private:
+
+	Archive::AutoVariable<std::string> m_request;
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialResponse.cpp
new file mode 100644
index 00000000..a446fe85
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialResponse.cpp
@@ -0,0 +1,47 @@
+// ==================================================================
+//
+// NewbieTutorialResponse.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/NewbieTutorialResponse.h"
+
+// ==================================================================
+
+const char* const NewbieTutorialResponse::cms_name = "NewbieTutorialResponse";
+
+// ==================================================================
+
+NewbieTutorialResponse::NewbieTutorialResponse (const std::string& response) :
+	GameNetworkMessage ("NewbieTutorialResponse"),
+	m_response (response)
+{
+	addVariable (m_response);
+}
+
+// ------------------------------------------------------------------
+
+NewbieTutorialResponse::NewbieTutorialResponse (Archive::ReadIterator& source) :
+	GameNetworkMessage ("NewbieTutorialResponse"),
+	m_response ()
+{
+	addVariable (m_response);
+	unpack (source);
+}
+
+// ------------------------------------------------------------------
+
+NewbieTutorialResponse::~NewbieTutorialResponse ()
+{
+}
+
+// ------------------------------------------------------------------
+
+const std::string& NewbieTutorialResponse::getResponse () const
+{
+	return m_response.get ();
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialResponse.h
new file mode 100644
index 00000000..52d289f3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialResponse.h
@@ -0,0 +1,45 @@
+// ==================================================================
+//
+// NewbieTutorialResponse.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_NewbieTutorialResponse_H
+#define	INCLUDED_NewbieTutorialResponse_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ==================================================================
+
+class NewbieTutorialResponse : public GameNetworkMessage
+{
+public: 
+
+	explicit NewbieTutorialResponse (const std::string& response);
+	explicit NewbieTutorialResponse (Archive::ReadIterator &source);
+	virtual ~NewbieTutorialResponse ();
+
+	const std::string& getResponse () const;
+
+public:
+
+	static const char* const cms_name;
+
+private:
+
+	NewbieTutorialResponse ();
+	NewbieTutorialResponse (const NewbieTutorialResponse&);
+	NewbieTutorialResponse& operator= (const NewbieTutorialResponse&);
+
+private:
+
+	Archive::AutoVariable<std::string> m_response;
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialSetToolbarElement.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialSetToolbarElement.cpp
new file mode 100644
index 00000000..385485c2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialSetToolbarElement.cpp
@@ -0,0 +1,81 @@
+// ==================================================================
+//
+// NewbieTutorialSetToolbarElement.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/NewbieTutorialSetToolbarElement.h"
+
+// ==================================================================
+
+const char* const NewbieTutorialSetToolbarElement::cms_name = "NewbieTutorialSetToolbarElement";
+
+// ==================================================================
+
+NewbieTutorialSetToolbarElement::NewbieTutorialSetToolbarElement (int slot, const std::string& commandName) :
+	GameNetworkMessage ("NewbieTutorialSetToolbarElement"),
+	m_slot (slot),
+	m_commandName (commandName),
+	m_object (-1)
+{
+	addVariable (m_slot);
+	addVariable (m_commandName);
+	addVariable (m_object);
+}
+// ==================================================================
+
+NewbieTutorialSetToolbarElement::NewbieTutorialSetToolbarElement (int slot, int64 object) :
+	GameNetworkMessage ("NewbieTutorialSetToolbarElement"),
+	m_slot (slot),
+	m_commandName (),
+	m_object (object)
+{
+	addVariable (m_slot);
+	addVariable (m_commandName);
+	addVariable (m_object);
+}
+
+// ------------------------------------------------------------------
+
+NewbieTutorialSetToolbarElement::NewbieTutorialSetToolbarElement (Archive::ReadIterator& source) :
+	GameNetworkMessage ("NewbieTutorialSetToolbarElement"),
+	m_slot (),
+	m_commandName (),
+	m_object()
+{
+	addVariable(m_slot);
+	addVariable (m_commandName);
+	addVariable(m_object);
+	unpack (source);
+}
+
+// ------------------------------------------------------------------
+
+NewbieTutorialSetToolbarElement::~NewbieTutorialSetToolbarElement ()
+{
+}
+
+// ------------------------------------------------------------------
+
+const std::string& NewbieTutorialSetToolbarElement::getCommandName () const
+{
+	return m_commandName.get ();
+}
+
+// ------------------------------------------------------------------
+
+int NewbieTutorialSetToolbarElement::getSlot () const
+{
+	return m_slot.get ();
+}
+
+// ------------------------------------------------------------------
+
+int64 NewbieTutorialSetToolbarElement::getObject () const
+{
+	return m_object.get ();
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialSetToolbarElement.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialSetToolbarElement.h
new file mode 100644
index 00000000..dba4d35c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/NewbieTutorialSetToolbarElement.h
@@ -0,0 +1,51 @@
+// ==================================================================
+//
+// NewbieTutorialSetToolbarElement.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_NewbieTutorialSetToolbarElement_H
+#define	INCLUDED_NewbieTutorialSetToolbarElement_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ==================================================================
+
+class NewbieTutorialSetToolbarElement : public GameNetworkMessage
+{
+public: 
+
+	NewbieTutorialSetToolbarElement (int slot, const std::string& commandName);
+	NewbieTutorialSetToolbarElement (int slot, int64 object);
+	explicit NewbieTutorialSetToolbarElement (Archive::ReadIterator &source);
+	virtual ~NewbieTutorialSetToolbarElement ();
+
+	int                getSlot () const;	
+	const std::string& getCommandName () const;
+	int64              getObject () const;
+	
+public:
+
+	static const char* const cms_name;
+
+private:
+
+	NewbieTutorialSetToolbarElement ();
+	NewbieTutorialSetToolbarElement (const NewbieTutorialSetToolbarElement&);
+	NewbieTutorialSetToolbarElement& operator= (const NewbieTutorialSetToolbarElement&);
+
+private:
+
+	Archive::AutoVariable<int>         m_slot;
+	Archive::AutoVariable<std::string> m_commandName;
+	Archive::AutoVariable<int64>       m_object;
+	
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectChannelMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectChannelMessages.cpp
new file mode 100644
index 00000000..17d6577c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectChannelMessages.cpp
@@ -0,0 +1,127 @@
+// ObjectChannelMessages.cpp
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ObjectChannelMessages.h"
+
+#include "sharedNetwork/NetworkHandler.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+
+//-----------------------------------------------------------------------
+namespace ObjectChannelMessagesNamespace
+{
+	MemoryBlockManager* ms_memoryBlockManager;
+}
+
+using namespace ObjectChannelMessagesNamespace;
+
+//-------------------------------------------------------------------
+
+void ObjControllerMessage::install (void)
+{
+	DEBUG_FATAL (ms_memoryBlockManager, ("ObjControllerMessage already installed"));
+
+	ms_memoryBlockManager = new MemoryBlockManager ("ObjControllerMessage::ms_memoryBlockManager", true, sizeof(ObjControllerMessage), 0, 0, 0);
+}
+
+//-------------------------------------------------------------------
+
+void ObjControllerMessage::remove (void)
+{
+	DEBUG_FATAL(!ms_memoryBlockManager, ("ObjControllerMessage is not installed"));
+
+	delete ms_memoryBlockManager;
+	ms_memoryBlockManager = 0;
+}
+
+//-------------------------------------------------------------------
+
+void *ObjControllerMessage::operator new (size_t size)
+{
+	UNREF (size);
+	NOT_NULL (ms_memoryBlockManager);
+	DEBUG_FATAL (size != sizeof (ObjControllerMessage), ("bad size"));
+	DEBUG_FATAL (size != static_cast<size_t> (ms_memoryBlockManager->getElementSize()), ("ObjControllerMessage installed with bad size"));
+
+	return ms_memoryBlockManager->allocate ();
+}
+
+//-------------------------------------------------------------------
+
+void ObjControllerMessage::operator delete (void *pointer)
+{
+	NOT_NULL (ms_memoryBlockManager);
+
+	ms_memoryBlockManager->free (pointer);
+}
+
+//-------------------------------------------------------------------
+
+ObjControllerMessage::ObjControllerMessage(const NetworkId newNetworkId, 
+										   const uint32 newMessage, 
+										   const real newValue, 
+										   const uint32 newFlags,
+										   MessageQueue::Data*  newData) :
+GameNetworkMessage("ObjControllerMessage"),
+data(newData),
+flags(newFlags),
+message(newMessage),				//lint !e713 //loss of precision
+networkId(newNetworkId),
+value(newValue)
+{
+	addVariable(flags);
+	addVariable(message);
+	addVariable(networkId);
+	addVariable(value);
+	DEBUG_FATAL(networkId.get() == NetworkId::cms_invalid, ("Trying to send a controller message to networkId 0\n"));
+	char msgDetail[256] = {"\0"};
+	snprintf(msgDetail, 255, "send.ObjControllerMessage.%lu", newMessage);
+	NetworkHandler::reportMessage(std::string(msgDetail), 0);
+}
+
+//-----------------------------------------------------------------------
+
+ObjControllerMessage::ObjControllerMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ObjControllerMessage"),
+data(0),
+flags(0),
+message(0),				
+networkId(NetworkId::cms_invalid),
+value(0)
+{
+	addVariable(flags);
+	addVariable(message);
+	addVariable(networkId);
+	addVariable(value);
+	AutoByteStream::unpack(source);
+	long int i = message.get();
+	data = ControllerMessageFactory::unpack(i, source); 
+	DEBUG_FATAL(networkId.get() == NetworkId::cms_invalid, ("Trying to send a controller message to networkId 0\n"));
+	char msgDetail[256] = {"\0"};
+	snprintf(msgDetail, 255, "recv.ObjControllerMessage.%lu", message.get());
+	NetworkHandler::reportMessage(std::string(msgDetail), 0);
+
+}
+
+//-----------------------------------------------------------------------
+
+ObjControllerMessage::~ObjControllerMessage()
+{
+	data = 0;
+}
+
+//-----------------------------------------------------------------------
+
+void ObjControllerMessage::pack(Archive::ByteStream & target) const
+{
+	GameNetworkMessage::pack(target);
+	ControllerMessageFactory::pack(message.get(), data, target);
+}
+
+
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectChannelMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectChannelMessages.h
new file mode 100644
index 00000000..c8e385ba
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectChannelMessages.h
@@ -0,0 +1,102 @@
+// ObjectChannelMessages.h
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_OBJECT_CHANNEL_MESSAGES_H
+#define	_OBJECT_CHANNEL_MESSAGES_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+class Object;
+
+//-----------------------------------------------------------------------
+
+
+class ObjControllerMessage : public GameNetworkMessage
+{
+public:
+	ObjControllerMessage	(const NetworkId newNetworkId, 
+							const uint32 newMessage, 
+							const float newValue, 
+							const uint32 newFlags,
+							MessageQueue::Data* newData);
+	explicit ObjControllerMessage	(Archive::ReadIterator & source);
+	virtual	~ObjControllerMessage	();
+	virtual void          pack(Archive::ByteStream & target) const;
+	MessageQueue::Data* getData(void);
+	const MessageQueue::Data* getData(void) const;
+	const uint32          getFlags(void) const;
+	const int32           getMessage(void) const;
+	const NetworkId       getNetworkId(void) const;
+	const real            getValue(void) const;
+
+	static void  install (void);
+	static void  remove (void);
+	static void* operator new (size_t size);
+	static void  operator delete (void* pointer);
+
+private:
+	mutable MessageQueue::Data*   data;
+	Archive::AutoVariable<uint32>            flags;
+	Archive::AutoVariable<int32>             message;
+	Archive::AutoVariable<NetworkId>               networkId;
+	Archive::AutoVariable<real>              value;
+	//Todo: add getReliable() method
+
+	ObjControllerMessage();
+	ObjControllerMessage(const ObjControllerMessage&);
+	ObjControllerMessage& operator= (const ObjControllerMessage&);
+
+
+};
+
+//-----------------------------------------------------------------------
+
+inline MessageQueue::Data* ObjControllerMessage::getData(void)
+{
+	return data;
+}
+
+//-----------------------------------------------------------------------
+
+inline const MessageQueue::Data* ObjControllerMessage::getData(void) const
+{
+	return data;
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint32 ObjControllerMessage::getFlags(void) const
+{
+	return flags.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const int32 ObjControllerMessage::getMessage(void) const
+{
+	return message.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId ObjControllerMessage::getNetworkId(void) const
+{
+	return networkId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const real ObjControllerMessage::getValue(void) const
+{
+	return value.get();
+}
+
+//-----------------------------------------------------------------------
+
+
+
+#endif	// _OBJECT_CHANNEL_MESSAGES_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestData.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestData.cpp
new file mode 100644
index 00000000..20e9aa23
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestData.cpp
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// ObjectMenuRequestData.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ObjectMenuRequestData.h"
+#include "LocalizationManager.h"
+
+//----------------------------------------------------------------------
+
+const uint8 ObjectMenuRequestData::F_enabled      = 0x0001;
+const uint8 ObjectMenuRequestData::F_serverNotify = 0x0002;
+const uint8 ObjectMenuRequestData::F_outOfRange   = 0x0004;
+
+//----------------------------------------------------------------------
+
+void ObjectMenuRequestData::setOutOfRange  (bool b)
+{
+	if (b)
+		m_flags |= F_outOfRange;
+	else
+		m_flags &= ~F_outOfRange;
+}
+
+//-----------------------------------------------------------------------
+
+void ObjectMenuRequestData::setServerNotify  (bool b)
+{
+	if (b)
+		m_flags |= F_serverNotify;
+	else
+		m_flags &= ~F_serverNotify;
+}
+//----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestData.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestData.h
new file mode 100644
index 00000000..5290710f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestData.h
@@ -0,0 +1,121 @@
+
+
+// ======================================================================
+//
+// ObjectMenuRequestData.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ObjectMenuRequestData_H
+#define INCLUDED_ObjectMenuRequestData_H
+
+//-----------------------------------------------------------------------
+
+#include "Unicode.h"
+#include "StringId.h"
+#include "unicodeArchive/UnicodeArchive.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+//----------------------------------------------------------------------
+
+struct ObjectMenuRequestData
+{
+	static const uint8 F_enabled;
+	static const uint8 F_serverNotify;
+	static const uint8 F_outOfRange;
+
+	//----------------------------------------------------------------------
+
+	uint8           m_id;
+	uint8           m_parent;
+	uint16          m_menuItemType; // menu item action id (i.e. ITEM_ROTATE_RIGHT)
+	uint8           m_flags;
+	Unicode::String m_label;
+	StringId        m_labelId;
+
+	//----------------------------------------------------------------------
+
+	ObjectMenuRequestData (uint8 id, uint8 parent, uint16 menuItemType, const Unicode::String & label, bool enabled, bool serverNotify);
+	ObjectMenuRequestData ();
+
+	bool hasFlag        (uint8 f) const;
+	bool isEnabled      () const;
+	bool isServerNotify () const;
+	bool isOutOfRange   () const;
+	void setOutOfRange  (bool b);
+	void setServerNotify(bool b);
+
+	bool operator==(const ObjectMenuRequestData & rhs) const;
+};
+
+//----------------------------------------------------------------------
+
+inline ObjectMenuRequestData::ObjectMenuRequestData (uint8 id, uint8 parent, uint16 menuItemType, const Unicode::String & label, bool enabled, bool serverNotify) :
+m_id (id),
+m_parent (parent),
+m_menuItemType (menuItemType),
+m_flags (0),
+m_label (label),
+m_labelId ()
+{
+	if (enabled)
+		m_flags |= F_enabled;
+	if (serverNotify)
+		m_flags |= F_serverNotify;
+}
+
+//----------------------------------------------------------------------
+
+inline ObjectMenuRequestData::ObjectMenuRequestData () :
+m_id (0),
+m_parent (0),
+m_menuItemType (0),
+m_flags (F_enabled),
+m_label (),
+m_labelId ()
+{
+}
+
+//----------------------------------------------------------------------
+
+inline bool ObjectMenuRequestData::hasFlag (uint8 f) const
+{
+	return (m_flags & f) != 0;
+}
+
+//----------------------------------------------------------------------
+
+inline bool ObjectMenuRequestData::isEnabled () const
+{
+	return hasFlag (F_enabled);
+}
+
+//----------------------------------------------------------------------
+
+inline bool ObjectMenuRequestData::isServerNotify () const
+{
+	return hasFlag (F_serverNotify);
+}
+
+//----------------------------------------------------------------------
+
+inline bool ObjectMenuRequestData::isOutOfRange   () const
+{
+	return hasFlag (F_outOfRange);
+}
+
+//----------------------------------------------------------------------
+
+/**
+* Equality deliberately ignores flags & strings since they are usually transient.
+*/
+
+inline bool ObjectMenuRequestData::operator==(const ObjectMenuRequestData & rhs) const
+{
+	return (m_id == rhs.m_id) && (m_parent == rhs.m_parent) && (m_menuItemType == rhs.m_menuItemType);
+}
+
+//----------------------------------------------------------------------
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestDataArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestDataArchive.h
new file mode 100644
index 00000000..6d6fc88f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuRequestDataArchive.h
@@ -0,0 +1,50 @@
+
+
+// ======================================================================
+//
+// ObjectMenuRequestDataArchive.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ObjectMenuRequestDataArchive_H
+#define INCLUDED_ObjectMenuRequestDataArchive_H
+
+//-----------------------------------------------------------------------
+
+#include "unicodeArchive/UnicodeArchive.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/ObjectMenuRequestData.h"
+#include "Archive/Archive.h"
+
+//-----------------------------------------------------------------------
+
+namespace Archive
+{
+	
+	//-----------------------------------------------------------------------
+	
+	inline void get(ReadIterator & source, ObjectMenuRequestData & target)
+	{
+		get(source, target.m_id);
+		get(source, target.m_parent);
+		get(source, target.m_menuItemType);
+		get(source, target.m_flags);
+		get(source, target.m_label);
+	}
+	
+	//-----------------------------------------------------------------------
+	
+	inline void put(ByteStream & target, const ObjectMenuRequestData & source)
+	{
+		put(target, source.m_id);
+		put(target, source.m_parent);
+		put(target, source.m_menuItemType);
+		put(target, source.m_flags);
+		put(target, source.m_label);
+	}
+}
+
+//----------------------------------------------------------------------
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuSelectMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuSelectMessage.cpp
new file mode 100644
index 00000000..8d23567e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuSelectMessage.cpp
@@ -0,0 +1,46 @@
+// ======================================================================
+//
+// ObjectMenuSelectMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ObjectMenuSelectMessage.h"
+
+//-----------------------------------------------------------------------
+
+const char * const ObjectMenuSelectMessage::MESSAGE_TYPE = "ObjectMenuSelectMessage::MESSAGE_TYPE";
+
+//-----------------------------------------------------------------
+
+ObjectMenuSelectMessage::ObjectMenuSelectMessage (const NetworkId & playerId, uint16 selectedId) :
+GameNetworkMessage (MESSAGE_TYPE),
+m_playerId (playerId),
+m_selectedItemId (selectedId)
+{
+	addVariable (m_playerId);
+	addVariable (m_selectedItemId);
+}
+
+//-----------------------------------------------------------------------
+
+ObjectMenuSelectMessage::ObjectMenuSelectMessage (Archive::ReadIterator & source) :
+GameNetworkMessage (MESSAGE_TYPE),
+m_playerId (),
+m_selectedItemId ()
+{
+	addVariable (m_playerId);
+	addVariable (m_selectedItemId);
+	unpack (source);
+}
+
+//----------------------------------------------------------------------
+
+ObjectMenuSelectMessage::~ObjectMenuSelectMessage ()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuSelectMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuSelectMessage.h
new file mode 100644
index 00000000..bbbf3e45
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ObjectMenuSelectMessage.h
@@ -0,0 +1,63 @@
+
+// ======================================================================
+//
+// ObjectMenuSelectMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ObjectMenuSelectMessage_H
+#define INCLUDED_ObjectMenuSelectMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class GameInByteStream;
+class GameOutByteStream;
+
+//-----------------------------------------------------------------------
+
+class ObjectMenuSelectMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MESSAGE_TYPE;
+
+	           ObjectMenuSelectMessage (const NetworkId & playerId, uint16 selectedId);
+	explicit   ObjectMenuSelectMessage (Archive::ReadIterator & source);
+	virtual   ~ObjectMenuSelectMessage ();
+
+	const NetworkId &                       getNetworkId () const;
+	const int                               getSelectedItemId () const;
+
+private:
+
+	Archive::AutoVariable<NetworkId>        m_playerId;
+	Archive::AutoVariable<uint16>           m_selectedItemId;
+
+private:
+	ObjectMenuSelectMessage(const ObjectMenuSelectMessage&);
+	ObjectMenuSelectMessage& operator= (const ObjectMenuSelectMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & ObjectMenuSelectMessage::getNetworkId () const
+{
+	return m_playerId.get ();
+}
+
+//----------------------------------------------------------------------
+
+inline const int ObjectMenuSelectMessage::getSelectedItemId () const
+{
+	return static_cast<int>(m_selectedItemId.get ());
+}
+
+//-----------------------------------------------------------------
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/OpenHolocronToPageMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/OpenHolocronToPageMessage.cpp
new file mode 100644
index 00000000..865c0397
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/OpenHolocronToPageMessage.cpp
@@ -0,0 +1,45 @@
+// ======================================================================
+//
+// OpenHolocronToPageMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/OpenHolocronToPageMessage.h"
+
+#include "Archive/ByteStream.h"
+#include "Archive/AutoByteStream.h"
+
+// ======================================================================
+
+const char * const OpenHolocronToPageMessage::MessageType = "OpenHolocronToPageMessage";
+
+// ======================================================================
+
+OpenHolocronToPageMessage::OpenHolocronToPageMessage(const std::string& page)
+: GameNetworkMessage(MessageType),
+  m_page(page)
+{
+	addVariable(m_page);
+}
+
+//-----------------------------------------------------------------------
+
+OpenHolocronToPageMessage::OpenHolocronToPageMessage(Archive::ReadIterator& source)
+: GameNetworkMessage(MessageType),
+  m_page()
+{
+	addVariable (m_page);
+	unpack (source);
+}
+
+//-----------------------------------------------------------------------
+
+const std::string&      OpenHolocronToPageMessage::getPage() const
+{
+	return m_page.get();
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/OpenHolocronToPageMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/OpenHolocronToPageMessage.h
new file mode 100644
index 00000000..c5649a9c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/OpenHolocronToPageMessage.h
@@ -0,0 +1,44 @@
+
+// ======================================================================
+//
+// OpenHolocronToPageMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_OpenHolocronToPageMessage_H
+#define INCLUDED_OpenHolocronToPageMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/Archive.h"
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class GameInByteStream;
+class GameOutByteStream;
+
+//-----------------------------------------------------------------------
+
+/** The network message to open the client's holocube window and display a particular page
+ */
+class OpenHolocronToPageMessage : public GameNetworkMessage
+{
+public:
+	OpenHolocronToPageMessage(const std::string& page);
+	explicit OpenHolocronToPageMessage (Archive::ReadIterator& source);
+
+	const std::string&           getPage() const;
+
+	static const char * const MessageType;
+
+private:
+	//the name of the page to use
+	Archive::AutoVariable<std::string> m_page;
+};
+
+//-----------------------------------------------------------------------
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ParametersMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ParametersMessage.cpp
new file mode 100644
index 00000000..85084596
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ParametersMessage.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// ParametersMessage.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ParametersMessage.h"
+
+// ======================================================================
+
+ParametersMessage::ParametersMessage(int weatherUpdateInterval) :
+		GameNetworkMessage("ParametersMessage"),
+		m_weatherUpdateInterval(weatherUpdateInterval)
+{
+	addVariable(m_weatherUpdateInterval);
+}
+
+//-----------------------------------------------------------------------
+
+ParametersMessage::ParametersMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("ParametersMessage"),
+		m_weatherUpdateInterval()
+{
+	addVariable(m_weatherUpdateInterval);
+
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ParametersMessage::~ParametersMessage()
+{
+}
+
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ParametersMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ParametersMessage.h
new file mode 100644
index 00000000..cf0e78de
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ParametersMessage.h
@@ -0,0 +1,58 @@
+// ======================================================================
+//
+// ParametersMessage.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ParametersMessage_H
+#define INCLUDED_ParametersMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/** 
+ * Sent from:  Game Server
+ * Sent to:    Client
+ * Action:     Tells the client the value of various server settings
+ *             that it needs to know about.  This message is sent whenever
+ *             the client connects to a game server, so the client may
+ *             receive it more than once.
+ *
+ *             For now, if it receives it
+ *             more than once, it is entitled to ignore the second message.
+ *             We may change this rule in the future if different servers are
+ *             allowed to have different settings for any of the things in
+ *             this message.
+ */
+class ParametersMessage : public GameNetworkMessage
+{
+  public:
+	ParametersMessage(int weatherUpdateInterval);
+	explicit ParametersMessage(Archive::ReadIterator & source);
+	virtual ~ParametersMessage();
+
+  public:
+	int getWeatherUpdateInterval() const;
+	
+  private:
+	Archive::AutoVariable<int> m_weatherUpdateInterval;
+
+	ParametersMessage();
+	ParametersMessage(const ParametersMessage&);
+	ParametersMessage& operator= (const ParametersMessage&);
+};
+
+// ----------------------------------------------------------------------
+
+inline int ParametersMessage::getWeatherUpdateInterval() const
+{
+	return m_weatherUpdateInterval.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListRequest.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListRequest.cpp
new file mode 100644
index 00000000..aa33fbf0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListRequest.cpp
@@ -0,0 +1,69 @@
+// ==================================================================
+//
+// PlanetTravelPointListRequest.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/PlanetTravelPointListRequest.h"
+
+// ==================================================================
+
+const char* const PlanetTravelPointListRequest::cms_name = "PlanetTravelPointListRequest";
+
+// ==================================================================
+
+PlanetTravelPointListRequest::PlanetTravelPointListRequest (const NetworkId& networkId, const std::string& planetName, int sequenceId) :
+GameNetworkMessage (cms_name),
+m_networkId        (networkId),
+m_planetName       (planetName),
+m_sequenceId       (sequenceId)
+{
+	addVariable (m_networkId);
+	addVariable (m_planetName);
+//	addVariable (m_sequenceId);
+}
+
+// ------------------------------------------------------------------
+
+PlanetTravelPointListRequest::PlanetTravelPointListRequest (Archive::ReadIterator& source) :
+GameNetworkMessage (cms_name),
+m_networkId  (),
+m_planetName (),
+m_sequenceId (0)
+{
+	addVariable (m_networkId);
+	addVariable (m_planetName);
+//	addVariable (m_sequenceId);
+	unpack (source);
+}
+
+// ------------------------------------------------------------------
+
+PlanetTravelPointListRequest::~PlanetTravelPointListRequest ()
+{
+}
+
+// ------------------------------------------------------------------
+
+const NetworkId& PlanetTravelPointListRequest::getNetworkId () const
+{
+	return m_networkId.get ();
+}
+
+// ------------------------------------------------------------------
+
+const std::string& PlanetTravelPointListRequest::getPlanetName () const
+{
+	return m_planetName.get ();
+}
+
+//----------------------------------------------------------------------
+
+int PlanetTravelPointListRequest::getSequenceId () const
+{
+	return m_sequenceId.get ();
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListRequest.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListRequest.h
new file mode 100644
index 00000000..192865b0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListRequest.h
@@ -0,0 +1,44 @@
+// ==================================================================
+//
+// PlanetTravelPointListRequest.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_PlanetTravelPointListRequest_H
+#define	INCLUDED_PlanetTravelPointListRequest_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ==================================================================
+
+class PlanetTravelPointListRequest : public GameNetworkMessage
+{
+public: 
+
+	PlanetTravelPointListRequest (const NetworkId& networkId, const std::string& planetName, int sequenceId);
+	explicit PlanetTravelPointListRequest (Archive::ReadIterator &source);
+	virtual ~PlanetTravelPointListRequest();
+
+	const NetworkId&   getNetworkId  () const;
+	const std::string& getPlanetName () const;
+	int                getSequenceId () const;
+
+public:
+
+	static const char* const cms_name;
+
+private:
+
+	Archive::AutoVariable<NetworkId>   m_networkId;
+	Archive::AutoVariable<std::string> m_planetName;
+	Archive::AutoVariable<int>         m_sequenceId;
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListResponse.cpp
new file mode 100644
index 00000000..1507aca8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListResponse.cpp
@@ -0,0 +1,109 @@
+// ==================================================================
+//
+// PlanetTravelPointListResponse.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/PlanetTravelPointListResponse.h"
+
+#include "sharedMathArchive/VectorArchive.h"
+
+// ==================================================================
+
+const char* const PlanetTravelPointListResponse::cms_name = "PlanetTravelPointListResponse";
+
+// ==================================================================
+
+PlanetTravelPointListResponse::PlanetTravelPointListResponse (const std::string& planetName, const std::vector<std::string>& travelPointNameList, const std::vector<Vector>& travelPointPointList, const std::vector<int>& travelPointCostList, const std::vector<bool>& travelPointInterplanetaryList, int sequenceId) :
+GameNetworkMessage (cms_name),
+m_planetName (planetName),
+m_travelPointNameList (),
+m_travelPointPointList (),
+m_travelPointCostList (),
+m_travelPointInterplanetaryList (),
+m_sequenceId                    (sequenceId)
+{
+	m_travelPointNameList.set (travelPointNameList);
+	m_travelPointPointList.set (travelPointPointList);
+	m_travelPointCostList.set (travelPointCostList);
+	m_travelPointInterplanetaryList.set (travelPointInterplanetaryList);
+	
+	addVariable (m_planetName);
+	addVariable (m_travelPointNameList);
+	addVariable (m_travelPointPointList);
+	addVariable (m_travelPointCostList);
+	addVariable (m_travelPointInterplanetaryList);
+//	addVariable (m_sequenceId);
+}
+
+// ------------------------------------------------------------------
+
+PlanetTravelPointListResponse::PlanetTravelPointListResponse (Archive::ReadIterator& source) :
+GameNetworkMessage (cms_name),
+m_planetName (),
+m_travelPointNameList (),
+m_travelPointPointList (),
+m_travelPointCostList (),
+m_travelPointInterplanetaryList (),
+m_sequenceId                    (0)
+{
+	addVariable (m_planetName);
+	addVariable (m_travelPointNameList);
+	addVariable (m_travelPointPointList);
+	addVariable (m_travelPointCostList);
+	addVariable (m_travelPointInterplanetaryList);
+//	addVariable (m_sequenceId);
+	unpack (source);
+}
+
+// ------------------------------------------------------------------
+
+PlanetTravelPointListResponse::~PlanetTravelPointListResponse ()
+{
+}
+
+// ------------------------------------------------------------------
+
+const std::string& PlanetTravelPointListResponse::getPlanetName () const
+{
+	return m_planetName.get ();
+}
+
+// ------------------------------------------------------------------
+
+const std::vector<std::string>& PlanetTravelPointListResponse::getTravelPointNameList () const
+{
+	return m_travelPointNameList.get ();
+}
+
+// ------------------------------------------------------------------
+
+const std::vector<Vector>& PlanetTravelPointListResponse::getTravelPointPointList () const
+{
+	return m_travelPointPointList.get ();
+}
+
+// ------------------------------------------------------------------
+
+const std::vector<int>& PlanetTravelPointListResponse::getTravelPointCostList () const
+{
+	return m_travelPointCostList.get ();
+}
+
+// ------------------------------------------------------------------
+
+const std::vector<bool>& PlanetTravelPointListResponse::getTravelPointInterplanetaryList () const
+{
+	return m_travelPointInterplanetaryList.get ();
+}
+
+//----------------------------------------------------------------------
+
+const int PlanetTravelPointListResponse::getSequenceId                    () const
+{
+	return m_sequenceId.get ();
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListResponse.h
new file mode 100644
index 00000000..0e2c6e0f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlanetTravelPointListResponse.h
@@ -0,0 +1,54 @@
+// ==================================================================
+//
+// PlanetTravelPointListResponse.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_PlanetTravelPointListResponse_H
+#define	INCLUDED_PlanetTravelPointListResponse_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Vector.h"
+
+// ==================================================================
+
+class PlanetTravelPointListResponse : public GameNetworkMessage
+{
+public: 
+
+	PlanetTravelPointListResponse (const std::string& planetName, const std::vector<std::string>& travelPointNameList, const std::vector<Vector>& travelPointPointList, const std::vector<int>& travelPointCostList, const std::vector<bool>& travelPointInterplanetaryList, int sequenceId);
+	explicit PlanetTravelPointListResponse (Archive::ReadIterator &source);
+	virtual ~PlanetTravelPointListResponse();
+
+	const std::string&              getPlanetName                    () const;
+	const std::vector<std::string>& getTravelPointNameList           () const;
+	const std::vector<Vector>&      getTravelPointPointList          () const;
+	const std::vector<int>&         getTravelPointCostList           () const;
+	const std::vector<bool>&        getTravelPointInterplanetaryList () const;
+	const int                       getSequenceId                    () const;
+
+private:
+
+	PlanetTravelPointListResponse ();
+
+public:
+
+	static const char* const cms_name;
+
+private:
+
+	Archive::AutoVariable<std::string> m_planetName;
+	Archive::AutoArray<std::string>    m_travelPointNameList;
+	Archive::AutoArray<Vector>         m_travelPointPointList;
+	Archive::AutoArray<int>            m_travelPointCostList;
+	Archive::AutoArray<bool>           m_travelPointInterplanetaryList;
+	Archive::AutoVariable<int>         m_sequenceId;
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayCutSceneMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayCutSceneMessage.cpp
new file mode 100644
index 00000000..74a07c2a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayCutSceneMessage.cpp
@@ -0,0 +1,47 @@
+// ======================================================================
+//
+// PlayCutSceneMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/PlayCutSceneMessage.h"
+
+// ======================================================================
+
+PlayCutSceneMessage::PlayCutSceneMessage(std::string const &cutSceneName) :
+	GameNetworkMessage("PlayCutSceneMessage")
+,	m_cutSceneName(cutSceneName)
+{
+	AutoByteStream::addVariable(m_cutSceneName);
+}
+
+// ----------------------------------------------------------------------
+
+PlayCutSceneMessage::PlayCutSceneMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("PlayCutSceneMessage")
+,	m_cutSceneName()
+{
+	AutoByteStream::addVariable(m_cutSceneName);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+PlayCutSceneMessage::~PlayCutSceneMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+const std::string & PlayCutSceneMessage::getCutSceneName() const
+{
+	return m_cutSceneName.get();
+}
+
+// ----------------------------------------------------------------------
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayCutSceneMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayCutSceneMessage.h
new file mode 100644
index 00000000..02a213a5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayCutSceneMessage.h
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// PlayCutSceneMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_PlayCutSceneMessage_H
+#define	_PlayCutSceneMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class PlayCutSceneMessage : public GameNetworkMessage
+{
+public: //ctor/dtor
+	explicit PlayCutSceneMessage(std::string const &cutSceneName);
+	explicit PlayCutSceneMessage(Archive::ReadIterator &source);
+
+	~PlayCutSceneMessage();
+
+public: // methods
+
+	std::string const &  getCutSceneName() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<std::string>  m_cutSceneName;
+};
+
+// ----------------------------------------------------------------------
+
+#endif // _PlayCutSceneMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayMusicMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayMusicMessage.cpp
new file mode 100644
index 00000000..3666fe10
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayMusicMessage.cpp
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// PlayMusicMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/PlayMusicMessage.h"
+
+// ======================================================================
+
+PlayMusicMessage::PlayMusicMessage(std::string const &musicName, NetworkId const &sourceObjId, uint32 playType, bool loop) :
+	GameNetworkMessage("PlayMusicMessage"),
+	m_musicName(musicName),
+	m_sourceObjId(sourceObjId),
+	m_playType(playType),
+	m_loop(loop)
+{
+	AutoByteStream::addVariable(m_musicName);
+	AutoByteStream::addVariable(m_sourceObjId);
+	AutoByteStream::addVariable(m_playType);
+	AutoByteStream::addVariable(m_loop);
+}
+
+// ----------------------------------------------------------------------
+
+PlayMusicMessage::PlayMusicMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("PlayMusicMessage"),
+	m_musicName(),
+	m_sourceObjId(),
+	m_playType(),
+	m_loop()
+{
+	AutoByteStream::addVariable(m_musicName);
+	AutoByteStream::addVariable(m_sourceObjId);
+	AutoByteStream::addVariable(m_playType);
+	AutoByteStream::addVariable(m_loop);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+PlayMusicMessage::~PlayMusicMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayMusicMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayMusicMessage.h
new file mode 100644
index 00000000..ad3e4676
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayMusicMessage.h
@@ -0,0 +1,74 @@
+// ======================================================================
+//
+// PlayMusicMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_PlayMusicMessage_H
+#define	_PlayMusicMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class PlayMusicMessage : public GameNetworkMessage
+{
+public: //ctor/dtor
+	PlayMusicMessage(std::string const &musicName, NetworkId const &sourceObjId, uint32 playType, bool loop);
+	explicit PlayMusicMessage(Archive::ReadIterator &source);
+
+	~PlayMusicMessage();
+
+public: // methods
+
+	std::string const &  getMusicName() const;
+	NetworkId const &    getSourceObjId() const;
+	uint32               getPlayType() const;
+	bool                 getLoop() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<std::string>  m_musicName;
+	Archive::AutoVariable<NetworkId>    m_sourceObjId;
+	Archive::AutoVariable<uint32>       m_playType;
+	Archive::AutoVariable<bool>         m_loop;
+};
+
+// ----------------------------------------------------------------------
+
+inline std::string const &PlayMusicMessage::getMusicName() const
+{
+	return m_musicName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &PlayMusicMessage::getSourceObjId() const
+{
+	return m_sourceObjId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 PlayMusicMessage::getPlayType() const
+{
+	return m_playType.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline bool PlayMusicMessage::getLoop() const
+{
+	return m_loop.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _PlayMusicMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayerMoneyRequest.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayerMoneyRequest.cpp
new file mode 100644
index 00000000..a78b1b2d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayerMoneyRequest.cpp
@@ -0,0 +1,36 @@
+//======================================================================
+//
+// PlayerMoneyRequest.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/PlayerMoneyRequest.h"
+
+//-----------------------------------------------------------------------
+
+const char * const PlayerMoneyRequest::MessageType = "PlayerMoneyRequest";
+
+//----------------------------------------------------------------------
+
+PlayerMoneyRequest::PlayerMoneyRequest() :
+GameNetworkMessage (MessageType)
+{
+}
+
+//-----------------------------------------------------------------------
+
+PlayerMoneyRequest::PlayerMoneyRequest(Archive::ReadIterator & source) :
+GameNetworkMessage (MessageType)
+{
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+PlayerMoneyRequest::~PlayerMoneyRequest()
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayerMoneyRequest.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayerMoneyRequest.h
new file mode 100644
index 00000000..f76fa7b9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayerMoneyRequest.h
@@ -0,0 +1,34 @@
+//======================================================================
+//
+// PlayerMoneyRequest.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_PlayerMoneyRequest_H
+#define INCLUDED_PlayerMoneyRequest_H
+
+//======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class PlayerMoneyRequest : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	PlayerMoneyRequest  ();
+	PlayerMoneyRequest  (Archive::ReadIterator &);
+	~PlayerMoneyRequest ();
+
+private:
+	PlayerMoneyRequest & operator = (const PlayerMoneyRequest & rhs);
+	PlayerMoneyRequest (const PlayerMoneyRequest & source);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayerMoneyResponse.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayerMoneyResponse.cpp
new file mode 100644
index 00000000..f8b452c3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayerMoneyResponse.cpp
@@ -0,0 +1,45 @@
+//======================================================================
+//
+// PlayerMoneyResponse.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/PlayerMoneyResponse.h"
+
+//-----------------------------------------------------------------------
+
+const char * const PlayerMoneyResponse::MessageType = "PlayerMoneyResponse";
+
+//----------------------------------------------------------------------
+
+PlayerMoneyResponse::PlayerMoneyResponse() :
+GameNetworkMessage   (MessageType),
+m_balanceCash        (0),
+m_balanceBank        (0)
+{
+	addVariable (m_balanceCash);
+	addVariable (m_balanceBank);
+}
+
+//-----------------------------------------------------------------------
+
+PlayerMoneyResponse::PlayerMoneyResponse(Archive::ReadIterator & source) :
+GameNetworkMessage   (MessageType),
+m_balanceCash        (0),
+m_balanceBank        (0)
+{
+	addVariable (m_balanceCash);
+	addVariable (m_balanceBank);
+
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+PlayerMoneyResponse::~PlayerMoneyResponse()
+{
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayerMoneyResponse.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayerMoneyResponse.h
new file mode 100644
index 00000000..cf76347a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PlayerMoneyResponse.h
@@ -0,0 +1,37 @@
+//======================================================================
+//
+// PlayerMoneyResponse.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_PlayerMoneyResponse_H
+#define INCLUDED_PlayerMoneyResponse_H
+
+//======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class PlayerMoneyResponse : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	PlayerMoneyResponse  ();
+	PlayerMoneyResponse  (Archive::ReadIterator &);
+	~PlayerMoneyResponse ();
+
+	Archive::AutoVariable<int>                  m_balanceCash;
+	Archive::AutoVariable<int>                  m_balanceBank;
+
+private:
+	PlayerMoneyResponse & operator = (const PlayerMoneyResponse & rhs);
+	PlayerMoneyResponse(const PlayerMoneyResponse & source);
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PopulateMissionBrowserMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PopulateMissionBrowserMessage.cpp
new file mode 100644
index 00000000..961602ea
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PopulateMissionBrowserMessage.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// PopulateMissionBrowserMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/PopulateMissionBrowserMessage.h"
+
+// ======================================================================
+
+PopulateMissionBrowserMessage::PopulateMissionBrowserMessage(std::vector<NetworkId> const &missions) :
+	GameNetworkMessage("PopulateMissionBrowserMessage"),
+	m_missions()
+{
+	m_missions.set(missions);
+	AutoByteStream::addVariable(m_missions);
+}
+
+// ----------------------------------------------------------------------
+
+PopulateMissionBrowserMessage::PopulateMissionBrowserMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("PopulateMissionBrowserMessage"),
+	m_missions()
+{
+	AutoByteStream::addVariable(m_missions);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+PopulateMissionBrowserMessage::~PopulateMissionBrowserMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PopulateMissionBrowserMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PopulateMissionBrowserMessage.h
new file mode 100644
index 00000000..7854292a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PopulateMissionBrowserMessage.h
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// PopulateMissionBrowserMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_PopulateMissionBrowserMessage_H
+#define	_PopulateMissionBrowserMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class PopulateMissionBrowserMessage : public GameNetworkMessage
+{
+public:
+
+	PopulateMissionBrowserMessage(stdvector<NetworkId>::fwd const & missions);
+	explicit PopulateMissionBrowserMessage(Archive::ReadIterator &source);
+
+	~PopulateMissionBrowserMessage();
+
+public: // methods
+
+	stdvector<NetworkId>::fwd const &getMissions() const;
+
+public: // types
+
+private: 
+	Archive::AutoArray<NetworkId>    m_missions;
+};
+
+// ----------------------------------------------------------------------
+
+inline stdvector<NetworkId>::fwd const & PopulateMissionBrowserMessage::getMissions() const
+{
+	return m_missions.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _PopulateMissionBrowserMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RequestGalaxyLoopTimes.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RequestGalaxyLoopTimes.cpp
new file mode 100644
index 00000000..f2f56959
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RequestGalaxyLoopTimes.cpp
@@ -0,0 +1,32 @@
+// RequestGalaxyLoopTimes.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/RequestGalaxyLoopTimes.h"
+
+//-----------------------------------------------------------------------
+
+RequestGalaxyLoopTimes::RequestGalaxyLoopTimes() :
+GameNetworkMessage("RequestGalaxyLoopTimes")
+{
+}
+
+//-----------------------------------------------------------------------
+
+RequestGalaxyLoopTimes::RequestGalaxyLoopTimes(Archive::ReadIterator & source) :
+GameNetworkMessage("RequestGalaxyLoopTimes")
+{
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+RequestGalaxyLoopTimes::~RequestGalaxyLoopTimes()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RequestGalaxyLoopTimes.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RequestGalaxyLoopTimes.h
new file mode 100644
index 00000000..32a89b72
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RequestGalaxyLoopTimes.h
@@ -0,0 +1,28 @@
+// RequestGalaxyLoopTimes.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_RequestGalaxyLoopTimes_H
+#define	_INCLUDED_RequestGalaxyLoopTimes_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class RequestGalaxyLoopTimes : public GameNetworkMessage
+{
+public:
+	          RequestGalaxyLoopTimes   ();
+	explicit  RequestGalaxyLoopTimes   (Archive::ReadIterator & source);
+	          ~RequestGalaxyLoopTimes  ();
+
+private:
+	RequestGalaxyLoopTimes & operator = (const RequestGalaxyLoopTimes & rhs);
+	RequestGalaxyLoopTimes(const RequestGalaxyLoopTimes & source);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_RequestGalaxyLoopTimes_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ResourceHarvesterActivatePageMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ResourceHarvesterActivatePageMessage.cpp
new file mode 100644
index 00000000..e03593be
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ResourceHarvesterActivatePageMessage.cpp
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// ResourceHarvesterActivatePageMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ResourceHarvesterActivatePageMessage.h"
+
+//-----------------------------------------------------------------------
+
+const char * const ResourceHarvesterActivatePageMessage::MESSAGE_TYPE = "ResourceHarvesterActivatePageMessage::MESSAGE_TYPE";
+
+//-----------------------------------------------------------------
+
+ResourceHarvesterActivatePageMessage::ResourceHarvesterActivatePageMessage (const NetworkId & harvesterId) :
+GameNetworkMessage (MESSAGE_TYPE),
+m_harvesterId (harvesterId)
+{
+	addVariable (m_harvesterId);
+}
+
+//-----------------------------------------------------------------------
+
+ResourceHarvesterActivatePageMessage::ResourceHarvesterActivatePageMessage (Archive::ReadIterator & source) :
+GameNetworkMessage (MESSAGE_TYPE),
+m_harvesterId ()
+{
+	addVariable (m_harvesterId);
+	unpack (source);
+}
+
+//----------------------------------------------------------------------
+
+ResourceHarvesterActivatePageMessage::~ResourceHarvesterActivatePageMessage ()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ResourceHarvesterActivatePageMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ResourceHarvesterActivatePageMessage.h
new file mode 100644
index 00000000..0a622144
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ResourceHarvesterActivatePageMessage.h
@@ -0,0 +1,57 @@
+
+// ======================================================================
+//
+// ResourceHarvesterActivatePageMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ResourceHarvesterActivatePageMessage_H
+#define INCLUDED_ResourceHarvesterActivatePageMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+
+//-----------------------------------------------------------------------
+
+class GameInByteStream;
+class GameOutByteStream;
+
+//-----------------------------------------------------------------------
+
+class ResourceHarvesterActivatePageMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MESSAGE_TYPE;
+
+	typedef stdvector<NetworkId>::fwd NetworkIdVector;
+
+	           ResourceHarvesterActivatePageMessage (const NetworkId & harvesterId);
+	explicit   ResourceHarvesterActivatePageMessage (Archive::ReadIterator & source);
+	virtual   ~ResourceHarvesterActivatePageMessage ();
+
+	const NetworkId &                         getHarvesterId () const;
+
+private:
+
+	Archive::AutoVariable<NetworkId>           m_harvesterId;
+
+private:
+	ResourceHarvesterActivatePageMessage ();
+	ResourceHarvesterActivatePageMessage(const ResourceHarvesterActivatePageMessage&);
+	ResourceHarvesterActivatePageMessage& operator= (const ResourceHarvesterActivatePageMessage&);
+};
+
+//----------------------------------------------------------------------
+
+inline const NetworkId &                         ResourceHarvesterActivatePageMessage::getHarvesterId () const
+{
+	return m_harvesterId.get ();
+}
+
+//-----------------------------------------------------------------
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemMessage.cpp
new file mode 100644
index 00000000..2c4d21b8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemMessage.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// RetrieveAuctionItemMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/RetrieveAuctionItemMessage.h"
+
+// ======================================================================
+
+RetrieveAuctionItemMessage::RetrieveAuctionItemMessage(NetworkId itemId, NetworkId containerId) :
+	GameNetworkMessage("RetrieveAuctionItemMessage"),
+	m_itemId(itemId),
+	m_containerId(containerId)
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_containerId);
+}
+
+// ======================================================================
+
+RetrieveAuctionItemMessage::RetrieveAuctionItemMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("RetrieveAuctionItemMessage"),
+	m_itemId(),
+	m_containerId()
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_containerId);
+	unpack(source);
+}
+
+// ======================================================================
+
+RetrieveAuctionItemMessage::~RetrieveAuctionItemMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemMessage.h
new file mode 100644
index 00000000..e29d1870
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemMessage.h
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// RetrieveAuctionItemMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_RetrieveAuctionItemMessage_H
+#define	_RetrieveAuctionItemMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class RetrieveAuctionItemMessage : public GameNetworkMessage
+{
+public:
+
+	RetrieveAuctionItemMessage(NetworkId itemId, NetworkId containerId);
+	explicit RetrieveAuctionItemMessage(Archive::ReadIterator &source);
+
+	~RetrieveAuctionItemMessage();
+
+public: // methods
+
+	NetworkId                        getItemId() const;
+	NetworkId                        getContainerId() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId> m_itemId;        //the item to be auctioned
+	Archive::AutoVariable<NetworkId> m_containerId;   //the auction container
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId RetrieveAuctionItemMessage::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId RetrieveAuctionItemMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _RetrieveAuctionItemMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemResponseMessage.cpp
new file mode 100644
index 00000000..5f52538b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemResponseMessage.cpp
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// RetrieveAuctionItemResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/RetrieveAuctionItemResponseMessage.h"
+
+// ======================================================================
+
+const char * const RetrieveAuctionItemResponseMessage::MessageType = "RetrieveAuctionItemResponseMessage";
+
+//----------------------------------------------------------------------
+
+RetrieveAuctionItemResponseMessage::RetrieveAuctionItemResponseMessage(NetworkId itemId, AuctionResult result) :
+	GameNetworkMessage(MessageType),
+	m_itemId(itemId),
+	m_result(result)
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_result);
+}
+
+// ======================================================================
+
+RetrieveAuctionItemResponseMessage::RetrieveAuctionItemResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage(MessageType),
+	m_itemId(),
+	m_result()
+{
+	AutoByteStream::addVariable(m_itemId);
+	AutoByteStream::addVariable(m_result);
+	unpack(source);
+}
+
+// ======================================================================
+
+RetrieveAuctionItemResponseMessage::~RetrieveAuctionItemResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemResponseMessage.h
new file mode 100644
index 00000000..4c55c428
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/RetrieveAuctionItemResponseMessage.h
@@ -0,0 +1,63 @@
+// ======================================================================
+//
+// RetrieveAuctionItemResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_RetrieveAuctionItemResponseMessage_H
+#define	_RetrieveAuctionItemResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/AuctionErrorCodes.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class RetrieveAuctionItemResponseMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	RetrieveAuctionItemResponseMessage(NetworkId itemId, AuctionResult result);
+	explicit RetrieveAuctionItemResponseMessage(Archive::ReadIterator &source);
+
+	~RetrieveAuctionItemResponseMessage();
+
+public: // methods
+
+	NetworkId                        getItemId() const;
+	AuctionResult                    getResult() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<NetworkId> m_itemId;        //the item to be auctioned
+	Archive::AutoVariable<int>       m_result;        //the auction container
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId RetrieveAuctionItemResponseMessage::getItemId() const
+{
+	return m_itemId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline AuctionResult RetrieveAuctionItemResponseMessage::getResult() const
+{
+	return static_cast<AuctionResult>(m_result.get());
+}
+
+
+// ----------------------------------------------------------------------
+
+#endif // _RetrieveAuctionItemResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.cpp
new file mode 100644
index 00000000..9ed2e939
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.cpp
@@ -0,0 +1,396 @@
+// SceneChannelMessages.cpp
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/SceneChannelMessages.h"
+#include "sharedNetwork/NetworkHandler.h"
+#include "sharedMath/Quaternion.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+
+//-----------------------------------------------------------------------
+
+namespace SceneChannelMessagesNamespace
+{
+	MemoryBlockManager* ms_sceneCreateObjectByNameBlockManager;
+	MemoryBlockManager* ms_sceneCreateObjectByCrcBlockManager;
+	MemoryBlockManager* ms_sceneDestroyBlockManager;
+	MemoryBlockManager* ms_beginBaselinesBlockManager;
+	MemoryBlockManager* ms_endBaselinesBlockManager;
+}
+
+using namespace SceneChannelMessagesNamespace;
+
+//-----------------------------------------------------------------
+
+SceneCreateObjectByName::SceneCreateObjectByName (const NetworkId & networkId, const Transform & transform, const std::string & templateName, const bool hyperspace) :
+GameNetworkMessage ("SceneCreateObjectByName"),
+m_networkId(networkId),
+m_transform(transform),
+m_templateName(templateName),
+m_hyperspace(hyperspace)
+{
+	addVariable(m_networkId);
+	addVariable(m_transform);
+	addVariable(m_templateName);
+	addVariable(m_hyperspace);
+	NetworkHandler::reportMessage("send.SceneCreateObjectByName." + m_templateName.get(), sizeof(SceneCreateObjectByName) + m_templateName.get().length());
+}
+
+//-----------------------------------------------------------------
+
+SceneCreateObjectByName::SceneCreateObjectByName(Archive::ReadIterator & source) :
+GameNetworkMessage("SceneCreateObjectByName"),
+m_networkId(NetworkId::cms_invalid),
+m_transform (),
+m_templateName(),
+m_hyperspace(false)
+{
+	addVariable(m_networkId);
+	addVariable(m_transform);
+	addVariable(m_templateName);
+	addVariable(m_hyperspace);
+
+	AutoByteStream::unpack(source);
+	NetworkHandler::reportMessage("recv.SceneCreateObjectByName." + m_templateName.get(), sizeof(SceneCreateObjectByName) + m_templateName.get().length());
+}
+
+//-----------------------------------------------------------------------
+
+SceneCreateObjectByName::~SceneCreateObjectByName()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId SceneCreateObjectByName::getNetworkId(void) const
+{
+	return m_networkId.get();
+}
+
+//-----------------------------------------------------------------------
+
+const Transform & SceneCreateObjectByName::getTransform(void) const
+{
+	return m_transform.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string & SceneCreateObjectByName::getTemplateName(void) const
+{
+	return m_templateName.get();
+}
+
+//-----------------------------------------------------------------------
+
+bool SceneCreateObjectByName::getHyperspace() const
+{
+	return m_hyperspace.get();
+}
+
+//-----------------------------------------------------------------
+
+SceneCreateObjectByCrc::SceneCreateObjectByCrc (const NetworkId & networkId, const Transform & transform, uint32 templateCrc, const bool hyperspace) :
+GameNetworkMessage ("SceneCreateObjectByCrc"),
+m_networkId(networkId),
+m_transform(transform),
+m_templateCrc(templateCrc),
+m_hyperspace(hyperspace)
+{
+	addVariable(m_networkId);
+	addVariable(m_transform);
+	addVariable(m_templateCrc);
+	addVariable(m_hyperspace);
+
+	char buffer[64];
+	sprintf(buffer, "send.SceneCreateObjectByCrc.%08x", static_cast<int>(templateCrc));
+	NetworkHandler::reportMessage(buffer, sizeof(SceneCreateObjectByCrc));
+}
+//-----------------------------------------------------------------
+
+SceneCreateObjectByCrc::SceneCreateObjectByCrc(Archive::ReadIterator & source) :
+GameNetworkMessage("SceneCreateObjectByCrc"),
+m_networkId(NetworkId::cms_invalid),
+m_transform (),
+m_templateCrc(),
+m_hyperspace(false)
+{
+	addVariable(m_networkId);
+	addVariable(m_transform);
+	addVariable(m_templateCrc);
+	addVariable(m_hyperspace);
+
+	AutoByteStream::unpack(source);
+
+	char buffer[64];
+	sprintf(buffer, "recv.SceneCreateObjectByCrc.%08x", static_cast<int>(m_templateCrc.get()));
+	NetworkHandler::reportMessage(buffer, sizeof(SceneCreateObjectByCrc));
+}
+
+//-----------------------------------------------------------------------
+
+SceneCreateObjectByCrc::~SceneCreateObjectByCrc()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId SceneCreateObjectByCrc::getNetworkId(void) const
+{
+	return m_networkId.get();
+}
+
+//-----------------------------------------------------------------------
+
+const Transform & SceneCreateObjectByCrc::getTransform(void) const
+{
+	return m_transform.get();
+}
+
+//-----------------------------------------------------------------------
+
+uint32 SceneCreateObjectByCrc::getTemplateCrc(void) const
+{
+	return m_templateCrc.get();
+}
+
+//-----------------------------------------------------------------------
+
+bool SceneCreateObjectByCrc::getHyperspace() const
+{
+	return m_hyperspace.get();
+}
+
+// ----------------------------------------------------------------------
+
+SceneDestroyObject::SceneDestroyObject(const NetworkId &id, const bool hyperspace) :
+GameNetworkMessage("SceneDestroyObject"),
+m_networkId(id),
+m_hyperspace(hyperspace)
+{
+	addVariable(m_networkId);
+	addVariable(m_hyperspace);
+}
+
+//-----------------------------------------------------------------------
+
+SceneDestroyObject::SceneDestroyObject(Archive::ReadIterator & source) :
+GameNetworkMessage("SceneDestroyObject"),
+m_networkId(NetworkId::cms_invalid),
+m_hyperspace(false)
+{
+	addVariable(m_networkId);
+	addVariable(m_hyperspace);
+	AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+SceneDestroyObject::~SceneDestroyObject()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const NetworkId SceneDestroyObject::getNetworkId(void) const
+{
+	return m_networkId.get();
+}
+
+//-----------------------------------------------------------------------
+
+bool SceneDestroyObject::getHyperspace(void) const
+{
+	return m_hyperspace.get();
+}
+
+//-----------------------------------------------------------------------
+
+SceneEndBaselines::SceneEndBaselines(const NetworkId &id)
+        : GameNetworkMessage("SceneEndBaselines"),
+          networkId(id)
+{
+	addVariable(networkId);
+}
+
+//-----------------------------------------------------------------------
+
+SceneEndBaselines::SceneEndBaselines(Archive::ReadIterator & source) 
+        : GameNetworkMessage("SceneEndBaselines"),
+          networkId(NetworkId::cms_invalid)
+{
+	addVariable(networkId);
+	AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+NetworkId SceneEndBaselines::getNetworkId() const
+{
+    return networkId.get();
+}
+
+//========================================================================
+
+void SceneCreateObjectByName::install (void)
+{
+	DEBUG_FATAL (ms_sceneCreateObjectByNameBlockManager, ("SceneCreateObjectByName already installed"));
+	ms_sceneCreateObjectByNameBlockManager = new MemoryBlockManager ("SceneCreateObjectByName::ms_sceneCreateObjectByNameBlockManager", true, sizeof(SceneCreateObjectByName), 0, 0, 0);
+}
+
+//-------------------------------------------------------------------
+
+void SceneCreateObjectByName::remove (void)
+{
+	DEBUG_FATAL(!ms_sceneCreateObjectByNameBlockManager, ("SceneCreateObjectByName is not installed"));
+
+	delete ms_sceneCreateObjectByNameBlockManager;
+	ms_sceneCreateObjectByNameBlockManager = 0;
+}
+
+//-------------------------------------------------------------------
+
+void *SceneCreateObjectByName::operator new (size_t size)
+{
+	UNREF (size);
+	NOT_NULL (ms_sceneCreateObjectByNameBlockManager);
+	DEBUG_FATAL (size != sizeof (SceneCreateObjectByName), ("bad size"));
+	DEBUG_FATAL (size != static_cast<size_t> (ms_sceneCreateObjectByNameBlockManager->getElementSize()), ("SceneCreateObjectByName installed with bad size"));
+
+	return ms_sceneCreateObjectByNameBlockManager->allocate ();
+}
+
+//-------------------------------------------------------------------
+
+void SceneCreateObjectByName::operator delete (void *pointer)
+{
+	NOT_NULL (ms_sceneCreateObjectByNameBlockManager);
+
+	ms_sceneCreateObjectByNameBlockManager->free (pointer);
+}
+
+//========================================================================
+
+void SceneCreateObjectByCrc::install (void)
+{
+	DEBUG_FATAL (ms_sceneCreateObjectByCrcBlockManager, ("SceneCreateObjectByCrc already installed"));
+	ms_sceneCreateObjectByCrcBlockManager = new MemoryBlockManager ("SceneCreateObjectByCrc::ms_sceneCreateObjectByCrcBlockManager", true, sizeof(SceneCreateObjectByCrc), 0, 0, 0);
+}
+
+//-------------------------------------------------------------------
+
+void SceneCreateObjectByCrc::remove (void)
+{
+	DEBUG_FATAL(!ms_sceneCreateObjectByCrcBlockManager, ("SceneCreateObjectByCrc is not installed"));
+
+	delete ms_sceneCreateObjectByCrcBlockManager;
+	ms_sceneCreateObjectByCrcBlockManager = 0;
+}
+
+//-------------------------------------------------------------------
+
+void *SceneCreateObjectByCrc::operator new (size_t size)
+{
+	UNREF (size);
+	NOT_NULL (ms_sceneCreateObjectByCrcBlockManager);
+	DEBUG_FATAL (size != sizeof (SceneCreateObjectByCrc), ("bad size"));
+	DEBUG_FATAL (size != static_cast<size_t> (ms_sceneCreateObjectByCrcBlockManager->getElementSize()), ("SceneCreateObjectByCrc installed with bad size"));
+
+	return ms_sceneCreateObjectByCrcBlockManager->allocate ();
+}
+
+//-------------------------------------------------------------------
+
+void SceneCreateObjectByCrc::operator delete (void *pointer)
+{
+	NOT_NULL (ms_sceneCreateObjectByCrcBlockManager);
+
+	ms_sceneCreateObjectByCrcBlockManager->free (pointer);
+}
+
+//===================================================================================
+
+void SceneDestroyObject::install (void)
+{
+	DEBUG_FATAL (ms_sceneDestroyBlockManager, ("SceneDestroyObject already installed"));
+
+	ms_sceneDestroyBlockManager = new MemoryBlockManager ("SceneDestroyObject::ms_sceneDestroyBlockManager", true, sizeof(SceneDestroyObject), 0, 0, 0);
+}
+
+//-------------------------------------------------------------------
+
+void SceneDestroyObject::remove (void)
+{
+	DEBUG_FATAL(!ms_sceneDestroyBlockManager, ("SceneDestroyObject is not installed"));
+
+	delete ms_sceneDestroyBlockManager;
+	ms_sceneDestroyBlockManager = 0;
+}
+
+//-------------------------------------------------------------------
+
+void *SceneDestroyObject::operator new (size_t size)
+{
+	UNREF (size);
+	NOT_NULL (ms_sceneDestroyBlockManager);
+	DEBUG_FATAL (size != sizeof (SceneDestroyObject), ("bad size"));
+	DEBUG_FATAL (size != static_cast<size_t> (ms_sceneDestroyBlockManager->getElementSize()), ("SceneDestroyObject installed with bad size"));
+
+	return ms_sceneDestroyBlockManager->allocate ();
+}
+
+//-------------------------------------------------------------------
+
+void SceneDestroyObject::operator delete (void *pointer)
+{
+	NOT_NULL (ms_sceneDestroyBlockManager);
+
+	ms_sceneDestroyBlockManager->free (pointer);
+}
+
+//======================================================================
+
+void SceneEndBaselines::install (void)
+{
+	DEBUG_FATAL (ms_endBaselinesBlockManager, ("SceneEndBaselines already installed"));
+
+	ms_endBaselinesBlockManager = new MemoryBlockManager ("SceneEndBaselines::ms_endBaselinesBlockManager", true, sizeof(SceneEndBaselines), 0, 0, 0);
+}
+
+//-------------------------------------------------------------------
+
+void SceneEndBaselines::remove (void)
+{
+	DEBUG_FATAL(!ms_endBaselinesBlockManager, ("SceneEndBaselines is not installed"));
+
+	delete ms_endBaselinesBlockManager;
+	ms_endBaselinesBlockManager = 0;
+}
+
+//-------------------------------------------------------------------
+
+void *SceneEndBaselines::operator new (size_t size)
+{
+	UNREF (size);
+	NOT_NULL (ms_endBaselinesBlockManager);
+	DEBUG_FATAL (size != sizeof (SceneEndBaselines), ("bad size"));
+	DEBUG_FATAL (size != static_cast<size_t> (ms_endBaselinesBlockManager->getElementSize()), ("SceneEndBaselines installed with bad size"));
+
+	return ms_endBaselinesBlockManager->allocate ();
+}
+
+//-------------------------------------------------------------------
+
+void SceneEndBaselines::operator delete (void *pointer)
+{
+	NOT_NULL (ms_endBaselinesBlockManager);
+
+	ms_endBaselinesBlockManager->free (pointer);
+}
+
+//-------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.h
new file mode 100644
index 00000000..db11fc10
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SceneChannelMessages.h
@@ -0,0 +1,135 @@
+// SceneChannelMessages.h
+// copyright 2000 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_SCENE_CHANNEL_MESSAGES_H
+#define	_SCENE_CHANNEL_MESSAGES_H
+
+//-----------------------------------------------------------------------
+
+namespace Archive
+{
+	class ByteStream;
+}
+
+#include "sharedFoundation/Tag.h"
+#include "sharedMath/Transform.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class SceneCreateObjectByName : public GameNetworkMessage
+{
+public:
+	SceneCreateObjectByName          (const NetworkId & networkId, const Transform & transform, const std::string & templateName, bool hyperspace = false);
+	explicit SceneCreateObjectByName (Archive::ReadIterator & source);
+	virtual ~SceneCreateObjectByName ();
+
+	const NetworkId     getNetworkId    (void) const;
+	const Transform &   getTransform    (void) const;
+	const std::string & getTemplateName (void) const;
+	bool                getHyperspace   (void) const;
+
+	static void  install (void);
+	static void  remove (void);
+	static void* operator new (size_t size);
+	static void  operator delete (void* pointer);
+
+private:
+	Archive::AutoVariable<NetworkId>   m_networkId;
+	Archive::AutoVariable<Transform>   m_transform;
+	Archive::AutoVariable<std::string> m_templateName;
+	Archive::AutoVariable<bool>        m_hyperspace;
+
+	SceneCreateObjectByName();
+	SceneCreateObjectByName(const SceneCreateObjectByName&);
+	SceneCreateObjectByName& operator= (const SceneCreateObjectByName&);
+};
+
+//-----------------------------------------------------------------------
+
+class SceneCreateObjectByCrc : public GameNetworkMessage
+{
+public:
+	SceneCreateObjectByCrc          (const NetworkId & networkId, const Transform & transform, uint32 templateCrc, bool hyperspace = false);
+	explicit SceneCreateObjectByCrc (Archive::ReadIterator & source);
+	virtual ~SceneCreateObjectByCrc ();
+
+	const NetworkId     getNetworkId    (void) const;
+	const Transform &   getTransform    (void) const;
+	uint32              getTemplateCrc  (void) const;
+	bool                getHyperspace   (void) const;
+
+	static void  install (void);
+	static void  remove (void);
+	static void* operator new (size_t size);
+	static void  operator delete (void* pointer);
+
+private:
+	Archive::AutoVariable<NetworkId>   m_networkId;
+	Archive::AutoVariable<Transform>   m_transform;
+	Archive::AutoVariable<uint32>      m_templateCrc;
+	Archive::AutoVariable<bool>        m_hyperspace;
+
+	SceneCreateObjectByCrc();
+	SceneCreateObjectByCrc(const SceneCreateObjectByCrc&);
+	SceneCreateObjectByCrc& operator= (const SceneCreateObjectByCrc&);
+};
+
+//-----------------------------------------------------------------------
+
+class SceneDestroyObject : public GameNetworkMessage
+{
+public:
+	explicit SceneDestroyObject(const NetworkId &id, bool hyperspace = false);
+	explicit SceneDestroyObject(Archive::ReadIterator & source);
+	virtual ~SceneDestroyObject();
+	const NetworkId     getNetworkId (void) const;
+	bool                getHyperspace(void) const;
+
+	static void  install (void);
+	static void  remove (void);
+	static void* operator new (size_t size);
+	static void  operator delete (void* pointer);
+
+private:
+	Archive::AutoVariable<NetworkId> m_networkId;
+	Archive::AutoVariable<bool> m_hyperspace;
+
+	SceneDestroyObject();
+	SceneDestroyObject(const SceneDestroyObject&);
+	SceneDestroyObject& operator= (const SceneDestroyObject&);
+};
+
+//-----------------------------------------------------------------------
+
+class SceneEndBaselines : public GameNetworkMessage
+{
+public:
+	explicit SceneEndBaselines(const NetworkId &id);
+	explicit SceneEndBaselines(Archive::ReadIterator & source);
+
+	virtual ~SceneEndBaselines() {};
+
+	NetworkId getNetworkId() const;
+
+	static void  install (void);
+	static void  remove (void);
+	static void* operator new (size_t size);
+	static void  operator delete (void* pointer);
+
+private:
+	Archive::AutoVariable<NetworkId> networkId;
+
+	SceneEndBaselines();
+	SceneEndBaselines(const SceneEndBaselines &);
+	SceneEndBaselines& operator= (const SceneEndBaselines &);
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _SCENE_CHANNEL_MESSAGES_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SecureTradeMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SecureTradeMessages.cpp
new file mode 100644
index 00000000..92a83280
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SecureTradeMessages.cpp
@@ -0,0 +1,247 @@
+// GrantSkill.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "SecureTradeMessages.h"
+
+#include "sharedFoundation/NetworkId.h"
+
+
+//========================================================================
+
+BeginTradeMessage::BeginTradeMessage(const NetworkId & player) :
+GameNetworkMessage("BeginTradeMessage"),
+m_player(player)
+{
+	addVariable(m_player);
+}
+
+BeginTradeMessage::BeginTradeMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("BeginTradeMessage"),
+m_player(NetworkId::cms_invalid)
+{
+	addVariable(m_player);
+	unpack(source);
+}
+
+BeginTradeMessage::~BeginTradeMessage()
+{
+}
+
+//========================================================================
+
+
+AbortTradeMessage::AbortTradeMessage() : 
+GameNetworkMessage("AbortTradeMessage")
+{
+}
+
+AbortTradeMessage::AbortTradeMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("AbortTradeMessage")
+{
+	UNREF(source);
+}
+
+AbortTradeMessage::~AbortTradeMessage()
+{
+}
+
+//========================================================================
+
+AddItemMessage::AddItemMessage(const NetworkId & object) :
+GameNetworkMessage("AddItemMessage"),
+m_object(object)
+{
+	addVariable(m_object);
+}
+
+AddItemMessage::AddItemMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("AddItemMessage"),
+m_object(NetworkId::cms_invalid)
+{
+	addVariable(m_object);
+	unpack(source);
+}
+
+AddItemMessage::~AddItemMessage()
+{
+}
+
+//========================================================================
+
+const char * const AddItemFailedMessage::MessageType = "AddItemFailedMessage";
+
+//----------------------------------------------------------------------
+
+AddItemFailedMessage::AddItemFailedMessage(const NetworkId & object) :
+GameNetworkMessage(MessageType),
+m_object(object)
+{
+	addVariable(m_object);
+}
+
+//----------------------------------------------------------------------
+
+AddItemFailedMessage::AddItemFailedMessage(Archive::ReadIterator & source) :
+GameNetworkMessage(MessageType),
+m_object(NetworkId::cms_invalid)
+{
+	addVariable(m_object);
+	unpack(source);
+}
+
+AddItemFailedMessage::~AddItemFailedMessage()
+{
+}
+
+//========================================================================
+
+
+RemoveItemMessage::RemoveItemMessage(const NetworkId & object) :
+GameNetworkMessage("RemoveItemMessage"),
+m_object(object)
+{
+	addVariable(m_object);
+}
+
+RemoveItemMessage::RemoveItemMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("RemoveItemMessage"),
+m_object(NetworkId::cms_invalid)
+{
+	addVariable(m_object);
+	unpack(source);
+}
+
+RemoveItemMessage::~RemoveItemMessage()
+{
+}
+
+//========================================================================
+
+GiveMoneyMessage::GiveMoneyMessage(int amount) :
+GameNetworkMessage("GiveMoneyMessage"),
+m_amount(amount)
+{
+	addVariable(m_amount);
+}
+
+GiveMoneyMessage::GiveMoneyMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("GiveMoneyMessage"),
+m_amount(0)
+{
+	addVariable(m_amount);
+	unpack(source);
+}
+
+GiveMoneyMessage::~GiveMoneyMessage()
+{
+}
+//========================================================================
+
+TradeCompleteMessage::TradeCompleteMessage() : 
+GameNetworkMessage("TradeCompleteMessage")
+{
+}
+
+TradeCompleteMessage::TradeCompleteMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("TradeCompleteMessage")
+{
+			UNREF(source);
+}
+
+TradeCompleteMessage::~TradeCompleteMessage()
+{
+
+}
+
+
+//========================================================================
+AcceptTransactionMessage::AcceptTransactionMessage() : 
+GameNetworkMessage("AcceptTransactionMessage")
+{
+}
+
+AcceptTransactionMessage::AcceptTransactionMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("AcceptTransactionMessage")
+{
+			UNREF(source);
+}
+
+AcceptTransactionMessage::~AcceptTransactionMessage()
+{
+
+}
+
+
+//========================================================================
+
+UnAcceptTransactionMessage::UnAcceptTransactionMessage() : 
+GameNetworkMessage("UnAcceptTransactionMessage")
+{
+}
+
+UnAcceptTransactionMessage::UnAcceptTransactionMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("UnAcceptTransactionMessage")
+{
+			UNREF(source);
+}
+
+UnAcceptTransactionMessage::~UnAcceptTransactionMessage()
+{
+
+}
+
+//========================================================================
+
+VerifyTradeMessage::VerifyTradeMessage() : 
+GameNetworkMessage("VerifyTradeMessage")
+{
+}
+
+VerifyTradeMessage::VerifyTradeMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("VerifyTradeMessage")
+{
+			UNREF(source);
+}
+
+VerifyTradeMessage::~VerifyTradeMessage()
+{
+
+}
+
+//========================================================================
+
+DenyTradeMessage::DenyTradeMessage() : 
+GameNetworkMessage("DenyTradeMessage")
+{
+}
+
+DenyTradeMessage::DenyTradeMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("DenyTradeMessage")
+{
+		UNREF(source);
+}
+
+DenyTradeMessage::~DenyTradeMessage()
+{
+}
+
+//========================================================================
+BeginVerificationMessage::BeginVerificationMessage() : 
+GameNetworkMessage("BeginVerificationMessage")
+{
+}
+
+BeginVerificationMessage::BeginVerificationMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("BeginVerificationMessage")
+{
+		UNREF(source);
+}
+
+BeginVerificationMessage::~BeginVerificationMessage()
+{
+}
+
+//========================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SecureTradeMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SecureTradeMessages.h
new file mode 100644
index 00000000..5f8191af
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SecureTradeMessages.h
@@ -0,0 +1,206 @@
+//========================================================================
+//
+// SecureTradeMessages.h
+//
+// copyright 2001 Sony Online Entertainment
+//
+//========================================================================
+
+#ifndef INCLUDED_SecureTradeMessages_H
+#define INCLUDED_SecureTradeMessages_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+
+//========================================================================
+
+class BeginTradeMessage : public GameNetworkMessage
+{
+public:
+	explicit BeginTradeMessage(const NetworkId & player);
+	BeginTradeMessage(Archive::ReadIterator & source);
+	~BeginTradeMessage();
+
+	const NetworkId &    getPlayerId() const;
+
+private:
+	Archive::AutoVariable<NetworkId> m_player;
+};
+
+inline const NetworkId & BeginTradeMessage::getPlayerId() const
+{
+	return m_player.get();
+}
+
+
+//========================================================================
+
+class AbortTradeMessage : public GameNetworkMessage
+{
+public:
+	AbortTradeMessage();
+	AbortTradeMessage(Archive::ReadIterator & source);
+	~AbortTradeMessage();
+
+};
+
+//========================================================================
+
+class AddItemMessage : public GameNetworkMessage
+{
+public:
+	explicit AddItemMessage(const NetworkId & object);
+	AddItemMessage(Archive::ReadIterator & source);
+	~AddItemMessage();
+
+	const NetworkId &    getNetworkId() const;
+
+private:
+	Archive::AutoVariable<NetworkId> m_object;
+
+};
+
+inline const NetworkId & AddItemMessage::getNetworkId() const
+{
+	return m_object.get();
+}
+
+
+//========================================================================
+
+class AddItemFailedMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	explicit AddItemFailedMessage(const NetworkId & object);
+	AddItemFailedMessage(Archive::ReadIterator & source);
+	~AddItemFailedMessage();
+
+	const NetworkId &    getNetworkId() const;
+
+private:
+	Archive::AutoVariable<NetworkId> m_object;
+
+};
+
+inline const NetworkId & AddItemFailedMessage::getNetworkId() const
+{
+	return m_object.get();
+}
+
+
+//========================================================================
+
+class RemoveItemMessage : public GameNetworkMessage
+{
+public:
+	explicit RemoveItemMessage(const NetworkId & objectId);
+	RemoveItemMessage(Archive::ReadIterator & source);
+	~RemoveItemMessage();
+
+	const NetworkId &    getNetworkId() const;
+
+private:
+	Archive::AutoVariable<NetworkId> m_object;
+};
+
+inline const NetworkId & RemoveItemMessage::getNetworkId() const
+{
+	return m_object.get();
+}
+
+
+//========================================================================
+
+class GiveMoneyMessage : public GameNetworkMessage
+{
+public:
+	explicit GiveMoneyMessage(int amount);
+	GiveMoneyMessage(Archive::ReadIterator & source);
+	~GiveMoneyMessage();
+
+	int    getAmount() const;
+
+private:
+	Archive::AutoVariable<int> m_amount;
+
+};
+
+inline int GiveMoneyMessage::getAmount() const
+{
+	return m_amount.get();
+}
+
+
+//========================================================================
+
+class TradeCompleteMessage : public GameNetworkMessage
+{
+public:
+	TradeCompleteMessage();
+	TradeCompleteMessage(Archive::ReadIterator & source);
+	~TradeCompleteMessage();
+
+};
+
+//========================================================================
+class AcceptTransactionMessage : public GameNetworkMessage
+{
+public:
+	AcceptTransactionMessage();
+	AcceptTransactionMessage(Archive::ReadIterator & source);
+	~AcceptTransactionMessage();
+
+};
+
+//========================================================================
+
+class UnAcceptTransactionMessage : public GameNetworkMessage
+{
+public:
+	UnAcceptTransactionMessage();
+	UnAcceptTransactionMessage(Archive::ReadIterator & source);
+	~UnAcceptTransactionMessage();
+
+};
+
+//========================================================================
+
+class VerifyTradeMessage : public GameNetworkMessage
+{
+public:
+	VerifyTradeMessage();
+	VerifyTradeMessage(Archive::ReadIterator & source);
+	~VerifyTradeMessage();
+
+};
+
+//========================================================================
+
+class DenyTradeMessage : public GameNetworkMessage
+{
+public:
+	DenyTradeMessage();
+	DenyTradeMessage(Archive::ReadIterator & source);
+	~DenyTradeMessage();
+
+};
+
+//========================================================================
+
+
+class BeginVerificationMessage : public GameNetworkMessage
+{
+public:
+	BeginVerificationMessage();
+	BeginVerificationMessage(Archive::ReadIterator & source);
+	~BeginVerificationMessage();
+
+};
+
+//========================================================================
+
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerTimeMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerTimeMessage.cpp
new file mode 100644
index 00000000..29e63276
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerTimeMessage.cpp
@@ -0,0 +1,35 @@
+// ServerTimeMessage.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ServerTimeMessage.h"
+
+//-----------------------------------------------------------------------
+
+ServerTimeMessage::ServerTimeMessage(const int64 t) :
+GameNetworkMessage("ServerTimeMessage"),
+timeSeconds(t)
+{
+	addVariable(timeSeconds);
+}
+
+//-----------------------------------------------------------------------
+
+ServerTimeMessage::ServerTimeMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ServerTimeMessage"),
+timeSeconds()
+{
+	addVariable(timeSeconds);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ServerTimeMessage::~ServerTimeMessage()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerTimeMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerTimeMessage.h
new file mode 100644
index 00000000..bd024b1a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerTimeMessage.h
@@ -0,0 +1,39 @@
+// ServerTimeMessage.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ServerTimeMessage_H
+#define	_INCLUDED_ServerTimeMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ServerTimeMessage : public GameNetworkMessage
+{
+public:
+	explicit ServerTimeMessage(const int64 timeSeconds);
+	explicit ServerTimeMessage(Archive::ReadIterator & source);
+	~ServerTimeMessage();
+
+	const int64  getTimeSeconds  () const;
+
+private:
+	ServerTimeMessage & operator = (const ServerTimeMessage & rhs);
+	ServerTimeMessage(const ServerTimeMessage & source);
+
+	Archive::AutoVariable<int64>  timeSeconds;
+};
+
+//-----------------------------------------------------------------------
+
+inline const int64 ServerTimeMessage::getTimeSeconds()  const
+{
+	return timeSeconds.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ServerTimeMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerUserInterfaceMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerUserInterfaceMessages.cpp
new file mode 100644
index 00000000..7d5aabce
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerUserInterfaceMessages.cpp
@@ -0,0 +1,295 @@
+// ======================================================================
+//
+// SuiForceClosePage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ServerUserInterfaceMessages.h"
+
+#include "UnicodeUtils.h"
+
+//-----------------------------------------------------------------------
+
+const char * const SuiCreatePage::MESSAGE_TYPE     = "SuiCreatePage";
+const char * const SuiClosedOk::MESSAGE_TYPE       = "SuiClosedOk";
+const char * const SuiForceClosePage::MESSAGE_TYPE = "SuiForceClosePage";
+const char * const SuiSetProperty::MESSAGE_TYPE    = "SuiSetProperty";
+
+//======================================================================
+
+SUIMessage::SUIMessage(const char * message)
+: GameNetworkMessage(message),
+  m_clientPageId(-1)
+{
+	addVariable(m_clientPageId);
+}
+
+//-----------------------------------------------------------------------
+
+void SUIMessage::setClientPageId(int p)
+{
+	m_clientPageId.set(p);
+}
+
+//-----------------------------------------------------------------------
+
+int SUIMessage::getClientPageId() const
+{
+	return m_clientPageId.get();
+}
+
+//======================================================================
+
+SuiCreatePage::SuiCreatePage()
+: SUIMessage (MESSAGE_TYPE),
+  m_pageName (),
+  m_commands (),
+  m_associatedObjectId (),
+  m_maxRangeFromObject (32.0f)
+{
+	addVariable (m_pageName);
+	addVariable (m_commands);
+	addVariable (m_associatedObjectId);
+	addVariable (m_maxRangeFromObject);
+}
+
+//----------------------------------------------------------------------
+
+SuiCreatePage::SuiCreatePage(Archive::ReadIterator & source)
+: SUIMessage (MESSAGE_TYPE),
+  m_pageName (),
+  m_commands (),
+  m_associatedObjectId (),
+  m_maxRangeFromObject (32.0f)
+{
+	addVariable (m_pageName);
+	addVariable (m_commands);
+	addVariable (m_associatedObjectId);
+	addVariable (m_maxRangeFromObject);
+	unpack (source);
+}
+
+//----------------------------------------------------------------------
+
+void SuiCreatePage::setAssociatedObjectId  (const NetworkId & id)
+{
+	m_associatedObjectId.set (id);
+}
+
+//----------------------------------------------------------------------
+
+void SuiCreatePage::setMaxRangeFromObject (float range)
+{
+	m_maxRangeFromObject.set (range);
+}
+
+//----------------------------------------------------------------------
+
+SuiCreatePage::~SuiCreatePage()
+{
+}
+
+//----------------------------------------------------------------------
+
+void SuiCreatePage::setPageName(const std::string& name)
+{
+	m_pageName.set(name);
+}
+
+//----------------------------------------------------------------------
+
+const std::string& SuiCreatePage::getPageName() const
+{
+	return m_pageName.get();
+}
+	
+//----------------------------------------------------------------------
+
+int SuiCreatePage::getNumberOfCommands() const
+{
+	return m_commands.get().size();
+}
+
+//----------------------------------------------------------------------
+
+const SuiCreatePage::Command & SuiCreatePage::getCommand(const unsigned int i) const
+{
+	DEBUG_FATAL(i < m_commands.get().size(), ("bad index into SuiCreatePage::Command"));
+	return m_commands.get()[i];
+}
+
+//----------------------------------------------------------------------
+
+const SuiCreatePage::CommandVector & SuiCreatePage::getCommands() const
+{
+	return m_commands.get();
+}
+
+//----------------------------------------------------------------------
+
+void SuiCreatePage::addCommand(const SuiCreatePage_Command::Type type, const std::vector<Unicode::String>& parameters) 
+{
+	Command c;
+	c.m_type = type;
+	c.m_parameters = parameters;
+	m_commands.get().push_back(c);
+}
+
+//======================================================================
+
+SuiClosedOk::SuiClosedOk()
+: SUIMessage(MESSAGE_TYPE),
+  m_subscribedProperties(),
+  m_buttonPressed()
+{
+	addVariable (m_buttonPressed);
+	addVariable (m_subscribedProperties);
+}
+
+//----------------------------------------------------------------------
+
+SuiClosedOk::SuiClosedOk(Archive::ReadIterator & source)
+: SUIMessage(MESSAGE_TYPE),
+  m_subscribedProperties(),
+  m_buttonPressed()
+{
+	addVariable (m_buttonPressed);
+	addVariable (m_subscribedProperties);
+	unpack (source);
+}
+
+//----------------------------------------------------------------------
+
+SuiClosedOk::~SuiClosedOk()
+{
+}
+
+//----------------------------------------------------------------------
+
+void SuiClosedOk::addSubscribedProperty(const std::string& widgetName, const std::string& propertyName, const Unicode::String& propertyValue)
+{
+	m_subscribedProperties.get().push_back(std::make_pair(std::make_pair(widgetName, propertyName), propertyValue));
+}
+
+//----------------------------------------------------------------------
+
+std::vector<std::pair<std::pair<std::string, std::string>, Unicode::String> > SuiClosedOk::getSubscribedProperties() const
+{
+	return m_subscribedProperties.get();
+}
+
+//----------------------------------------------------------------------
+
+void SuiClosedOk::setButtonPressed(const Unicode::String& button)
+{
+	m_buttonPressed.set(button);
+}
+
+//----------------------------------------------------------------------
+
+Unicode::String SuiClosedOk::getButtonPressed() const
+{
+	return m_buttonPressed.get();
+}
+
+//======================================================================
+
+SuiForceClosePage::SuiForceClosePage()
+: SUIMessage(MESSAGE_TYPE)
+{
+}
+
+//----------------------------------------------------------------------
+
+SuiForceClosePage::SuiForceClosePage(Archive::ReadIterator & source)
+: SUIMessage(MESSAGE_TYPE)
+{
+	unpack (source);
+}
+
+//----------------------------------------------------------------------
+
+SuiForceClosePage::~SuiForceClosePage()
+{
+}
+
+//======================================================================
+
+SuiSetProperty::SuiSetProperty()
+: SUIMessage     (MESSAGE_TYPE),
+	m_widgetName   (),
+	m_propertyName (),
+	m_propertyValue()
+{
+	addVariable (m_widgetName);
+	addVariable (m_propertyName);
+	addVariable (m_propertyValue);
+}
+
+//----------------------------------------------------------------------
+
+SuiSetProperty::SuiSetProperty(Archive::ReadIterator & source)
+: SUIMessage     (MESSAGE_TYPE),
+	m_widgetName   (),
+	m_propertyName (),
+	m_propertyValue()
+{
+	addVariable (m_widgetName);
+	addVariable (m_propertyName);
+	addVariable (m_propertyValue);
+	unpack (source);
+}
+
+//----------------------------------------------------------------------
+
+SuiSetProperty::~SuiSetProperty()
+{
+}
+
+//----------------------------------------------------------------------
+
+void SuiSetProperty::setWidgetName(const std::string& widgetName)
+{
+	m_widgetName.set(widgetName);
+}
+
+//----------------------------------------------------------------------
+
+void SuiSetProperty::setPropertyName(const std::string& propertyName)
+{
+	m_propertyName.set(propertyName);
+}
+
+//----------------------------------------------------------------------
+
+void SuiSetProperty::setPropertyValue(const Unicode::String& propertyValue)
+{
+	m_propertyValue.set(propertyValue);
+}
+
+//-----------------------------------------------------------------------
+
+const std::string& SuiSetProperty::getWidgetName()
+{
+	return m_widgetName.get();
+}
+
+//-----------------------------------------------------------------------
+
+const std::string& SuiSetProperty::getPropertyName()
+{
+	return m_propertyName.get();
+}
+
+//-----------------------------------------------------------------------
+
+const Unicode::String& SuiSetProperty::getPropertyValue()
+{
+	return m_propertyValue.get();
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerUserInterfaceMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerUserInterfaceMessages.h
new file mode 100644
index 00000000..e3140fa1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerUserInterfaceMessages.h
@@ -0,0 +1,221 @@
+
+// ======================================================================
+//
+// ServerUserInferfaceMessages.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_ServerUserInferfaceMessages_H
+#define INCLUDED_ServerUserInferfaceMessages_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/Archive.h"
+#include "Unicode.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+class GameInByteStream;
+class GameOutByteStream;
+
+//-----------------------------------------------------------------------
+
+/**
+ * This is the base class for all ServerUserInterface messages.  It is mainly used
+ * to store the indentifier that this client uses to refer to a given ServerUserInterface
+ * dialog.
+ */
+class SUIMessage : public GameNetworkMessage
+{
+public:
+	           SUIMessage (const char* message);
+
+public:
+	void                    setClientPageId(int pageId);
+	int                     getClientPageId() const;
+
+private:
+	//the identifier for this client to use for the page
+	Archive::AutoVariable<int> m_clientPageId;
+};
+
+//-----------------------------------------------------------------------
+
+struct SuiCreatePage_Command
+{
+	enum Type
+	{
+		CLEAR_DATA_SOURCE,
+		ADD_CHILD_WIDGET,
+		SET_PROPERTY,
+		ADD_DATA_ITEM,
+		SUBSCRIBE_TO_PROPERTY
+	} m_type;
+	std::vector<Unicode::String> m_parameters;
+};
+
+//-----------------------------------------------------------------------
+
+/**
+ * This network message is used to communicate down to the client the information about
+ * an new dialog to display.  It contains the base UI page to show, as well as a series
+ * of commands to run that can add other widgets, and set the state of the dialog box.
+ *  This message is meant to be sent from Server to Client.
+ */
+class SuiCreatePage : public SUIMessage
+{
+public:
+
+	static const char * const MESSAGE_TYPE;
+
+	/**
+	 *  This struct describes an action to take while filling out the given dialog box.  It
+	 *  could be a new widget description, an item for a data source, a property to set, etc.
+	 */
+	typedef SuiCreatePage_Command Command;
+	typedef stdvector<Command>::fwd CommandVector;
+
+	           SuiCreatePage ();
+	explicit   SuiCreatePage (Archive::ReadIterator & source);
+	virtual   ~SuiCreatePage ();
+
+	void                    setPageName            (const std::string& name);
+	const std::string&      getPageName            () const;
+	int                     getNumberOfCommands    () const;
+	const Command &         getCommand             (const unsigned int i) const;
+	const CommandVector &   getCommands            () const;
+	void                    addCommand             (const SuiCreatePage_Command::Type type, const std::vector<Unicode::String>& parameters);
+	void                    setAssociatedObjectId  (const NetworkId & id);
+	void                    setMaxRangeFromObject  (float range);
+
+public:
+	//the name of the UI page to use
+	Archive::AutoVariable<std::string>  m_pageName;
+	//the list of commands to apply to the page
+	Archive::AutoArray<Command>         m_commands;
+	Archive::AutoVariable<NetworkId>    m_associatedObjectId;
+	Archive::AutoVariable<float>        m_maxRangeFromObject;
+
+private:
+	SuiCreatePage(const SuiCreatePage&);
+	SuiCreatePage& operator= (const SuiCreatePage&);
+};
+
+//-----------------------------------------------------------------------
+
+/**  This message is meant to be sent from Client to Server.
+ */
+class SuiClosedOk : public SUIMessage
+{
+public:
+
+	static const char * const MESSAGE_TYPE;
+
+	           SuiClosedOk ();
+	explicit   SuiClosedOk (Archive::ReadIterator & source);
+	virtual   ~SuiClosedOk ();
+
+	void       addSubscribedProperty(const std::string& widgetName, const std::string& propertyName, const Unicode::String& propertyValue);
+	std::vector<std::pair<std::pair<std::string, std::string>, Unicode::String> > getSubscribedProperties() const;
+
+	void            setButtonPressed(const Unicode::String& button);
+	Unicode::String getButtonPressed() const;
+
+private:
+	//data in the subscribed properties
+	Archive::AutoArray<std::pair<std::pair<std::string, std::string>, Unicode::String> > m_subscribedProperties;
+	Archive::AutoVariable<Unicode::String> m_buttonPressed;
+
+private:
+	SuiClosedOk(const SuiClosedOk&);
+	SuiClosedOk& operator= (const SuiClosedOk&);
+};
+
+//-----------------------------------------------------------------------
+
+/**  This message is meant to be sent from Server to Client.
+ */
+class SuiForceClosePage : public SUIMessage
+{
+public:
+
+	static const char * const MESSAGE_TYPE;
+
+	           SuiForceClosePage ();
+	explicit   SuiForceClosePage (Archive::ReadIterator & source);
+	virtual   ~SuiForceClosePage ();
+
+private:
+	SuiForceClosePage(const SuiForceClosePage&);
+	SuiForceClosePage& operator= (const SuiForceClosePage&);
+};
+
+//-----------------------------------------------------------------------
+
+/**  This message is meant to be sent from Server to Client.
+ */
+class SuiSetProperty : public SUIMessage
+{
+public:
+
+	static const char * const MESSAGE_TYPE;
+
+	           SuiSetProperty ();
+	explicit   SuiSetProperty (Archive::ReadIterator & source);
+	virtual   ~SuiSetProperty ();
+
+	void       setWidgetName               (const std::string&);
+	void       setPropertyName             (const std::string&);
+	void       setPropertyValue            (const Unicode::String&);
+	const std::string&     getWidgetName   ();
+	const std::string&     getPropertyName ();
+	const Unicode::String& getPropertyValue();
+
+private:
+	SuiSetProperty(const SuiSetProperty&);
+	SuiSetProperty& operator= (const SuiSetProperty&);
+
+	Archive::AutoVariable<std::string>     m_widgetName;
+	Archive::AutoVariable<std::string>     m_propertyName;
+	Archive::AutoVariable<Unicode::String> m_propertyValue;
+};
+
+//-----------------------------------------------------------------
+
+//tell Archive how to pack/unpack my custom types
+namespace Archive
+{
+	//a SuiCreatePage_Command::Type is an enum, so treat it like an int
+	inline void put(ByteStream& target, const SuiCreatePage_Command::Type& source)
+	{
+		put(target, static_cast<int>(source));
+	}
+
+	inline void get(ReadIterator& source, SuiCreatePage_Command::Type& target)
+	{
+		signed int tmp;
+		get(source, tmp);
+		target = static_cast<SuiCreatePage_Command::Type>(tmp);
+	}
+
+	//SuiCreatePage_Command is a struct, so just pack/unpack each piece
+	inline void put(ByteStream& target, const SuiCreatePage_Command& source)
+	{
+		put(target, source.m_type);
+		put(target, source.m_parameters);
+	}
+
+	inline void get(ReadIterator& source, SuiCreatePage_Command& target)
+	{
+		get(source, target.m_type);
+		get(source, target.m_parameters);
+	}
+}
+//-----------------------------------------------------------------
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerWeatherMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerWeatherMessage.cpp
new file mode 100644
index 00000000..d9375076
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerWeatherMessage.cpp
@@ -0,0 +1,64 @@
+// ==================================================================
+//
+// ServerWeatherMessage.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ServerWeatherMessage.h"
+
+#include "sharedMathArchive/VectorArchive.h"
+
+// ==================================================================
+// STATIC PUBLIC ServerWeatherMessage
+// ==================================================================
+
+const char* const ServerWeatherMessage::cms_name = "ServerWeatherMessage";
+
+// ==================================================================
+// PUBLIC ServerWeatherMessage
+// ==================================================================
+
+ServerWeatherMessage::ServerWeatherMessage (const int index, const Vector& windVelocity_w) :
+	GameNetworkMessage (ServerWeatherMessage::cms_name),
+	m_index (index),
+	m_windVelocity_w (windVelocity_w)
+{
+	addVariable (m_index);
+	addVariable (m_windVelocity_w);
+}
+
+// ------------------------------------------------------------------
+
+ServerWeatherMessage::ServerWeatherMessage (Archive::ReadIterator& source) :
+	GameNetworkMessage (ServerWeatherMessage::cms_name),
+	m_index (),
+	m_windVelocity_w ()
+{
+	addVariable (m_index);
+	addVariable (m_windVelocity_w);
+	unpack (source);
+}
+
+// ------------------------------------------------------------------
+
+ServerWeatherMessage::~ServerWeatherMessage ()
+{
+}
+
+// ------------------------------------------------------------------
+
+int ServerWeatherMessage::getIndex () const
+{
+	return m_index.get ();
+}
+
+// ----------------------------------------------------------------------
+
+const Vector& ServerWeatherMessage::getWindVelocity_w () const
+{
+	return m_windVelocity_w.get ();
+}
+
+// ==================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerWeatherMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerWeatherMessage.h
new file mode 100644
index 00000000..8cd65ec3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerWeatherMessage.h
@@ -0,0 +1,42 @@
+// ==================================================================
+//
+// ServerWeatherMessage.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ==================================================================
+
+#ifndef	INCLUDED_ServerWeatherMessage_H
+#define	INCLUDED_ServerWeatherMessage_H
+
+// ==================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedMath/Vector.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ==================================================================
+
+class ServerWeatherMessage : public GameNetworkMessage
+{
+public: 
+
+	ServerWeatherMessage (int index, const Vector& windVelocity_w);
+	explicit ServerWeatherMessage (Archive::ReadIterator &source);
+	virtual ~ServerWeatherMessage();
+
+	int           getIndex () const;
+	const Vector& getWindVelocity_w () const;
+
+public:
+
+	static const char* const cms_name;
+
+private:
+
+	Archive::AutoVariable<int>    m_index;
+	Archive::AutoVariable<Vector> m_windVelocity_w;
+};
+
+// ==================================================================
+
+#endif 
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessage.cpp
new file mode 100644
index 00000000..d2c71e1e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessage.cpp
@@ -0,0 +1,110 @@
+//======================================================================
+//
+// ShipDamageMessage.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ShipDamageMessage.h"
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+//======================================================================
+
+ShipDamageMessage::ShipDamageMessage() :
+m_attackerNetworkId(),
+m_attackerPosition(),
+m_damageTotal(0.0f),
+m_isLocal(false)
+{
+}
+
+//----------------------------------------------------------------------
+
+ShipDamageMessage::ShipDamageMessage(NetworkId const & attackerId, Vector const & attackerPos, float damageTotal, bool isLocal) :
+m_attackerNetworkId(attackerId),
+m_attackerPosition(attackerPos),
+m_damageTotal(damageTotal),
+m_isLocal(isLocal)
+{
+}
+
+//----------------------------------------------------------------------
+
+NetworkId const & ShipDamageMessage::getAttackerNetworkId() const
+{
+	return m_attackerNetworkId;
+}
+
+//----------------------------------------------------------------------
+
+void ShipDamageMessage::setAttackerNetworkId(NetworkId const & attackerId)
+{
+	m_attackerNetworkId = attackerId;
+}
+
+//----------------------------------------------------------------------
+
+Vector const & ShipDamageMessage::getAttackerPosition() const
+{
+	return m_attackerPosition;
+}
+
+//----------------------------------------------------------------------
+
+void ShipDamageMessage::setAttackerPosition(Vector const & attackerPos)
+{
+	m_attackerPosition = attackerPos;
+}
+
+//----------------------------------------------------------------------
+
+float ShipDamageMessage::getDamageTotal() const
+{
+	return m_damageTotal;
+}
+
+//----------------------------------------------------------------------
+
+void ShipDamageMessage::setDamageTotal(float damage)
+{
+	m_damageTotal = damage;
+}
+
+//----------------------------------------------------------------------
+
+bool ShipDamageMessage::getIsLocal() const
+{
+	return m_isLocal;
+}
+
+//----------------------------------------------------------------------
+
+void ShipDamageMessage::setIsLocal(bool isLocal)
+{
+	m_isLocal = isLocal;
+}
+
+//----------------------------------------------------------------------
+
+void ShipDamageMessage::get(Archive::ReadIterator & source)
+{
+	Archive::get(source, m_attackerNetworkId);
+	Archive::get(source, m_attackerPosition);
+	Archive::get(source, m_damageTotal);
+}
+
+
+//----------------------------------------------------------------------
+
+void ShipDamageMessage::put(Archive::ByteStream & target) const
+{
+	Archive::put(target, m_attackerNetworkId);
+	Archive::put(target, m_attackerPosition);
+	Archive::put(target, m_damageTotal);
+}
+
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessage.h
new file mode 100644
index 00000000..f480e84b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessage.h
@@ -0,0 +1,54 @@
+//======================================================================
+//
+// ShipDamageMessage.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipDamageMessage_H
+#define INCLUDED_ShipDamageMessage_H
+
+#include "sharedMath/Vector.h"
+#include "sharedFoundation/NetworkId.h"
+
+//======================================================================
+
+namespace Archive
+{
+	class ReadIterator;
+	class ByteStream;
+}
+
+//----------------------------------------------------------------------
+
+class ShipDamageMessage
+{
+public:
+	ShipDamageMessage();
+	ShipDamageMessage(NetworkId const & attackerId, Vector const & attackerPos, float damageTotal, bool isLocal = false);
+
+	NetworkId const & getAttackerNetworkId() const;
+	void setAttackerNetworkId(NetworkId const & attackerId);
+
+	Vector const & getAttackerPosition() const;
+	void setAttackerPosition(Vector const & attackerPos);
+	
+	float getDamageTotal() const;
+	void setDamageTotal(float damage);
+
+	bool getIsLocal() const;
+	void setIsLocal(bool isLocal);
+
+	void get(Archive::ReadIterator & source);
+	void put(Archive::ByteStream & target) const;
+
+private:
+	NetworkId m_attackerNetworkId;
+	Vector m_attackerPosition;
+	float m_damageTotal;
+	bool m_isLocal;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessageArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessageArchive.cpp
new file mode 100644
index 00000000..7b4e5e93
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessageArchive.cpp
@@ -0,0 +1,29 @@
+//======================================================================
+//
+// ShipDamageMessageArchive.cpp
+// copyright(c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+
+#include "sharedNetworkMessages/ShipDamageMessage.h"
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get(ReadIterator & source, ShipDamageMessage & target)
+	{
+		target.get(source);
+	}
+	
+	void put(ByteStream & target, ShipDamageMessage const & source)
+	{
+		source.put(target);
+	}
+
+}
+
+//======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessageArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessageArchive.h
new file mode 100644
index 00000000..73050c81
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipDamageMessageArchive.h
@@ -0,0 +1,29 @@
+//======================================================================
+//
+// ShipDamageMessageArchive.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_ShipDamageMessageArchive_H
+#define INCLUDED_ShipDamageMessageArchive_H
+
+//======================================================================
+
+class ShipDamageMessage;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	class ByteStream;
+	class ReadIterator;
+
+	void get(ReadIterator & source, ShipDamageMessage & target);
+	void put(ByteStream & target, ShipDamageMessage const& source);
+}
+
+//======================================================================
+
+#endif
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformCollisionMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformCollisionMessage.cpp
new file mode 100644
index 00000000..95740e38
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformCollisionMessage.cpp
@@ -0,0 +1,88 @@
+// ======================================================================
+//
+// ShipUpdateTransformCollisionMessage.cpp
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ShipUpdateTransformCollisionMessage.h"
+
+#include "sharedFoundation/ConstCharCrcString.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedMathArchive/VectorArchive.h"
+
+// ======================================================================
+
+static ConstCharCrcString s_shipUpdateTransformCollisionMessageName("ShipUpdateTransformCollisionMessage");
+
+// ======================================================================
+
+ShipUpdateTransformCollisionMessage::ShipUpdateTransformCollisionMessage(NetworkId const &networkId, Transform const &transform, Vector const &velocity, uint32 syncStampLong) :
+	GameNetworkMessage(s_shipUpdateTransformCollisionMessageName),
+	m_networkId(networkId),
+	m_transform(transform),
+	m_velocity(velocity),
+	m_syncStampLong(syncStampLong)
+{
+	addVariable(m_networkId);
+	addVariable(m_transform);
+	addVariable(m_velocity);
+	addVariable(m_syncStampLong);
+
+#ifdef _DEBUG
+	IGNORE_RETURN(m_transform.get().validate());
+#endif
+}
+
+// ----------------------------------------------------------------------
+
+ShipUpdateTransformCollisionMessage::ShipUpdateTransformCollisionMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage(s_shipUpdateTransformCollisionMessageName),
+	m_networkId(),
+	m_transform(),
+	m_velocity(),
+	m_syncStampLong()
+{
+	addVariable(m_networkId);
+	addVariable(m_transform);
+	addVariable(m_velocity);
+	addVariable(m_syncStampLong);
+
+	unpack(source);
+
+#ifdef _DEBUG
+	IGNORE_RETURN(m_transform.get().validate());
+#endif
+}
+
+// ----------------------------------------------------------------------
+
+NetworkId const & ShipUpdateTransformCollisionMessage::getNetworkId() const
+{
+	return m_networkId.get();
+}
+
+// ----------------------------------------------------------------------
+
+Transform const & ShipUpdateTransformCollisionMessage::getTransform() const
+{
+	return m_transform.get();
+}
+
+// ----------------------------------------------------------------------
+
+Vector const & ShipUpdateTransformCollisionMessage::getVelocity() const
+{
+	return m_velocity.get();
+}
+
+// ----------------------------------------------------------------------
+
+uint32 ShipUpdateTransformCollisionMessage::getSyncStampLong() const
+{
+	return m_syncStampLong.get();
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformCollisionMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformCollisionMessage.h
new file mode 100644
index 00000000..a1662ca5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformCollisionMessage.h
@@ -0,0 +1,46 @@
+// ======================================================================
+//
+// ShipUpdateTransformCollisionMessage.h
+// Copyright 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_ShipUpdateTransformCollisionMessage_H
+#define	INCLUDED_ShipUpdateTransformCollisionMessage_H
+
+// ======================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Transform.h"
+
+// ======================================================================
+
+class ShipUpdateTransformCollisionMessage: public GameNetworkMessage
+{
+public:
+	ShipUpdateTransformCollisionMessage(NetworkId const &networkId, Transform const &transform, Vector const &velocity, uint32 syncStampLong);
+	explicit ShipUpdateTransformCollisionMessage(Archive::ReadIterator &source);
+
+public:
+	NetworkId const & getNetworkId() const;
+	Transform const & getTransform() const;
+	Vector const & getVelocity() const;
+	uint32 getSyncStampLong() const;
+
+private:
+	ShipUpdateTransformCollisionMessage();
+	ShipUpdateTransformCollisionMessage(ShipUpdateTransformCollisionMessage const &);
+	ShipUpdateTransformCollisionMessage & operator=(ShipUpdateTransformCollisionMessage const &);
+
+private:
+	Archive::AutoVariable<NetworkId> m_networkId;
+	Archive::AutoVariable<Transform> m_transform;
+	Archive::AutoVariable<Vector> m_velocity;
+	Archive::AutoVariable<uint32> m_syncStampLong;
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformMessage.cpp
new file mode 100644
index 00000000..007981c0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformMessage.cpp
@@ -0,0 +1,119 @@
+// ======================================================================
+//
+// ShipUpdateTransformMessage.cpp
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ShipUpdateTransformMessage.h"
+
+#include "sharedFoundation/ConstCharCrcString.h"
+
+// ======================================================================
+
+static ConstCharCrcString s_shipUpdateTransformMessageName("ShipUpdateTransformMessage");
+
+// ======================================================================
+
+ShipUpdateTransformMessage::ShipUpdateTransformMessage(uint16 shipId, Transform const &transform, Vector const &velocity, float yawRate, float pitchRate, float rollRate, uint32 syncStampLong) :
+	GameNetworkMessage(s_shipUpdateTransformMessageName),
+	m_shipId(shipId),
+	m_transform(transform),
+	m_velocity(velocity),
+	m_yawRate(yawRate),
+	m_pitchRate(pitchRate),
+	m_rollRate(rollRate),
+	m_syncStampLong(syncStampLong)
+{
+	addVariable(m_shipId);
+	addVariable(m_transform);
+	addVariable(m_velocity);
+	addVariable(m_yawRate);
+	addVariable(m_pitchRate);
+	addVariable(m_rollRate);
+	addVariable(m_syncStampLong);
+
+#ifdef _DEBUG
+	IGNORE_RETURN(transform.validate());
+#endif
+}
+
+// ----------------------------------------------------------------------
+
+ShipUpdateTransformMessage::ShipUpdateTransformMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage(s_shipUpdateTransformMessageName),
+	m_shipId(),
+	m_transform(),
+	m_velocity(),
+	m_yawRate(),
+	m_pitchRate(),
+	m_rollRate(),
+	m_syncStampLong()
+{
+	addVariable(m_shipId);
+	addVariable(m_transform);
+	addVariable(m_velocity);
+	addVariable(m_yawRate);
+	addVariable(m_pitchRate);
+	addVariable(m_rollRate);
+	addVariable(m_syncStampLong);
+
+	unpack(source);
+
+#ifdef _DEBUG
+	IGNORE_RETURN(m_transform.get().get().validate());
+#endif
+}
+
+// ----------------------------------------------------------------------
+
+uint16 ShipUpdateTransformMessage::getShipId() const
+{
+	return m_shipId.get();
+}
+
+// ----------------------------------------------------------------------
+
+Transform const ShipUpdateTransformMessage::getTransform() const
+{
+	return m_transform.get().get();
+}
+
+// ----------------------------------------------------------------------
+
+Vector const ShipUpdateTransformMessage::getVelocity() const
+{
+	return m_velocity.get().get();
+}
+
+// ----------------------------------------------------------------------
+
+float ShipUpdateTransformMessage::getYawRate() const
+{
+	return m_yawRate.get().get();
+}
+
+// ----------------------------------------------------------------------
+
+float ShipUpdateTransformMessage::getPitchRate() const
+{
+	return m_pitchRate.get().get();
+}
+
+// ----------------------------------------------------------------------
+
+float ShipUpdateTransformMessage::getRollRate() const
+{
+	return m_rollRate.get().get();
+}
+
+// ----------------------------------------------------------------------
+
+uint32 ShipUpdateTransformMessage::getSyncStampLong() const
+{
+	return m_syncStampLong.get();
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformMessage.h
new file mode 100644
index 00000000..72fe0497
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ShipUpdateTransformMessage.h
@@ -0,0 +1,55 @@
+// ======================================================================
+//
+// ShipUpdateTransformMessage.h
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_ShipUpdateTransformMessage_H
+#define	INCLUDED_ShipUpdateTransformMessage_H
+
+// ======================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Transform.h"
+#include "sharedUtility/PackedTransform.h"
+#include "sharedUtility/PackedVelocity.h"
+#include "sharedUtility/PackedRotationRate.h"
+
+// ======================================================================
+
+class ShipUpdateTransformMessage: public GameNetworkMessage
+{
+public:
+	ShipUpdateTransformMessage(uint16 shipId, Transform const &transform, Vector const &velocity, float yawRate, float pitchRate, float rollRate, uint32 syncStampLong);
+	explicit ShipUpdateTransformMessage(Archive::ReadIterator &source);
+
+public:
+	uint16 getShipId() const;
+	Transform const getTransform() const;
+	Vector const getVelocity() const;
+	float getYawRate() const;
+	float getPitchRate() const;
+	float getRollRate() const;
+	uint32 getSyncStampLong() const;
+
+private:
+	ShipUpdateTransformMessage();
+	ShipUpdateTransformMessage(ShipUpdateTransformMessage const &);
+	ShipUpdateTransformMessage & operator=(ShipUpdateTransformMessage const &);
+
+private:
+	Archive::AutoVariable<uint16> m_shipId;
+	Archive::AutoVariable<PackedTransform> m_transform;
+	Archive::AutoVariable<PackedVelocity> m_velocity;
+	Archive::AutoVariable<PackedRotationRate> m_yawRate;
+	Archive::AutoVariable<PackedRotationRate> m_pitchRate;
+	Archive::AutoVariable<PackedRotationRate> m_rollRate;
+	Archive::AutoVariable<uint32> m_syncStampLong;
+};
+
+// ======================================================================
+
+#endif
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.cpp
new file mode 100644
index 00000000..33402d14
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.cpp
@@ -0,0 +1,57 @@
+//========================================================================
+//
+// SlowDownEffectMessage.cpp
+//
+// Copyright 2004, Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/SlowDownEffectMessage.h"
+
+// ======================================================================
+
+char const * const SlowDownEffectMessage::MessageType = "SlowDownEffectMessage";
+
+//----------------------------------------------------------------------
+
+SlowDownEffectMessage::SlowDownEffectMessage(const NetworkId & source, const NetworkId & target, float coneLength, float coneAngle, float slopeAngle, unsigned long expireTime) :
+GameNetworkMessage(MessageType),
+m_source(source),
+m_target(target),
+m_coneLength(coneLength),
+m_coneAngle(coneAngle),
+m_slopeAngle(slopeAngle),
+m_expireTime(expireTime)
+{
+	addVariable(m_source);
+	addVariable(m_target);
+	addVariable(m_coneLength);
+	addVariable(m_coneAngle);
+	addVariable(m_slopeAngle);
+	addVariable(m_expireTime);
+}
+
+// ----------------------------------------------------------------------
+
+SlowDownEffectMessage::SlowDownEffectMessage(Archive::ReadIterator &source) :
+GameNetworkMessage(MessageType),
+m_source(),
+m_target(),
+m_coneLength(0),
+m_coneAngle(0),
+m_slopeAngle(0),
+m_expireTime(0)
+{
+	addVariable(m_source);
+	addVariable(m_target);
+	addVariable(m_coneLength);
+	addVariable(m_coneAngle);
+	addVariable(m_slopeAngle);
+	addVariable(m_expireTime);
+
+	unpack(source);
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.h
new file mode 100644
index 00000000..effac2e7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SlowDownEffectMessage.h
@@ -0,0 +1,85 @@
+//========================================================================
+//
+// SlowDownEffectMessage.h
+//
+// Copyright 2004, Sony Online Entertainment, Inc.
+// All rights reserved.
+//
+//========================================================================
+
+#ifndef	INCLUDED_SlowDownEffectMessage_H
+#define	INCLUDED_SlowDownEffectMessage_H
+
+//-----------------------------------------------------------------------
+
+class Object;
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class SlowDownEffectMessage : public GameNetworkMessage
+{
+public:
+
+	static char const * const MessageType;
+
+	         SlowDownEffectMessage(const NetworkId & source, const NetworkId & target, float coneLength, float coneAngle, float slopeAngle, unsigned long expireTime);
+	explicit SlowDownEffectMessage(Archive::ReadIterator & source);
+
+public:
+
+	const NetworkId & getSource() const;
+	const NetworkId & getTarget() const;
+	float getConeLength() const;
+	float getConeAngle() const;
+	float getSlopeAngle() const;
+	unsigned long getExpireTime() const;
+
+private: 
+	Archive::AutoVariable<NetworkId>  m_source;
+	Archive::AutoVariable<NetworkId>  m_target;
+	Archive::AutoVariable<float>      m_coneLength; 
+	Archive::AutoVariable<float>      m_coneAngle;
+	Archive::AutoVariable<float>      m_slopeAngle;
+	Archive::AutoVariable<unsigned long>      m_expireTime;
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & SlowDownEffectMessage::getSource() const
+{
+	return m_source.get();
+}
+
+inline const NetworkId & SlowDownEffectMessage::getTarget() const
+{
+	return m_target.get();
+}
+
+inline float SlowDownEffectMessage::getConeLength() const
+{
+	return m_coneLength.get();
+}
+
+inline float SlowDownEffectMessage::getConeAngle() const
+{
+	return m_coneAngle.get();
+}
+
+inline float SlowDownEffectMessage::getSlopeAngle() const
+{
+	return m_slopeAngle.get();
+}
+
+inline unsigned long SlowDownEffectMessage::getExpireTime() const
+{
+	return m_expireTime.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif // INCLUDED_SlowDownEffectMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StatMigrationTargetsMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StatMigrationTargetsMessage.cpp
new file mode 100644
index 00000000..81e03172
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StatMigrationTargetsMessage.cpp
@@ -0,0 +1,89 @@
+// ======================================================================
+//
+// StatMigrationTargetsMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/StatMigrationTargetsMessage.h"
+#include "swgSharedUtility/Attributes.def"
+
+// ======================================================================
+
+const char* const StatMigrationTargetsMessage::cms_name = "StatMigrationTargetsMessage";
+
+// ======================================================================
+
+StatMigrationTargetsMessage::StatMigrationTargetsMessage(const std::vector<int>& currentTargets, int pointsLeft)
+: GameNetworkMessage(cms_name),
+  m_health(0),
+  m_constitution(0),
+  m_action(0),
+  m_stamina(0),
+  m_mind(0),
+  m_willpower(0),
+  m_pointsLeft(pointsLeft)
+{
+	DEBUG_FATAL(static_cast<int>(currentTargets.size()) != Attributes::NumberOfAttributes, ("Bad number of targets given when building a StatMigrationTargetsMessage"));
+
+	m_health.set(currentTargets[Attributes::Health]);
+	m_constitution.set(currentTargets[Attributes::Constitution]);
+	m_action.set(currentTargets[Attributes::Action]);
+	m_stamina.set(currentTargets[Attributes::Stamina]);
+	m_mind.set(currentTargets[Attributes::Mind]);
+	m_willpower.set(currentTargets[Attributes::Willpower]);
+
+	AutoByteStream::addVariable(m_health);
+	AutoByteStream::addVariable(m_constitution);
+	AutoByteStream::addVariable(m_action);
+	AutoByteStream::addVariable(m_stamina);
+	AutoByteStream::addVariable(m_mind);
+	AutoByteStream::addVariable(m_willpower);
+	AutoByteStream::addVariable(m_pointsLeft);
+}
+
+// ======================================================================
+
+StatMigrationTargetsMessage::StatMigrationTargetsMessage(Archive::ReadIterator &source)
+: GameNetworkMessage(cms_name),
+  m_health(0),
+  m_constitution(0),
+  m_action(0),
+  m_stamina(0),
+  m_mind(0),
+  m_willpower(0),
+  m_pointsLeft(0)
+{
+	AutoByteStream::addVariable(m_health);
+	AutoByteStream::addVariable(m_constitution);
+	AutoByteStream::addVariable(m_action);
+	AutoByteStream::addVariable(m_stamina);
+	AutoByteStream::addVariable(m_mind);
+	AutoByteStream::addVariable(m_willpower);
+	AutoByteStream::addVariable(m_pointsLeft);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<int> StatMigrationTargetsMessage::getTargets() const
+{
+	std::vector<int> vec;
+	vec.push_back(m_health.get());
+	vec.push_back(m_constitution.get());
+	vec.push_back(m_action.get());
+	vec.push_back(m_stamina.get());
+	vec.push_back(m_mind.get());
+	vec.push_back(m_willpower.get());
+	return vec;
+}
+
+// ----------------------------------------------------------------------
+
+StatMigrationTargetsMessage::~StatMigrationTargetsMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StatMigrationTargetsMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StatMigrationTargetsMessage.h
new file mode 100644
index 00000000..c5a365a8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StatMigrationTargetsMessage.h
@@ -0,0 +1,53 @@
+// ======================================================================
+//
+// StatMigrationTargetsMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_StatMigrationTargetsMessage_H
+#define	_StatMigrationTargetsMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class StatMigrationTargetsMessage : public GameNetworkMessage
+{
+public:
+	StatMigrationTargetsMessage(const stdvector<int>::fwd& targets, int pointsLeft);
+	explicit StatMigrationTargetsMessage(Archive::ReadIterator &source);
+	~StatMigrationTargetsMessage();
+
+public: // methods
+	int                               getPointsLeft() const;
+	stdvector<int>::fwd getTargets   () const;
+
+public:
+	static const char* const cms_name;
+
+private: 
+	Archive::AutoVariable<int> m_health;
+	Archive::AutoVariable<int> m_constitution;
+	Archive::AutoVariable<int> m_action;
+	Archive::AutoVariable<int> m_stamina;
+	Archive::AutoVariable<int> m_mind;
+	Archive::AutoVariable<int> m_willpower;
+	Archive::AutoVariable<int> m_pointsLeft;
+};
+
+// ----------------------------------------------------------------------
+
+inline int StatMigrationTargetsMessage::getPointsLeft() const
+{
+	return m_pointsLeft.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _StatMigrationTargetsMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StomachRequestMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StomachRequestMessage.cpp
new file mode 100644
index 00000000..610f981d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StomachRequestMessage.cpp
@@ -0,0 +1,32 @@
+// ======================================================================
+//
+// StomachRequestMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/StomachRequestMessage.h"
+
+// ======================================================================
+
+StomachRequestMessage::StomachRequestMessage()
+: GameNetworkMessage("StomachRequestMessage")
+{
+}
+
+//-----------------------------------------------------------------------
+
+StomachRequestMessage::StomachRequestMessage(Archive::ReadIterator & source)
+: GameNetworkMessage("StomachRequestMessage")
+{
+	UNREF(source);
+}
+
+// ----------------------------------------------------------------------
+
+StomachRequestMessage::~StomachRequestMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StomachRequestMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StomachRequestMessage.h
new file mode 100644
index 00000000..3032fd8a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StomachRequestMessage.h
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// StomachRequestMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_StomachRequestMessage_H
+#define INCLUDED_StomachRequestMessage_H
+
+// ======================================================================
+
+//#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Sent from:  Client
+ * Sent to:    Connection Server
+ * Action:     Requests the state of the player's stomach(s).
+ */
+class StomachRequestMessage : public GameNetworkMessage
+{
+ public:
+	StomachRequestMessage();
+	explicit StomachRequestMessage(Archive::ReadIterator & source);
+	virtual ~StomachRequestMessage();
+
+  private:
+	StomachRequestMessage(const StomachRequestMessage&);
+	StomachRequestMessage& operator= (const StomachRequestMessage&);
+};
+
+// ======================================================================
+
+#endif	// _INCLUDED_ClientCentralMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiCreatePageMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiCreatePageMessage.cpp
new file mode 100644
index 00000000..7eda663b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiCreatePageMessage.cpp
@@ -0,0 +1,41 @@
+//======================================================================
+//
+// SuiCreatePageMessage.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/SuiCreatePageMessage.h"
+
+//======================================================================
+
+char const * const SuiCreatePageMessage::MessageType = "SuiCreatePageMessage";
+
+//----------------------------------------------------------------------
+
+SuiCreatePageMessage::SuiCreatePageMessage(SuiPageData const & pageData) :
+GameNetworkMessage(MessageType),
+m_pageData(pageData)
+{
+	addVariable(m_pageData);
+}
+
+//----------------------------------------------------------------------
+
+SuiCreatePageMessage::SuiCreatePageMessage(Archive::ReadIterator & source) :
+GameNetworkMessage(MessageType),
+m_pageData()
+{
+	addVariable(m_pageData);
+	AutoByteStream::unpack(source);
+}
+
+//----------------------------------------------------------------------
+
+SuiPageData const & SuiCreatePageMessage::getPageData() const
+{
+	return m_pageData.get();
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiCreatePageMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiCreatePageMessage.h
new file mode 100644
index 00000000..347513aa
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiCreatePageMessage.h
@@ -0,0 +1,40 @@
+//======================================================================
+//
+// SuiCreatePageMessage.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_SuiCreatePageMessage_H
+#define INCLUDED_SuiCreatePageMessage_H
+
+//======================================================================
+
+#include "Archive/AutoDeltaVector.h"
+#include "sharedGame/SuiPageData.h"
+#include "sharedGame/SuiPageDataArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//----------------------------------------------------------------------
+
+class SuiCreatePageMessage : public GameNetworkMessage
+{
+public:
+
+	static char const * const MessageType;
+
+public:
+
+	explicit SuiCreatePageMessage(SuiPageData const & pageData);
+	explicit SuiCreatePageMessage::SuiCreatePageMessage(Archive::ReadIterator & source);
+
+	SuiPageData const & getPageData() const;
+
+private:
+
+	Archive::AutoDeltaVariable<SuiPageData> m_pageData;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiEventNotification.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiEventNotification.cpp
new file mode 100644
index 00000000..e40ea4e3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiEventNotification.cpp
@@ -0,0 +1,81 @@
+//======================================================================
+//
+// SuiEventNotification.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/SuiEventNotification.h"
+
+//======================================================================
+
+char const * const SuiEventNotification::MessageType = "SuiEventNotification";
+
+//----------------------------------------------------------------------
+
+SuiEventNotification::SuiEventNotification(int pageId, int subscribedEventIndex, int reservePropertyCount) :
+GameNetworkMessage(SuiEventNotification::MessageType),
+m_pageId(pageId),
+m_subscribedEventIndex(subscribedEventIndex),
+m_subscribedProperties()
+{
+	addVariable(m_pageId);
+	addVariable(m_subscribedEventIndex);
+	addVariable(m_subscribedProperties);
+
+	if (reservePropertyCount > 0)
+		m_subscribedProperties.reserve(static_cast<size_t>(reservePropertyCount));
+}
+
+//----------------------------------------------------------------------
+
+SuiEventNotification::SuiEventNotification(Archive::ReadIterator & source) :
+GameNetworkMessage(SuiEventNotification::MessageType),
+m_pageId(-1),
+m_subscribedEventIndex(-1),
+m_subscribedProperties()
+{
+	addVariable(m_pageId);
+	addVariable(m_subscribedEventIndex);
+	addVariable(m_subscribedProperties);
+	AutoByteStream::unpack(source);
+}
+
+//----------------------------------------------------------------------
+
+int SuiEventNotification::getPageId() const
+{
+	return m_pageId.get();
+
+}
+//----------------------------------------------------------------------
+
+int SuiEventNotification::getSubscribedEventIndex() const
+{
+	return m_subscribedEventIndex.get();
+}
+
+//----------------------------------------------------------------------
+
+int SuiEventNotification::getPropertyCount() const
+{
+	return static_cast<int>(m_subscribedProperties.size());
+}
+
+//----------------------------------------------------------------------
+
+Unicode::String const & SuiEventNotification::getProperty(int index) const
+{
+	VALIDATE_RANGE_INCLUSIVE_EXCLUSIVE(0, index, getPropertyCount());
+	return m_subscribedProperties.get(static_cast<size_t>(index));
+}
+
+//----------------------------------------------------------------------
+
+void SuiEventNotification::addSubscribedProperty(Unicode::String const & propertyValue)
+{
+	m_subscribedProperties.push_back(propertyValue);
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiEventNotification.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiEventNotification.h
new file mode 100644
index 00000000..d9462544
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiEventNotification.h
@@ -0,0 +1,50 @@
+//======================================================================
+//
+// SuiEventNotification.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_SuiEventNotification_H
+#define INCLUDED_SuiEventNotification_H
+
+//======================================================================
+
+#include "Archive/AutoDeltaVector.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//----------------------------------------------------------------------
+
+class SuiEventNotification : public GameNetworkMessage
+{
+public:
+
+	static char const * const MessageType;
+
+public:
+
+	SuiEventNotification(int pageId, int subscribedEventIndex, int reservePropertyCount);
+	explicit SuiEventNotification::SuiEventNotification(Archive::ReadIterator & source);
+
+	int getPageId() const;
+	int getSubscribedEventIndex() const;
+	int getPropertyCount() const;
+	Unicode::String const & getProperty(int index) const;
+
+	void addSubscribedProperty(Unicode::String const & propertyValue);
+
+private:
+
+	SuiEventNotification(SuiEventNotification const & rhs);
+	SuiEventNotification operator=(SuiEventNotification const & rhs);
+
+private:
+
+	Archive::AutoDeltaVariable<int> m_pageId;
+	Archive::AutoDeltaVariable<int> m_subscribedEventIndex;
+	Archive::AutoDeltaVector<Unicode::String> m_subscribedProperties;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiUpdatePageMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiUpdatePageMessage.cpp
new file mode 100644
index 00000000..eb65e0d9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiUpdatePageMessage.cpp
@@ -0,0 +1,41 @@
+//======================================================================
+//
+// SuiUpdatePageMessage.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/SuiUpdatePageMessage.h"
+
+//======================================================================
+
+char const * const SuiUpdatePageMessage::MessageType = "SuiUpdatePageMessage";
+
+//----------------------------------------------------------------------
+
+SuiUpdatePageMessage::SuiUpdatePageMessage(SuiPageData const & pageData) :
+GameNetworkMessage(MessageType),
+m_pageData(pageData)
+{
+	addVariable(m_pageData);
+}
+
+//----------------------------------------------------------------------
+
+SuiUpdatePageMessage::SuiUpdatePageMessage(Archive::ReadIterator & source) :
+GameNetworkMessage(MessageType),
+m_pageData()
+{
+	addVariable(m_pageData);
+	AutoByteStream::unpack(source);
+}
+
+//----------------------------------------------------------------------
+
+SuiPageData const & SuiUpdatePageMessage::getPageData() const
+{
+	return m_pageData.get();
+}
+
+//----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiUpdatePageMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiUpdatePageMessage.h
new file mode 100644
index 00000000..1c3e88d4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/SuiUpdatePageMessage.h
@@ -0,0 +1,39 @@
+//======================================================================
+//
+// SuiUpdatePageMessage.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_SuiUpdatePageMessage_H
+#define INCLUDED_SuiUpdatePageMessage_H
+
+//======================================================================
+
+#include "sharedGame/SuiPageData.h"
+#include "sharedGame/SuiPageDataArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//----------------------------------------------------------------------
+
+class SuiUpdatePageMessage : public GameNetworkMessage
+{
+public:
+
+	static char const * const MessageType;
+
+public:
+
+	explicit SuiUpdatePageMessage(SuiPageData const & pageData);
+	explicit SuiUpdatePageMessage::SuiUpdatePageMessage(Archive::ReadIterator & source);
+
+	SuiPageData const & getPageData() const;
+
+private:
+
+	Archive::AutoDeltaVariable<SuiPageData> m_pageData;
+};
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateCellPermissionMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateCellPermissionMessage.cpp
new file mode 100644
index 00000000..52dd6874
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateCellPermissionMessage.cpp
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// UpdateCellPermissionMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/UpdateCellPermissionMessage.h"
+
+// ======================================================================
+
+UpdateCellPermissionMessage::UpdateCellPermissionMessage(const NetworkId & sourceObject, bool allowed) : 
+	GameNetworkMessage("UpdateCellPermissionMessage"),
+	m_allowed(allowed),
+	m_target(sourceObject)
+{
+	AutoByteStream::addVariable(m_allowed);
+	AutoByteStream::addVariable(m_target);
+}
+
+// ----------------------------------------------------------------------
+
+UpdateCellPermissionMessage::UpdateCellPermissionMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage("UpdateCellPermissionMessage"),
+	m_allowed(),
+	m_target(NetworkId::cms_invalid)
+{
+	AutoByteStream::addVariable(m_allowed);
+	AutoByteStream::addVariable(m_target);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+UpdateCellPermissionMessage::~UpdateCellPermissionMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateCellPermissionMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateCellPermissionMessage.h
new file mode 100644
index 00000000..83f4d913
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateCellPermissionMessage.h
@@ -0,0 +1,60 @@
+// ======================================================================
+//
+// UpdateCellPermissionMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_UpdateCellPermissionMessage_H
+#define	_UpdateCellPermissionMessage_H
+
+//-----------------------------------------------------------------------
+
+class Object;
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class UpdateCellPermissionMessage : public GameNetworkMessage
+{
+public: //ctor/dtor
+	UpdateCellPermissionMessage(NetworkId const &sourceObject, bool allowed);
+	explicit UpdateCellPermissionMessage(Archive::ReadIterator &source);
+
+	~UpdateCellPermissionMessage();
+
+public: // methods
+
+	bool             getAllowed() const;
+	NetworkId const &getTarget() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<bool>       m_allowed;
+	Archive::AutoVariable<NetworkId>  m_target;
+};
+
+// ----------------------------------------------------------------------
+
+inline bool UpdateCellPermissionMessage::getAllowed() const
+{
+	return m_allowed.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId& UpdateCellPermissionMessage::getTarget() const
+{
+	return m_target.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _UpdateCellPermissionMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateContainmentMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateContainmentMessage.cpp
new file mode 100644
index 00000000..28ee7b99
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateContainmentMessage.cpp
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// UpdateContainmentMessage.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/UpdateContainmentMessage.h"
+
+// ======================================================================
+
+UpdateContainmentMessage::UpdateContainmentMessage(NetworkId const &networkId, NetworkId const &containerId, int slotArrangement) :
+	GameNetworkMessage("UpdateContainmentMessage"),
+	m_networkId(networkId),
+	m_containerId(containerId),
+	m_slotArrangement(slotArrangement)
+{
+	addVariable(m_networkId);
+	addVariable(m_containerId);
+	addVariable(m_slotArrangement);
+}
+
+// ----------------------------------------------------------------------
+
+UpdateContainmentMessage::UpdateContainmentMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("UpdateContainmentMessage"),
+	m_networkId(),
+	m_containerId(),
+	m_slotArrangement()
+{
+	addVariable(m_networkId);
+	addVariable(m_containerId);
+	addVariable(m_slotArrangement);
+	unpack(source);
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateContainmentMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateContainmentMessage.h
new file mode 100644
index 00000000..8e6dd5ac
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateContainmentMessage.h
@@ -0,0 +1,62 @@
+// ======================================================================
+//
+// UpdateContainmentMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_UpdateContainmentMessage_H_
+#define	_UpdateContainmentMessage_H_
+
+// ======================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+// ======================================================================
+
+class UpdateContainmentMessage: public GameNetworkMessage
+{
+public:
+	UpdateContainmentMessage(NetworkId const &networkId, NetworkId const &containerId, int slotArrangement);
+	explicit UpdateContainmentMessage(Archive::ReadIterator &source);
+
+public:
+
+	NetworkId const &getNetworkId() const;
+	NetworkId const &getContainerId() const;
+	int getSlotArrangement() const;
+
+private: 
+	Archive::AutoVariable<NetworkId> m_networkId;
+	Archive::AutoVariable<NetworkId> m_containerId;
+	Archive::AutoVariable<int> m_slotArrangement;
+};
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &UpdateContainmentMessage::getNetworkId() const
+{
+	return m_networkId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const &UpdateContainmentMessage::getContainerId() const
+{
+	return m_containerId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdateContainmentMessage::getSlotArrangement() const
+{
+	return m_slotArrangement.get();
+}
+
+// ======================================================================
+
+#endif // _UpdateContainmentMessage_H_
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateMissileMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateMissileMessage.cpp
new file mode 100644
index 00000000..3fb59b70
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateMissileMessage.cpp
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// UpdateMissileMessage.cpp
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/UpdateMissileMessage.h"
+
+// ======================================================================
+
+UpdateMissileMessage::UpdateMissileMessage(int missileId, NetworkId const & shipId, int countermeasureType, UpdateType updateType) :
+		GameNetworkMessage("UpdateMissileMessage"),
+		m_missileId(missileId),
+		m_shipId(shipId),
+		m_countermeasureType(countermeasureType),
+		m_updateType(static_cast<int>(updateType))
+{
+	addVariable(m_missileId);
+	addVariable(m_shipId);
+	addVariable(m_countermeasureType);
+	addVariable(m_updateType);
+}
+
+// ----------------------------------------------------------------------
+
+UpdateMissileMessage::UpdateMissileMessage(Archive::ReadIterator &source) :
+		GameNetworkMessage("UpdateMissileMessage"),
+		m_missileId(),
+		m_shipId(),
+		m_countermeasureType(),
+		m_updateType()
+{
+	addVariable(m_missileId);
+	addVariable(m_shipId);
+	addVariable(m_countermeasureType);
+	addVariable(m_updateType);
+	unpack(source); //lint !e1506 // Call to virtual -- the way our system works requires this, and it seems to work OK
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateMissileMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateMissileMessage.h
new file mode 100644
index 00000000..7eee444f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateMissileMessage.h
@@ -0,0 +1,78 @@
+// ======================================================================
+//
+// UpdateMissileMessage.h
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_UpdateMissileMessage_H
+#define INCLUDED_UpdateMissileMessage_H
+
+// ======================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Vector.h"
+#include "sharedMathArchive/VectorArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+/**
+ * A network message to tell the client about a change to a missile.
+ * Depending on the type of update, some fields in this message may not
+ * be relevant.
+ */
+class UpdateMissileMessage : public GameNetworkMessage
+{
+  public:
+	enum UpdateType {UT_miss, UT_hit, UT_countermeasured, UT_countermeasureFailed};
+	
+  public:
+	UpdateMissileMessage(int missileId, NetworkId const & shipId, int countermeasureType, UpdateType updateType);
+	explicit UpdateMissileMessage(Archive::ReadIterator &source);
+
+  public:
+	int getMissileId() const;
+	NetworkId const & getShipId() const;
+	int getCountermeasureType() const;
+	UpdateType getUpdateType() const;
+	
+  private:
+	Archive::AutoVariable<int> m_missileId;
+	Archive::AutoVariable<NetworkId> m_shipId;
+	Archive::AutoVariable<int> m_countermeasureType;
+	Archive::AutoVariable<int> m_updateType;
+};
+
+// ======================================================================
+
+inline int UpdateMissileMessage::getMissileId() const
+{
+	return m_missileId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline UpdateMissileMessage::UpdateType UpdateMissileMessage::getUpdateType() const
+{
+	return static_cast<UpdateType>(m_updateType.get());
+}
+
+// ----------------------------------------------------------------------
+
+inline NetworkId const & UpdateMissileMessage::getShipId() const
+{
+	return m_shipId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int UpdateMissileMessage::getCountermeasureType() const
+{
+	return m_countermeasureType.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePostureMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePostureMessage.cpp
new file mode 100644
index 00000000..584ba832
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePostureMessage.cpp
@@ -0,0 +1,43 @@
+// UpdatePostureMessage.cpp
+// copyright 2001 Verant Interactive
+//
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/UpdatePostureMessage.h"
+
+UpdatePostureMessage::UpdatePostureMessage(const NetworkId & sourceObject, uint8 posture) : 
+GameNetworkMessage("UpdatePostureMessage"),
+m_posture(posture),
+m_target(sourceObject)
+{
+	AutoByteStream::addVariable(m_posture);
+	AutoByteStream::addVariable(m_target);
+}
+
+//-----------------------------------------------------------------------
+
+UpdatePostureMessage::UpdatePostureMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("UpdatePostureMessage"),
+m_posture(),
+m_target(NetworkId::cms_invalid)
+{
+	AutoByteStream::addVariable(m_posture);
+	AutoByteStream::addVariable(m_target);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+UpdatePostureMessage::~UpdatePostureMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void UpdatePostureMessage::pack(Archive::ByteStream & target) const
+{
+	AutoByteStream::pack(target);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePostureMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePostureMessage.h
new file mode 100644
index 00000000..9883a04a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePostureMessage.h
@@ -0,0 +1,56 @@
+// UpdatePostureMessage.h
+// copyright 2001 Verant Interactive
+// 
+
+#ifndef	_UpdatePostureMessage_H
+#define	_UpdatePostureMessage_H
+
+//-----------------------------------------------------------------------
+
+class Object;
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class UpdatePostureMessage : public GameNetworkMessage
+{
+public: //ctor/dtor
+	UpdatePostureMessage(const NetworkId & sourceObject, uint8 posture);
+	explicit UpdatePostureMessage(Archive::ReadIterator & source);
+
+	~UpdatePostureMessage  ();
+
+public: // methods
+
+	uint8            getPosture() const;
+	const NetworkId & getTarget() const;
+
+	void  pack(Archive::ByteStream & target) const;
+public: // types
+
+private: 
+	Archive::AutoVariable<uint8>     m_posture;
+	Archive::AutoVariable<NetworkId>  m_target;
+};
+
+//-----------------------------------------------------------------------
+
+inline uint8 UpdatePostureMessage::getPosture() const
+{
+	return m_posture.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId& UpdatePostureMessage::getTarget() const
+{
+	return m_target.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif // _UpdatePostureMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePvpStatusMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePvpStatusMessage.cpp
new file mode 100644
index 00000000..5984b4a8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePvpStatusMessage.cpp
@@ -0,0 +1,48 @@
+// ======================================================================
+//
+// UpdatePvpStatusMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/UpdatePvpStatusMessage.h"
+
+// ======================================================================
+
+const char * const UpdatePvpStatusMessage::MessageType = "UpdatePvpStatusMessage";
+
+UpdatePvpStatusMessage::UpdatePvpStatusMessage(const NetworkId & sourceObject, uint32 flags, uint32 factionId) :
+	GameNetworkMessage(MessageType),
+	m_flags(flags),
+	m_factionId(factionId),
+	m_target(sourceObject)
+{
+	AutoByteStream::addVariable(m_flags);
+	AutoByteStream::addVariable(m_factionId);
+	AutoByteStream::addVariable(m_target);
+}
+
+// ----------------------------------------------------------------------
+
+UpdatePvpStatusMessage::UpdatePvpStatusMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage(MessageType),
+	m_flags(0),
+	m_factionId(0),
+	m_target(NetworkId::cms_invalid)
+{
+	AutoByteStream::addVariable(m_flags);
+	AutoByteStream::addVariable(m_factionId);
+	AutoByteStream::addVariable(m_target);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+UpdatePvpStatusMessage::~UpdatePvpStatusMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePvpStatusMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePvpStatusMessage.h
new file mode 100644
index 00000000..932c9f16
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdatePvpStatusMessage.h
@@ -0,0 +1,73 @@
+// ======================================================================
+//
+// UpdatePvpStatusMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_UpdatePvpStatusMessage_H
+#define	_UpdatePvpStatusMessage_H
+
+//-----------------------------------------------------------------------
+
+class Object;
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class UpdatePvpStatusMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+public: //ctor/dtor
+	UpdatePvpStatusMessage(NetworkId const &sourceObject, uint32 flags, uint32 factionId);
+	explicit UpdatePvpStatusMessage(Archive::ReadIterator &source);
+
+	~UpdatePvpStatusMessage();
+
+public: // methods
+
+	uint32           getFlags() const;
+	uint32           getFactionId() const;
+	NetworkId const &getTarget() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<uint32>     m_flags;
+	Archive::AutoVariable<uint32>     m_factionId;
+	Archive::AutoVariable<NetworkId>  m_target;
+};
+
+// ----------------------------------------------------------------------
+
+inline uint32 UpdatePvpStatusMessage::getFlags() const
+{
+	return m_flags.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline uint32 UpdatePvpStatusMessage::getFactionId() const
+{
+	return m_factionId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const NetworkId& UpdatePvpStatusMessage::getTarget() const
+{
+	return m_target.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _UpdatePvpStatusMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateTransformMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateTransformMessage.cpp
new file mode 100644
index 00000000..2d2fde8d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateTransformMessage.cpp
@@ -0,0 +1,148 @@
+// UpdateTransformMessage.cpp
+// copyright 2003 Sony Online Entertainment
+
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/UpdateTransformMessage.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+
+#include "sharedMath/Transform.h"
+#include "sharedMath/Vector.h"
+
+//-----------------------------------------------------------------------
+namespace UpdateTransformMessageNamespace
+{
+	MemoryBlockManager* ms_memoryBlockManager;
+}
+
+using namespace UpdateTransformMessageNamespace;
+
+//-------------------------------------------------------------------
+
+void UpdateTransformMessage::install (void)
+{
+	DEBUG_FATAL (ms_memoryBlockManager, ("UpdateTransformMessage already installed"));
+
+	ms_memoryBlockManager = new MemoryBlockManager ("UpdateTransformMessage::ms_memoryBlockManager", true, sizeof(UpdateTransformMessage), 0, 0, 0);
+}
+
+//-------------------------------------------------------------------
+
+void UpdateTransformMessage::remove (void)
+{
+	DEBUG_FATAL(!ms_memoryBlockManager, ("UpdateTransformMessage is not installed"));
+
+	delete ms_memoryBlockManager;
+	ms_memoryBlockManager = 0;
+}
+
+//-------------------------------------------------------------------
+
+void *UpdateTransformMessage::operator new (size_t size)
+{
+	UNREF (size);
+	NOT_NULL (ms_memoryBlockManager);
+	DEBUG_FATAL (size != sizeof (UpdateTransformMessage), ("bad size"));
+	DEBUG_FATAL (size != static_cast<size_t> (ms_memoryBlockManager->getElementSize()), ("UpdateTransformMessage installed with bad size"));
+
+	return ms_memoryBlockManager->allocate ();
+}
+
+//-------------------------------------------------------------------
+
+void UpdateTransformMessage::operator delete (void *pointer)
+{
+	NOT_NULL (ms_memoryBlockManager);
+
+	ms_memoryBlockManager->free (pointer);
+}
+
+//-------------------------------------------------------------------
+
+UpdateTransformMessage::UpdateTransformMessage(const NetworkId& newNetworkId, int32 sequenceNumber, const Transform& transform, int8 speed, float lookAtYaw, bool useLookAtYaw) :
+GameNetworkMessage("UpdateTransformMessage"),
+m_networkId(newNetworkId),
+m_positionX(0),
+m_positionY(0),
+m_positionZ(0),
+m_sequenceNumber(sequenceNumber),
+m_speed(speed),
+m_yaw(0),
+m_lookAtYaw(0),
+m_useLookAtYaw(static_cast<uint8>(useLookAtYaw))
+{
+	addVariable(m_networkId);
+	addVariable(m_positionX);
+	addVariable(m_positionY);
+	addVariable(m_positionZ);
+	addVariable(m_sequenceNumber);
+	addVariable(m_speed);
+	addVariable(m_yaw);
+	addVariable(m_lookAtYaw);
+	addVariable(m_useLookAtYaw);
+
+	Vector pos = transform.getPosition_p();
+	//Pack position as fixed point integers
+	m_positionX.set(static_cast<int16>(pos.x * 4));
+	m_positionY.set(static_cast<int16>(pos.y * 4));
+	m_positionZ.set(static_cast<int16>(pos.z * 4));
+
+	m_yaw.set(static_cast<int8>(transform.getLocalFrameK_p().theta() * 16) );
+
+	m_lookAtYaw.set(static_cast<int8>(lookAtYaw * 16));	
+}
+
+//-----------------------------------------------------------------------
+
+UpdateTransformMessage::UpdateTransformMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("UpdateTransformMessage"),
+m_networkId(NetworkId::cms_invalid),
+m_positionX(0),
+m_positionY(0),
+m_positionZ(0),
+m_sequenceNumber(0),
+m_speed(0),
+m_yaw(0),
+m_lookAtYaw(0),
+m_useLookAtYaw(0)
+{
+	addVariable(m_networkId);
+	addVariable(m_positionX);
+	addVariable(m_positionY);
+	addVariable(m_positionZ);
+	addVariable(m_sequenceNumber);
+	addVariable(m_speed);
+	addVariable(m_yaw);
+	addVariable(m_lookAtYaw);
+	addVariable(m_useLookAtYaw);
+	AutoByteStream::unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+UpdateTransformMessage::~UpdateTransformMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const Transform UpdateTransformMessage::getTransform() const
+{
+	Transform transform;
+	Vector pos;
+	pos.x = static_cast<float>(m_positionX.get()) / 4;
+	pos.y = static_cast<float>(m_positionY.get()) / 4;
+	pos.z = static_cast<float>(m_positionZ.get()) / 4;
+
+	transform.setPosition_p(pos);
+	transform.yaw_l( static_cast<float>(m_yaw.get()) / 16 );
+	transform.reorthonormalize();
+	return transform;
+
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateTransformMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateTransformMessage.h
new file mode 100644
index 00000000..8c1b64f8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateTransformMessage.h
@@ -0,0 +1,89 @@
+// ======================================================================
+//
+// UpdateTransformMessage.h
+// copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_UpdateTransformMessage_H
+#define	INCLUDED_UpdateTransformMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ----------------------------------------------------------------------
+
+class Transform;
+
+//Optimzed packet to update a remote object on a client from a server
+
+class UpdateTransformMessage : public GameNetworkMessage
+{
+public:
+	UpdateTransformMessage	(const NetworkId& newNetworkId, int32 sequenceNumber, const Transform& transform, int8 speed, float lookAtYaw, bool useLookAtYaw);
+	explicit UpdateTransformMessage	(Archive::ReadIterator & source);
+	~UpdateTransformMessage	();
+
+	const NetworkId&    getNetworkId() const;
+	int                 getSequenceNumber() const;
+	int8                getSpeed() const;
+	const Transform     getTransform() const;
+	float				getLookAtYaw() const;
+	bool				getUseLookAtYaw() const;
+
+	static void install();
+	static void remove();
+	static void* operator new (size_t size);
+	static void  operator delete (void* pointer);
+
+	
+
+private:
+
+	Archive::AutoVariable<NetworkId>   m_networkId;
+	Archive::AutoVariable<int16>       m_positionX;
+	Archive::AutoVariable<int16>       m_positionY;
+	Archive::AutoVariable<int16>       m_positionZ;
+	Archive::AutoVariable<int32>       m_sequenceNumber;
+	Archive::AutoVariable<int8>        m_speed;
+	Archive::AutoVariable<int8>        m_yaw;
+	Archive::AutoVariable<int8>        m_lookAtYaw;
+	Archive::AutoVariable<int8>        m_useLookAtYaw;
+	
+	//todo speed
+
+};
+
+// ======================================================================
+
+inline const NetworkId& UpdateTransformMessage::getNetworkId() const
+{
+	return m_networkId.get();
+}
+
+inline int UpdateTransformMessage::getSequenceNumber() const
+{
+	return m_sequenceNumber.get();
+}
+
+inline int8 UpdateTransformMessage::getSpeed() const
+{
+	return m_speed.get();
+}
+
+inline float UpdateTransformMessage::getLookAtYaw() const
+{
+	return getUseLookAtYaw() ? (static_cast<float>(m_lookAtYaw.get()) / 16) : 0.f;
+}
+
+inline bool UpdateTransformMessage::getUseLookAtYaw() const
+{
+	return static_cast<bool>(m_useLookAtYaw.get());
+}
+
+// ======================================================================
+
+
+#endif
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateTransformWithParentMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateTransformWithParentMessage.cpp
new file mode 100644
index 00000000..f903a695
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateTransformWithParentMessage.cpp
@@ -0,0 +1,153 @@
+// UpdateTransformWithParentMessage.cpp
+// copyright 2003 Sony Online Entertainment
+
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/UpdateTransformWithParentMessage.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+
+#include "sharedMath/Transform.h"
+#include "sharedMath/Vector.h"
+
+//-----------------------------------------------------------------------
+namespace UpdateTransformWithParentMessageNamespace
+{
+	MemoryBlockManager* ms_memoryBlockManager;
+}
+
+using namespace UpdateTransformWithParentMessageNamespace;
+
+//-------------------------------------------------------------------
+
+void UpdateTransformWithParentMessage::install (void)
+{
+	DEBUG_FATAL (ms_memoryBlockManager, ("UpdateTransformWithParentMessage already installed"));
+
+	ms_memoryBlockManager = new MemoryBlockManager ("UpdateTransformWithParentMessage::ms_memoryBlockManager", true, sizeof(UpdateTransformWithParentMessage), 0, 0, 0);
+}
+
+//-------------------------------------------------------------------
+
+void UpdateTransformWithParentMessage::remove (void)
+{
+	DEBUG_FATAL(!ms_memoryBlockManager, ("UpdateTransformWithParentMessage is not installed"));
+
+	delete ms_memoryBlockManager;
+	ms_memoryBlockManager = 0;
+}
+
+//-------------------------------------------------------------------
+
+void *UpdateTransformWithParentMessage::operator new (size_t size)
+{
+	UNREF (size);
+	NOT_NULL (ms_memoryBlockManager);
+	DEBUG_FATAL (size != sizeof (UpdateTransformWithParentMessage), ("bad size"));
+	DEBUG_FATAL (size != static_cast<size_t> (ms_memoryBlockManager->getElementSize()), ("UpdateTransformWithParentMessage installed with bad size"));
+
+	return ms_memoryBlockManager->allocate ();
+}
+
+//-------------------------------------------------------------------
+
+void UpdateTransformWithParentMessage::operator delete (void *pointer)
+{
+	NOT_NULL (ms_memoryBlockManager);
+
+	ms_memoryBlockManager->free (pointer);
+}
+
+//-------------------------------------------------------------------
+
+UpdateTransformWithParentMessage::UpdateTransformWithParentMessage(const NetworkId& newNetworkId, int32 sequenceNumber, const NetworkId& cellId, const Transform& transform, int8 speed, float lookAtYaw, bool useLookAtYaw) :
+GameNetworkMessage("UpdateTransformWithParentMessage"),
+m_cellId(cellId),
+m_networkId(newNetworkId),
+m_positionX(0),
+m_positionY(0),
+m_positionZ(0),
+m_sequenceNumber(sequenceNumber),
+m_speed(speed),
+m_yaw(0),
+m_lookAtYaw(0),
+m_useLookAtYaw(static_cast<uint8>(useLookAtYaw))
+{
+	addVariable(m_cellId);
+	addVariable(m_networkId);
+	addVariable(m_positionX);
+	addVariable(m_positionY);
+	addVariable(m_positionZ);
+	addVariable(m_sequenceNumber);
+	addVariable(m_speed);
+	addVariable(m_yaw);
+	addVariable(m_lookAtYaw);
+	addVariable(m_useLookAtYaw);
+
+	Vector pos = transform.getPosition_p();
+	//Pack position as fixed point integers
+	m_positionX.set(static_cast<int16>(pos.x * 8));
+	m_positionY.set(static_cast<int16>(pos.y * 8));
+	m_positionZ.set(static_cast<int16>(pos.z * 8));
+
+	m_yaw.set(static_cast<int8>(transform.getLocalFrameK_p().theta() * 16) );
+
+	m_lookAtYaw.set(static_cast<int8>(lookAtYaw * 16));
+}
+
+//-----------------------------------------------------------------------
+
+UpdateTransformWithParentMessage::UpdateTransformWithParentMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("UpdateTransformWithParentMessage"),
+m_cellId(NetworkId::cms_invalid),
+m_networkId(NetworkId::cms_invalid),
+m_positionX(0),
+m_positionY(0),
+m_positionZ(0),
+m_sequenceNumber(0),
+m_speed(0),
+m_yaw(0),
+m_lookAtYaw(0),
+m_useLookAtYaw(0)
+{
+	addVariable(m_cellId);
+	addVariable(m_networkId);
+	addVariable(m_positionX);
+	addVariable(m_positionY);
+	addVariable(m_positionZ);
+	addVariable(m_sequenceNumber);
+	addVariable(m_speed);
+	addVariable(m_yaw);
+	addVariable(m_lookAtYaw);
+	addVariable(m_useLookAtYaw);
+	AutoByteStream::unpack(source);
+
+}
+
+//-----------------------------------------------------------------------
+
+UpdateTransformWithParentMessage::~UpdateTransformWithParentMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const Transform UpdateTransformWithParentMessage::getTransform() const
+{
+	Transform transform;
+	Vector pos;
+	pos.x = static_cast<float>(m_positionX.get()) / 8;
+	pos.y = static_cast<float>(m_positionY.get()) / 8;
+	pos.z = static_cast<float>(m_positionZ.get()) / 8;
+
+	transform.setPosition_p(pos);
+	transform.yaw_l( static_cast<float>(m_yaw.get()) / 16 );
+	transform.reorthonormalize();
+	return transform;
+
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateTransformWithParentMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateTransformWithParentMessage.h
new file mode 100644
index 00000000..91c75bbf
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/UpdateTransformWithParentMessage.h
@@ -0,0 +1,98 @@
+// ======================================================================
+//
+// UpdateTransformWithParentMessage.h
+// copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_UpdateTransformWithParentMessage_H
+#define	INCLUDED_UpdateTransformWithParentMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ----------------------------------------------------------------------
+
+class Transform;
+
+//Optimzed packet to update a remote object on a client from a server
+
+class UpdateTransformWithParentMessage : public GameNetworkMessage
+{
+public:
+	UpdateTransformWithParentMessage	(const NetworkId& newNetworkId, int32 sequenceNumber, const NetworkId& cellId, const Transform& transform, int8 speed, float lookAtYaw, bool useLookAtYaw);
+	explicit UpdateTransformWithParentMessage	(Archive::ReadIterator & source);
+	~UpdateTransformWithParentMessage	();
+
+	const NetworkId&    getCellId() const;
+	const NetworkId&    getNetworkId() const;
+	int                 getSequenceNumber() const;
+	int8                getSpeed() const;
+	const Transform     getTransform() const;
+	float				getLookAtYaw() const;
+	bool				getUseLookAtYaw() const;
+
+	static void install();
+	static void remove();
+	static void* operator new (size_t size);
+	static void  operator delete (void* pointer);
+
+	
+
+private:
+
+	Archive::AutoVariable<NetworkId>   m_cellId;
+	Archive::AutoVariable<NetworkId>   m_networkId;
+	Archive::AutoVariable<int16>       m_positionX;
+	Archive::AutoVariable<int16>       m_positionY;
+	Archive::AutoVariable<int16>       m_positionZ;
+	Archive::AutoVariable<int32>       m_sequenceNumber;
+	Archive::AutoVariable<int8>        m_speed;
+	Archive::AutoVariable<int8>        m_yaw;
+	Archive::AutoVariable<int8>        m_lookAtYaw;
+	Archive::AutoVariable<int8>        m_useLookAtYaw;
+
+	//todo speed
+
+};
+
+// ======================================================================
+
+
+inline const NetworkId& UpdateTransformWithParentMessage::getCellId() const
+{
+	return m_cellId.get();
+}
+
+inline const NetworkId& UpdateTransformWithParentMessage::getNetworkId() const
+{
+	return m_networkId.get();
+}
+
+inline int UpdateTransformWithParentMessage::getSequenceNumber() const
+{
+	return m_sequenceNumber.get();
+}
+
+inline int8 UpdateTransformWithParentMessage::getSpeed() const
+{
+	return m_speed.get();
+}
+
+inline float UpdateTransformWithParentMessage::getLookAtYaw() const
+{
+	return (m_useLookAtYaw.get()) ? (static_cast<float>(m_lookAtYaw.get()) / 16) : 0.f;
+}
+
+inline bool UpdateTransformWithParentMessage::getUseLookAtYaw() const
+{
+	return static_cast<bool>(m_useLookAtYaw.get());
+}
+
+
+// ======================================================================
+
+
+#endif
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/WhoListMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/WhoListMessage.cpp
new file mode 100644
index 00000000..2acb85a1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/WhoListMessage.cpp
@@ -0,0 +1,49 @@
+// ======================================================================
+//
+// WhoListMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/WhoListMessage.h"
+
+//-----------------------------------------------------------------------
+
+const char * const WhoListMessage::MESSAGE_TYPE = "WhoListMessage::MESSAGE_TYPE";
+
+//-----------------------------------------------------------------
+
+WhoListMessage::WhoListMessage() :
+GameNetworkMessage (MESSAGE_TYPE),
+m_data ()
+{
+	addVariable (m_data);
+}
+
+//-----------------------------------------------------------------------
+
+WhoListMessage::WhoListMessage(Archive::ReadIterator & source) :
+GameNetworkMessage (MESSAGE_TYPE),
+m_data ()
+{
+	addVariable (m_data);
+	unpack (source);
+}
+
+//-----------------------------------------------------------------------
+
+void WhoListMessage::setData (const stdvector<Unicode::String>::fwd & data)
+{
+	m_data.set (data);
+}
+
+//----------------------------------------------------------------------
+
+WhoListMessage::~WhoListMessage()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/WhoListMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/WhoListMessage.h
new file mode 100644
index 00000000..8dd847a8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/WhoListMessage.h
@@ -0,0 +1,56 @@
+
+// ======================================================================
+//
+// WhoListMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_WhoListMessage_H
+#define INCLUDED_WhoListMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "Unicode.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+class GameInByteStream;
+class GameOutByteStream;
+
+//-----------------------------------------------------------------------
+
+class WhoListMessage : public GameNetworkMessage
+{
+public:
+
+	static const char * const MESSAGE_TYPE;
+
+	           WhoListMessage ();
+	explicit   WhoListMessage (Archive::ReadIterator & source);
+	virtual   ~WhoListMessage ();
+
+	const stdvector<Unicode::String>::fwd &    getDataArray () const;
+	void                                       setData (const stdvector<Unicode::String>::fwd & data);
+	
+private:
+
+	Archive::AutoArray<Unicode::String>        m_data;
+
+private:
+	WhoListMessage(const WhoListMessage&);
+	WhoListMessage& operator= (const WhoListMessage&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const stdvector<Unicode::String>::fwd & WhoListMessage::getDataArray () const
+{
+	return m_data.get ();
+}
+
+//-----------------------------------------------------------------
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/ClientLoginMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/ClientLoginMessages.cpp
new file mode 100644
index 00000000..6b4b8d93
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/ClientLoginMessages.cpp
@@ -0,0 +1,135 @@
+// ClientLoginMessages.cpp
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ClientLoginMessages.h"
+
+#include "sharedFoundation/ConfigFile.h"
+
+//-----------------------------------------------------------------------
+
+//-- todo add SetupSharedNetworkMessages.* and ConfigSharedNetworkMessages.*
+#define ConfigVersion ConfigFile::getKeyString("SharedNetworkMessages", "version", 0)
+
+LoginClientId::LoginClientId(const std::string & newId, const std::string & newKey) :
+GameNetworkMessage("LoginClientId"),
+id(newId),
+key(newKey),
+version(ConfigVersion ? ConfigVersion : NetworkVersionId)  //-- todo production build should not allow this
+{
+	WARNING(ConfigVersion, ("Network version override detected: %s", ConfigVersion));
+	addVariable(id);
+	addVariable(key);
+	addVariable(version);
+}
+
+#undef ConfigVersion
+
+//-----------------------------------------------------------------------
+
+LoginClientId::LoginClientId(Archive::ReadIterator & source) :
+GameNetworkMessage("LoginClientId"),
+id(),
+key(),
+version()
+{
+	addVariable(id);
+	addVariable(key);
+	addVariable(version);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoginClientId::~LoginClientId()
+{
+}
+
+//-----------------------------------------------------------------------
+
+LoginClientToken::LoginClientToken(const unsigned char * const newToken, const unsigned char newTokenSize, uint32 suid, const std::string & username) :
+GameNetworkMessage("LoginClientToken"),
+token      (),
+tokenData  (0),
+stationId  (suid),
+m_username (username)
+{
+
+	tokenData = new unsigned char[newTokenSize];
+	memcpy(tokenData, newToken, newTokenSize);
+
+	// todo: preallocated token with newTokenSize bytes
+	std::vector<unsigned char> a;
+	for(unsigned int i = 0; i < newTokenSize; ++i)
+	{
+		a.push_back(newToken[i]);
+	}
+	token.set(a);
+	addVariable(token);
+	addVariable(stationId);
+	addVariable(m_username);
+}
+
+//-----------------------------------------------------------------------
+
+LoginClientToken::LoginClientToken(Archive::ReadIterator & source) :
+GameNetworkMessage("LoginClientToken"),
+token      (),
+tokenData  (0),
+stationId  (0),
+m_username ()
+{
+	addVariable(token);
+	addVariable(stationId);
+	addVariable(m_username);
+	AutoByteStream::unpack(source);
+
+	unsigned int tokenSize = token.get().size();
+	tokenData = new unsigned char[tokenSize];
+	for(unsigned int i = 0; i < tokenSize; i ++)
+	{
+		tokenData[i] = token.get()[i];
+	}
+}
+
+//-----------------------------------------------------------------------
+
+LoginClientToken::~LoginClientToken()
+{
+	delete[] tokenData;
+}
+
+//-----------------------------------------------------------------------
+
+LoginIncorrectClientId::LoginIncorrectClientId(const std::string & newServerId, const std::string & newServerApplicationVersion) :
+GameNetworkMessage("LoginIncorrectClientId"),
+serverId(newServerId),
+serverApplicationVersion(newServerApplicationVersion)
+{
+	addVariable(serverId);
+	addVariable(serverApplicationVersion);
+}
+
+//-----------------------------------------------------------------------
+
+LoginIncorrectClientId::LoginIncorrectClientId(Archive::ReadIterator & source) :
+GameNetworkMessage("LoginIncorrectClientId"),
+serverId(),
+serverApplicationVersion()
+{
+	addVariable(serverId);
+	addVariable(serverApplicationVersion);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoginIncorrectClientId::~LoginIncorrectClientId()
+{
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/ClientLoginMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/ClientLoginMessages.h
new file mode 100644
index 00000000..c2ef738e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/ClientLoginMessages.h
@@ -0,0 +1,150 @@
+// ClientLoginMessages.h
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ClientLoginMessages_H
+#define	_INCLUDED_ClientLoginMessages_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+namespace ClientLoginMessageConstants
+{
+	const unsigned char        EnumerateCluster = 1;
+	const unsigned char        ClientLoginId    = 2;
+	const unsigned char        LoginToken       = 3;
+}
+
+//-----------------------------------------------------------------------
+
+class LoginClientId : public GameNetworkMessage
+{
+public:
+	LoginClientId(const std::string & newId, const std::string & newKey);
+	LoginClientId(Archive::ReadIterator & source);
+	~LoginClientId();
+	const std::string &  getId  () const;
+	const std::string &  getKey () const;
+	const std::string &  getVersion () const;
+private:
+	Archive::AutoVariable<std::string>          id;
+	Archive::AutoVariable<std::string>          key;
+	Archive::AutoVariable<std::string>          version;
+
+	LoginClientId();
+	LoginClientId(const LoginClientId&);
+	LoginClientId& operator= (const LoginClientId&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & LoginClientId::getId() const
+{
+	return id.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & LoginClientId::getKey() const
+{
+	return key.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & LoginClientId::getVersion() const
+{
+	return version.get();
+}
+
+//-----------------------------------------------------------------------
+
+class LoginClientToken : public GameNetworkMessage
+{
+public:
+	LoginClientToken(const unsigned char * const newToken, const unsigned char newTokenSize, uint32 suid, const std::string & username);
+	LoginClientToken(Archive::ReadIterator & source);
+	~LoginClientToken();
+
+	const unsigned char * const getToken     () const;
+	const unsigned char         getTokenSize () const;
+	const uint32                getStationId () const;
+	const std::string &         getUsername  () const;
+
+	
+private:
+	Archive::AutoArray<unsigned char>  token;
+	unsigned char *                    tokenData;
+	Archive::AutoVariable<uint32>      stationId;
+	Archive::AutoVariable<std::string> m_username;
+
+	LoginClientToken();
+	LoginClientToken(const LoginClientToken&);
+	LoginClientToken& operator= (const LoginClientToken&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned char * const LoginClientToken::getToken() const
+{
+	return tokenData;
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned char LoginClientToken::getTokenSize() const
+{
+	return static_cast<unsigned char>(token.get().size());
+}
+
+//-----------------------------------------------------------------------
+
+inline const uint32 LoginClientToken::getStationId() const
+{
+	return stationId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & LoginClientToken::getUsername  () const
+{
+	return m_username.get ();
+}
+
+//-----------------------------------------------------------------------
+
+class LoginIncorrectClientId : public GameNetworkMessage
+{
+public:
+	LoginIncorrectClientId(const std::string & newServerId, const std::string & newServerApplicationVersion);
+	LoginIncorrectClientId(Archive::ReadIterator & source);
+	~LoginIncorrectClientId();
+	const std::string &  getServerId                  () const;
+	const std::string &  getServerApplicationVersion  () const;
+private:
+	Archive::AutoVariable<std::string>          serverId;
+	Archive::AutoVariable<std::string>          serverApplicationVersion;
+
+	LoginIncorrectClientId();
+	LoginIncorrectClientId(const LoginIncorrectClientId&);
+	LoginIncorrectClientId& operator= (const LoginIncorrectClientId&);
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & LoginIncorrectClientId::getServerId() const
+{
+	return serverId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & LoginIncorrectClientId::getServerApplicationVersion() const
+{
+	return serverApplicationVersion.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ClientLoginMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginClusterStatus.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginClusterStatus.cpp
new file mode 100644
index 00000000..43ddf4de
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginClusterStatus.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// LoginClusterStatus.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/LoginClusterStatus.h"
+
+// ======================================================================
+
+const char * const LoginClusterStatus::MessageType = "LoginClusterStatus";
+
+LoginClusterStatus::LoginClusterStatus(const std::vector<ClusterData> &data) :
+		GameNetworkMessage(LoginClusterStatus::MessageType),
+		m_data()
+{
+	m_data.set(data);
+	addVariable(m_data);
+}
+
+//-----------------------------------------------------------------------
+
+LoginClusterStatus::LoginClusterStatus(Archive::ReadIterator & source) :
+		GameNetworkMessage(LoginClusterStatus::MessageType),
+		m_data()
+{
+	addVariable(m_data);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoginClusterStatus::~LoginClusterStatus()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginClusterStatus.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginClusterStatus.h
new file mode 100644
index 00000000..6c074132
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginClusterStatus.h
@@ -0,0 +1,116 @@
+// ======================================================================
+//
+// LoginClusterStatus.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_LoginClusterStatus_H
+#define INCLUDED_LoginClusterStatus_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+struct LoginClusterStatus_ClusterData
+{
+	enum Status {S_down, S_loading, S_up, S_locked, S_restricted, S_full};
+
+	// enum value must be ordered in ascending population density
+	enum PopulationStatus {PS_LOWEST = 0, PS_very_light = PS_LOWEST, PS_light, PS_medium, PS_heavy, PS_very_heavy, PS_extremely_heavy, PS_full, PS_HIGHEST = PS_full};
+
+	uint32      m_clusterId;
+	std::string m_connectionServerAddress;
+	uint16      m_connectionServerPort;
+	uint16      m_connectionServerPingPort;
+	int         m_populationOnline; // must be signed, -1 is a legitimate value meaning not available (for security reason)
+	PopulationStatus m_populationOnlineStatus;
+	int         m_maxCharactersPerAccount;
+	int         m_timeZone;
+	Status      m_status;
+	bool        m_dontRecommend;
+	uint32      m_onlinePlayerLimit;
+	uint32      m_onlineFreeTrialLimit;
+};
+
+/**
+ * Sent From:  LoginServer
+ * Sent To:    Client
+ * Action:     Lists all the clusters that are currently available for login.
+*/
+class LoginClusterStatus : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	typedef LoginClusterStatus_ClusterData ClusterData;
+	
+public:
+	const std::vector<ClusterData> &getData() const;
+	//	void addCluster(uint32 clusterId, const std::string &m_clusterName);
+	
+public:
+	LoginClusterStatus(const std::vector<ClusterData> &data);
+	LoginClusterStatus(Archive::ReadIterator & source);
+	~LoginClusterStatus();
+	
+private:
+	Archive::AutoArray<ClusterData> m_data;
+	
+private: //disable
+	LoginClusterStatus();
+	LoginClusterStatus(const LoginClusterStatus&);
+	LoginClusterStatus& operator= (const LoginClusterStatus&);
+};
+
+// ======================================================================
+
+namespace Archive
+{
+	inline void get(ReadIterator & source, LoginClusterStatus_ClusterData &c)
+	{
+		get(source,c.m_clusterId);
+		get(source,c.m_connectionServerAddress);
+		get(source,c.m_connectionServerPort);
+		get(source,c.m_connectionServerPingPort);
+		get(source,c.m_populationOnline);
+		int tempStatus;
+		get(source,tempStatus);
+		c.m_populationOnlineStatus=static_cast<LoginClusterStatus_ClusterData::PopulationStatus>(tempStatus);
+		get(source,c.m_maxCharactersPerAccount);
+		get(source,c.m_timeZone);
+		get(source,tempStatus);
+		c.m_status=static_cast<LoginClusterStatus_ClusterData::Status>(tempStatus);
+		get(source,c.m_dontRecommend);
+		get(source,c.m_onlinePlayerLimit);
+		get(source,c.m_onlineFreeTrialLimit);
+	}
+
+	inline void put(ByteStream & target, const LoginClusterStatus_ClusterData &c)
+	{
+		put(target,c.m_clusterId);
+		put(target,c.m_connectionServerAddress);
+		put(target,c.m_connectionServerPort);
+		put(target,c.m_connectionServerPingPort);
+		put(target,c.m_populationOnline);
+		put(target,static_cast<int>(c.m_populationOnlineStatus));
+		put(target,c.m_maxCharactersPerAccount);
+		put(target,c.m_timeZone);
+		put(target,static_cast<int>(c.m_status));
+		put(target,c.m_dontRecommend);
+		put(target,c.m_onlinePlayerLimit);
+		put(target,c.m_onlineFreeTrialLimit);
+	}
+}
+
+// ======================================================================
+
+inline const std::vector<LoginClusterStatus::ClusterData> &LoginClusterStatus::getData() const
+{
+	return m_data.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginClusterStatusEx.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginClusterStatusEx.cpp
new file mode 100644
index 00000000..c8737ffc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginClusterStatusEx.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// LoginClusterStatusEx.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/LoginClusterStatusEx.h"
+
+// ======================================================================
+
+const char * const LoginClusterStatusEx::MessageType = "LoginClusterStatusEx";
+
+LoginClusterStatusEx::LoginClusterStatusEx(const std::vector<ClusterData> &data) :
+		GameNetworkMessage(LoginClusterStatusEx::MessageType),
+		m_data()
+{
+	m_data.set(data);
+	addVariable(m_data);
+}
+
+//-----------------------------------------------------------------------
+
+LoginClusterStatusEx::LoginClusterStatusEx(Archive::ReadIterator & source) :
+		GameNetworkMessage(LoginClusterStatusEx::MessageType),
+		m_data()
+{
+	addVariable(m_data);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoginClusterStatusEx::~LoginClusterStatusEx()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginClusterStatusEx.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginClusterStatusEx.h
new file mode 100644
index 00000000..7a77164f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginClusterStatusEx.h
@@ -0,0 +1,93 @@
+// ======================================================================
+//
+// LoginClusterStatusEx.h
+// copyright (c) 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_LoginClusterStatusEx_H
+#define INCLUDED_LoginClusterStatusEx_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+/**
+ * Sent From:  LoginServer
+ * Sent To:    Client
+ * Action:     Provides extended cluster data (branch; changelist info)
+*/
+class LoginClusterStatusEx : public GameNetworkMessage
+{
+public:
+
+	static const char * const MessageType;
+
+	struct ClusterData
+	{
+		uint32      m_clusterId;
+		std::string m_branch;
+		std::string m_networkVersion;
+		uint32      m_version;
+		uint32      m_reserved1;
+		uint32      m_reserved2;
+		uint32      m_reserved3;
+		uint32      m_reserved4;
+	};
+	
+public:
+	const std::vector<ClusterData> &getData() const;
+	
+public:
+	LoginClusterStatusEx(const std::vector<ClusterData> &data);
+	LoginClusterStatusEx(Archive::ReadIterator & source);
+	~LoginClusterStatusEx();
+	
+private:
+	Archive::AutoArray<ClusterData> m_data;
+	
+private: //disable
+	LoginClusterStatusEx();
+	LoginClusterStatusEx(const LoginClusterStatusEx&);
+	LoginClusterStatusEx& operator= (const LoginClusterStatusEx&);
+};
+
+// ======================================================================
+
+namespace Archive
+{
+	inline void get(ReadIterator & source, LoginClusterStatusEx::ClusterData &c)
+	{
+		get( source, c.m_clusterId );
+		get( source, c.m_branch );
+		get( source, c.m_networkVersion );
+		get( source, c.m_version );
+		get( source, c.m_reserved1 );
+		get( source, c.m_reserved2 );
+		get( source, c.m_reserved3 );
+		get( source, c.m_reserved4 );
+	}
+
+	inline void put(ByteStream & target, const LoginClusterStatusEx::ClusterData &c)
+	{
+		put( target, c.m_clusterId );
+		put( target, c.m_branch );
+		put( target, c.m_networkVersion );
+		put( target, c.m_version );
+		put( target, c.m_reserved1 );
+		put( target, c.m_reserved2 );
+		put( target, c.m_reserved3 );
+		put( target, c.m_reserved4 );
+	}
+}
+
+// ======================================================================
+
+inline const std::vector<LoginClusterStatusEx::ClusterData> &LoginClusterStatusEx::getData() const
+{
+	return m_data.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginEnumCluster.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginEnumCluster.cpp
new file mode 100644
index 00000000..f9aba95f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginEnumCluster.cpp
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// LoginEnumCluster.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/LoginEnumCluster.h"
+
+// ======================================================================
+
+LoginEnumCluster::LoginEnumCluster(const std::vector<ClusterData> &data, int maxCharactersPerAccount) :
+		GameNetworkMessage("LoginEnumCluster"),
+		m_data(),
+		m_maxCharactersPerAccount(maxCharactersPerAccount)
+{
+	m_data.set(data);
+	addVariable(m_data);
+	addVariable(m_maxCharactersPerAccount);
+	// maxCharactersPerAccount is not directly related to the cluster list, but it's something we need
+	// to tell the client about at the same time that we send the cluster list.
+	// Including it here seems cheaper than making a separate message for it.
+}
+
+//-----------------------------------------------------------------------
+
+LoginEnumCluster::LoginEnumCluster(Archive::ReadIterator & source) :
+		GameNetworkMessage("LoginEnumCluster"),
+		m_data()
+{
+	addVariable(m_data);
+	addVariable(m_maxCharactersPerAccount);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+LoginEnumCluster::~LoginEnumCluster()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginEnumCluster.h b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginEnumCluster.h
new file mode 100644
index 00000000..5b73fd9b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientLoginServer/LoginEnumCluster.h
@@ -0,0 +1,81 @@
+// ======================================================================
+//
+// LoginEnumCluster.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_LoginEnumCluster_H
+#define INCLUDED_LoginEnumCluster_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+struct LoginEnumCluster_ClusterData
+{
+	uint32      m_clusterId;
+	std::string m_clusterName;
+	int         m_timeZone;
+};
+
+class LoginEnumCluster : public GameNetworkMessage
+{
+  public:
+	typedef LoginEnumCluster_ClusterData ClusterData;
+
+  public:
+	const std::vector<ClusterData> &getData() const;
+	int getMaxCharactersPerAccount() const;
+
+  public:
+	LoginEnumCluster(const std::vector<ClusterData> &data, int maxCharactersPerAccount);
+	LoginEnumCluster(Archive::ReadIterator & source);
+	~LoginEnumCluster();
+
+  private:
+	Archive::AutoArray<ClusterData> m_data;
+	Archive::AutoVariable<int> m_maxCharactersPerAccount;
+
+  private: //disable
+	LoginEnumCluster();
+	LoginEnumCluster(const LoginEnumCluster&);
+	LoginEnumCluster& operator= (const LoginEnumCluster&);
+};
+
+// ======================================================================
+
+namespace Archive
+{
+	inline void get(ReadIterator & source, LoginEnumCluster_ClusterData &c)
+	{
+		get(source, c.m_clusterId);
+		get(source, c.m_clusterName);
+		get(source, c.m_timeZone);
+	}
+
+	inline void put(ByteStream & target, const LoginEnumCluster_ClusterData &c)
+	{
+		put(target, c.m_clusterId);
+		put(target, c.m_clusterName);
+		put(target, c.m_timeZone);
+	}
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::vector<LoginEnumCluster::ClusterData> &LoginEnumCluster::getData() const
+{
+	return m_data.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int LoginEnumCluster::getMaxCharactersPerAccount() const
+{
+	return m_maxCharactersPerAccount.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/BaselinesMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/BaselinesMessage.cpp
new file mode 100644
index 00000000..a47b7e02
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/BaselinesMessage.cpp
@@ -0,0 +1,146 @@
+// 
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/BaselinesMessage.h"
+#include "sharedNetwork/NetworkHandler.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+
+//-----------------------------------------------------------------------
+
+namespace BaselinesMessageNamespace
+{
+	MemoryBlockManager* ms_memoryBlockManager;
+}
+
+using namespace BaselinesMessageNamespace;
+
+//-------------------------------------------------------------------
+
+void BaselinesMessage::install (void)
+{
+	DEBUG_FATAL (ms_memoryBlockManager, ("BaselinesMessage already installed"));
+
+	ms_memoryBlockManager = new MemoryBlockManager ("BaselinesMessage::ms_memoryBlockManager", true, sizeof(BaselinesMessage), 0, 0, 0);
+}
+
+//-------------------------------------------------------------------
+
+void BaselinesMessage::remove (void)
+{
+	DEBUG_FATAL(!ms_memoryBlockManager, ("BaselinesMessage is not installed"));
+
+	delete ms_memoryBlockManager;
+	ms_memoryBlockManager = 0;
+}
+
+//-------------------------------------------------------------------
+
+void *BaselinesMessage::operator new (size_t size)
+{
+	UNREF (size);
+	NOT_NULL (ms_memoryBlockManager);
+	DEBUG_FATAL (size != sizeof (BaselinesMessage), ("bad size"));
+	DEBUG_FATAL (size != static_cast<size_t> (ms_memoryBlockManager->getElementSize()), ("BaselinesMessage installed with bad size"));
+
+	return ms_memoryBlockManager->allocate ();
+}
+
+//-------------------------------------------------------------------
+
+void BaselinesMessage::operator delete (void *pointer)
+{
+	NOT_NULL (ms_memoryBlockManager);
+
+	ms_memoryBlockManager->free (pointer);
+}
+
+//-------------------------------------------------------------------
+
+BaselinesMessage::BaselinesMessage(const NetworkId &networkId, const Tag objectType, const Archive::AutoByteStream & sourcePackage, const unsigned char newPackageId) :
+GameNetworkMessage("BaselinesMessage"),
+target(networkId),
+typeId(objectType),
+packageId(newPackageId),
+package()
+{
+	static Archive::ByteStream bs;
+	int s = bs.getSize();
+	AutoByteStream::addVariable(target);
+	AutoByteStream::addVariable(typeId);
+	AutoByteStream::addVariable(packageId);
+	AutoByteStream::addVariable(package);
+	bs.clear();
+	sourcePackage.pack(bs);
+	package.set(bs);
+	char numbuf[256] = {"\0"};
+	char tag[5];
+	ConvertTagToString(objectType, tag);
+	snprintf(numbuf, sizeof(numbuf), "send.BaselinesMessage.%s", tag);
+	NetworkHandler::reportMessage(numbuf, s);
+}
+
+//-----------------------------------------------------------------------
+
+BaselinesMessage::BaselinesMessage(const NetworkId id, 
+	                               const Tag objectType, 
+	                               const unsigned char newPackageId, 
+	                               const Archive::ByteStream & newPackage) :
+GameNetworkMessage("BaselinesMessage"),
+target(id),
+typeId(objectType),
+packageId(newPackageId),
+package(newPackage)
+{
+	int s = newPackage.getSize();
+	AutoByteStream::addVariable(target);
+	AutoByteStream::addVariable(typeId);
+	AutoByteStream::addVariable(packageId);
+	AutoByteStream::addVariable(package);
+	char numbuf[256] = {"\0"};
+	char tag[5];
+	ConvertTagToString(objectType, tag);
+	snprintf(numbuf, sizeof(numbuf), "send.BaselinesMessage.%s", tag);
+	NetworkHandler::reportMessage(numbuf, s);	
+}
+
+//-----------------------------------------------------------------------
+
+BaselinesMessage::BaselinesMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("BaselinesMessage"),
+target(NetworkId::cms_invalid),
+typeId(0),
+packageId(0),
+package()
+{
+	int s = source.getSize();
+	AutoByteStream::addVariable(target);
+	AutoByteStream::addVariable(typeId);
+	AutoByteStream::addVariable(packageId);
+	AutoByteStream::addVariable(package);
+	unpack(source);
+	char numbuf[256] = {"\0"};
+	char tag[5];
+	ConvertTagToString(typeId.get(), tag);
+	snprintf(numbuf, sizeof(numbuf), "recv.BaselinesMessage.%s", tag);
+	NetworkHandler::reportMessage(numbuf, s);
+	
+}
+
+//-----------------------------------------------------------------------
+
+BaselinesMessage::~BaselinesMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void BaselinesMessage::pack(Archive::ByteStream & target) const
+{
+	AutoByteStream::pack(target);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/BaselinesMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/BaselinesMessage.h
new file mode 100644
index 00000000..ed0b830f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/BaselinesMessage.h
@@ -0,0 +1,101 @@
+// BaselinesMessage.h
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_BaselinesMessage_H
+#define	_BaselinesMessage_H
+
+//-----------------------------------------------------------------------
+
+class Object;
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/Tag.h"
+#include "sharedFoundation/NetworkId.h"
+
+//-----------------------------------------------------------------------
+
+class BaselinesMessage : public GameNetworkMessage
+{
+public: //ctor/dtor
+	BaselinesMessage   (const NetworkId &networkId,
+						const Tag objectType,
+	                    const Archive::AutoByteStream & sourcePackage, 
+	                    const unsigned char packageId);
+
+	BaselinesMessage   (const NetworkId id, 
+		                const Tag objectType, 
+	                    const unsigned char newPackageId, 
+						const Archive::ByteStream & newPackage);
+
+	explicit BaselinesMessage   (Archive::ReadIterator & source);
+
+	~BaselinesMessage  ();
+
+public: // methods
+	const NetworkId              getTarget          () const;
+	const unsigned char          getPackageId       () const;
+	const Tag                    getTypeId          () const;
+	const Archive::ByteStream &  getPackage         () const;
+
+	void                         pack               (Archive::ByteStream & target) const;
+
+	static void  install (void);
+	static void  remove (void);
+	static void* operator new (size_t size);
+	static void  operator delete (void* pointer);
+
+public: // types
+	enum
+	{
+		BASELINES_CLIENT_ONLY,
+		BASELINES_CLIENT_SERVER,
+		BASELINES_SERVER,
+		BASELINES_SHARED,
+		BASELINES_CLIENT_SERVER_NP,
+		BASELINES_SERVER_NP,
+		BASELINES_SHARED_NP,
+		BASELINES_UI,
+		BASELINES_FIRST_PARENT_CLIENT_SERVER,
+		BASELINES_FIRST_PARENT_CLIENT_SERVER_NP
+	};
+
+private: 
+	Archive::AutoVariable<NetworkId>            target;
+	Archive::AutoVariable<Tag>                  typeId;
+	Archive::AutoVariable<unsigned char>        packageId;
+	Archive::AutoVariable<Archive::ByteStream>  package;
+};
+
+//-----------------------------------------------------------------------
+
+inline const unsigned char BaselinesMessage::getPackageId() const
+{
+	return packageId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Archive::ByteStream & BaselinesMessage::getPackage() const
+{
+	return package.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId BaselinesMessage::getTarget() const
+{
+	return target.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Tag BaselinesMessage::getTypeId() const
+{
+	return typeId.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif // _BaselinesMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/BatchBaselinesMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/BatchBaselinesMessage.cpp
new file mode 100644
index 00000000..507be8e7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/BatchBaselinesMessage.cpp
@@ -0,0 +1,88 @@
+// ======================================================================
+//
+// BatchBaselinesMessage.cpp
+// copyright (c) 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/BatchBaselinesMessage.h"
+
+// ======================================================================
+
+BatchBaselinesMessage::BatchBaselinesMessage(std::vector<BatchBaselinesMessageData> const & data) :
+		GameNetworkMessage("BatchBaselinesMessage"),
+		m_data()
+{
+	m_data.set(data);
+
+	addVariable(m_data);
+}
+
+// ----------------------------------------------------------------------
+
+BatchBaselinesMessage::BatchBaselinesMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("BatchBaselinesMessage"),
+		m_data()
+{
+	addVariable(m_data);
+
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+BatchBaselinesMessage::~BatchBaselinesMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<BatchBaselinesMessageData> const & BatchBaselinesMessage::getData() const
+{
+	return m_data.get();
+}
+
+// ======================================================================
+
+BatchBaselinesMessageData::BatchBaselinesMessageData(NetworkId const & networkId, Tag objectType, char packageId, Archive::ByteStream const & package) :
+		m_networkId(networkId),
+		m_objectType(objectType),
+		m_packageId(packageId),
+		m_package(package)
+{
+}
+
+// ----------------------------------------------------------------------
+
+BatchBaselinesMessageData::BatchBaselinesMessageData() :
+		m_networkId(NetworkId::cms_invalid),
+		m_objectType(),
+		m_packageId(0),
+		m_package()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void Archive::put(Archive::ByteStream & target, BatchBaselinesMessageData const & source)
+{
+	put(target,source.m_networkId);
+	put(target,source.m_objectType);
+	put(target,source.m_packageId);
+	put(target,source.m_package);
+}
+
+// ----------------------------------------------------------------------
+
+void Archive::get(Archive::ReadIterator & source, BatchBaselinesMessageData & target)
+{
+	get(source,target.m_networkId);
+	get(source,target.m_objectType);
+	get(source,target.m_packageId);
+	ByteStream temp;
+	get(source,temp);
+	target.m_package=temp;
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/BatchBaselinesMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/BatchBaselinesMessage.h
new file mode 100644
index 00000000..9664b900
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/BatchBaselinesMessage.h
@@ -0,0 +1,64 @@
+// ======================================================================
+//
+// BatchBaselinesMessage.h
+// copyright (c) 2005 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_BatchBaselinesMessage_H
+#define INCLUDED_BatchBaselinesMessage_H
+
+// ======================================================================
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/Tag.h"
+#include "sharedFoundation/NetworkId.h"
+
+// ======================================================================
+
+class BatchBaselinesMessageData
+{
+public:
+	NetworkId m_networkId;
+	Tag m_objectType;
+	signed char m_packageId; // For some reason, GCC can't pick the right version of "unpack" unless "signed char" is used instead of "char"
+	Archive::ByteStream m_package;
+
+public:
+	BatchBaselinesMessageData(NetworkId const & networkId, Tag objectType, char packageId, Archive::ByteStream const & package);
+	BatchBaselinesMessageData();
+};
+
+// ======================================================================
+
+/**
+ * A single network message that consolidates a large batch of baselines
+ * Avoids the overhead of constructing and sending a BaselinesMessage
+ * for every baseline.
+ */
+class BatchBaselinesMessage : public GameNetworkMessage
+{
+public:
+	BatchBaselinesMessage(std::vector<BatchBaselinesMessageData> const & data);
+	explicit BatchBaselinesMessage(Archive::ReadIterator & source);
+	~BatchBaselinesMessage();
+
+	std::vector<BatchBaselinesMessageData> const & getData() const;
+
+private:
+	Archive::AutoVariable<std::vector<BatchBaselinesMessageData> > m_data;
+	// Archive::AutoArray<BatchBaselinesMessageData> m_data;
+};
+
+// ======================================================================
+
+namespace Archive
+{
+	void put(ByteStream & target, BatchBaselinesMessageData const & source);
+	void get(ReadIterator & source, BatchBaselinesMessageData & target);
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.cpp
new file mode 100644
index 00000000..b9ee8cf6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.cpp
@@ -0,0 +1,65 @@
+// ======================================================================
+//
+// ClientNotificationBoxMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ClientNotificationBoxMessage.h"
+
+const char * const ClientNotificationBoxMessage::MessageType = "ClientNotificationBoxMessage";
+
+ClientNotificationBoxMessage::ClientNotificationBoxMessage(
+	int sequenceId,
+	NetworkId player,
+	Unicode::String const &contents,
+	bool useNotificationIcon,
+	int iconStyle,
+	float timeout,
+	int channel,
+	std::string const & sound) :
+GameNetworkMessage("ClientNotificationBoxMessage"),
+m_sequenceId(sequenceId),
+m_player(player),
+m_contents(contents),
+m_useNotificationIcon(useNotificationIcon),
+m_iconStyle(iconStyle),
+m_timeout(timeout),
+m_channel(channel),
+m_sound(sound)
+{
+	AutoByteStream::addVariable(m_sequenceId);
+	AutoByteStream::addVariable(m_player);
+	AutoByteStream::addVariable(m_contents);
+	AutoByteStream::addVariable(m_useNotificationIcon);
+	AutoByteStream::addVariable(m_iconStyle);
+	AutoByteStream::addVariable(m_timeout);
+	AutoByteStream::addVariable(m_channel);
+	AutoByteStream::addVariable(m_sound);
+}
+
+
+ClientNotificationBoxMessage::ClientNotificationBoxMessage(Archive::ReadIterator &source) :
+GameNetworkMessage("ClientNotificationBoxMessage"),
+m_sequenceId(0),
+m_player(),
+m_contents(),
+m_useNotificationIcon(0),
+m_iconStyle(0),
+m_timeout(0),
+m_channel(0),
+m_sound()
+{
+	AutoByteStream::addVariable(m_sequenceId);
+	AutoByteStream::addVariable(m_player);
+	AutoByteStream::addVariable(m_contents);
+	AutoByteStream::addVariable(m_useNotificationIcon);
+	AutoByteStream::addVariable(m_iconStyle);
+	AutoByteStream::addVariable(m_timeout);
+	AutoByteStream::addVariable(m_channel);
+	AutoByteStream::addVariable(m_sound);
+
+	unpack(source);
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.h
new file mode 100644
index 00000000..c3b550e3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClientNotificationBoxMessage.h
@@ -0,0 +1,99 @@
+// ClientNotificationBoxMessage.h
+// Copyright 2005, Sony Online Entertainment Inc., all rights reserved.
+
+#ifndef	_INCLUDED_ClientNotificationBoxMessage_H
+#define	_INCLUDED_ClientNotificationBoxMessage_H
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "Unicode.h"
+
+class ClientNotificationBoxMessage : public GameNetworkMessage
+{
+
+public:
+
+	static const char * const MessageType;
+
+	enum IconStyle
+	{
+		IS_NONE,
+		IS_QUESTION,
+		IS_EXCLAMATION,
+		IS_MAX
+	};
+
+	enum Channel
+	{
+		NC_HELP,
+		NC_SPECIAL_CANCEL = 0xFF,
+		NC_SPECIAL_CANCEL_ALL = 0xFE,
+		NC_MAX
+	};
+
+
+	ClientNotificationBoxMessage( int sequenceId, NetworkId player, Unicode::String const & contents, bool useNotificationIcon, int iconStyle, float timeout, int channel, std::string const & sound );
+
+	explicit ClientNotificationBoxMessage(Archive::ReadIterator & source);
+
+public:
+	int getSequenceId() const;
+	const NetworkId &getPlayer() const;
+	Unicode::String const &getContents() const;
+	bool getUseNotificationIcon() const;
+	int getIconStyle() const;
+	float getTimeout() const;
+	int getChannel() const;
+	std::string const & getSound() const;
+private:
+	Archive::AutoVariable<int>                       m_sequenceId;
+	Archive::AutoVariable<NetworkId>                 m_player;
+	Archive::AutoVariable<Unicode::String>           m_contents;
+	Archive::AutoVariable<bool>                      m_useNotificationIcon;
+	Archive::AutoVariable<int>                       m_iconStyle;
+	Archive::AutoVariable<float>                     m_timeout;
+	Archive::AutoVariable<int>                       m_channel;
+	Archive::AutoVariable<std::string>               m_sound;
+};
+
+inline int ClientNotificationBoxMessage::getSequenceId() const
+{
+	return m_sequenceId.get();
+}
+
+inline const NetworkId &ClientNotificationBoxMessage::getPlayer() const
+{
+	return m_player.get();
+}
+
+inline Unicode::String const & ClientNotificationBoxMessage::getContents() const
+{
+	return m_contents.get();
+}
+
+inline bool ClientNotificationBoxMessage::getUseNotificationIcon() const
+{
+	return m_useNotificationIcon.get();
+}
+
+inline int ClientNotificationBoxMessage::getIconStyle() const
+{
+	return m_iconStyle.get();
+}
+
+inline float ClientNotificationBoxMessage::getTimeout() const
+{
+	return m_timeout.get();
+}
+
+inline int ClientNotificationBoxMessage::getChannel() const
+{
+	return m_channel.get();
+}
+
+inline std::string const & ClientNotificationBoxMessage::getSound() const
+{
+	return m_sound.get();
+}
+
+#endif // _INCLUDED_MessageQueueCommandTimer_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataGetElementMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataGetElementMessage.cpp
new file mode 100644
index 00000000..b889b0a7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataGetElementMessage.cpp
@@ -0,0 +1,55 @@
+// ======================================================================
+//
+// ClusterWideDataGetElementMessage.cpp
+// Copyright 2004 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ClusterWideDataGetElementMessage.h"
+
+// ======================================================================
+
+std::string const ClusterWideDataGetElementMessage::ms_messageName = "ClusterWideDataGetElementMessage";
+unsigned long ClusterWideDataGetElementMessage::ms_requestIdCounter = 0;
+
+// ======================================================================
+
+ClusterWideDataGetElementMessage::ClusterWideDataGetElementMessage(std::string const & managerName, std::string const & elementNameRegex, bool const lockElements) :
+	GameNetworkMessage(ms_messageName),
+	m_managerName(managerName),
+	m_elementNameRegex(elementNameRegex),
+	m_lockElements(lockElements),
+	m_requestId(static_cast<uint32>(++ms_requestIdCounter))
+{
+	addVariable(m_managerName);
+	addVariable(m_elementNameRegex);
+	addVariable(m_lockElements);
+	addVariable(m_requestId);
+}
+
+// ----------------------------------------------------------------------
+
+ClusterWideDataGetElementMessage::ClusterWideDataGetElementMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage(ms_messageName),
+	m_managerName(),
+	m_elementNameRegex(),
+	m_lockElements(false),
+	m_requestId(0)
+{
+	addVariable(m_managerName);
+	addVariable(m_elementNameRegex);
+	addVariable(m_lockElements);
+	addVariable(m_requestId);
+
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ClusterWideDataGetElementMessage::~ClusterWideDataGetElementMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataGetElementMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataGetElementMessage.h
new file mode 100644
index 00000000..7f0f3503
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataGetElementMessage.h
@@ -0,0 +1,82 @@
+// ======================================================================
+//
+// ClusterWideDataGetElementMessage.h
+// Copyright 2004 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_ClusterWideDataGetElementMessage_H
+#define INCLUDED_ClusterWideDataGetElementMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+// ======================================================================
+
+class ClusterWideDataGetElementMessage : public GameNetworkMessage
+{
+public: //ctor/dtor
+	ClusterWideDataGetElementMessage(std::string const & managerName, std::string const & elementNameRegex, bool lockElements);
+	explicit ClusterWideDataGetElementMessage(Archive::ReadIterator & source);
+	~ClusterWideDataGetElementMessage();
+
+public: // methods
+	std::string const & getManagerName() const;
+	std::string const & getElementNameRegex() const;
+	bool                getLockElements() const;
+	unsigned long       getRequestId() const;
+
+public:
+	// message name
+	static std::string const             ms_messageName;
+
+private: 
+	Archive::AutoVariable<std::string>   m_managerName;
+	Archive::AutoVariable<std::string>   m_elementNameRegex;
+	Archive::AutoVariable<bool>          m_lockElements;
+	Archive::AutoVariable<uint32>        m_requestId;
+
+	// for assigning m_requestId
+	static unsigned long                 ms_requestIdCounter;
+
+	// Disabled.
+	ClusterWideDataGetElementMessage();
+	ClusterWideDataGetElementMessage(ClusterWideDataGetElementMessage const &);
+	ClusterWideDataGetElementMessage &operator =(ClusterWideDataGetElementMessage const &);
+};
+
+//-----------------------------------------------------------------------
+
+inline std::string const & ClusterWideDataGetElementMessage::getManagerName() const
+{
+	return m_managerName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & ClusterWideDataGetElementMessage::getElementNameRegex() const
+{
+	return m_elementNameRegex.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ClusterWideDataGetElementMessage::getLockElements() const
+{
+	return m_lockElements.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned long ClusterWideDataGetElementMessage::getRequestId() const
+{
+	return static_cast<unsigned long>(m_requestId.get());
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataGetElementResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataGetElementResponseMessage.cpp
new file mode 100644
index 00000000..eab57331
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataGetElementResponseMessage.cpp
@@ -0,0 +1,68 @@
+// ======================================================================
+//
+// ClusterWideDataGetElementResponseMessage.cpp
+// Copyright 2004 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ClusterWideDataGetElementResponseMessage.h"
+
+#include "sharedUtility/ValueDictionary.h"
+#include "sharedUtility/ValueDictionaryArchive.h"
+
+// ======================================================================
+
+std::string const ClusterWideDataGetElementResponseMessage::ms_messageName = "ClusterWideDataGetElementResponseMessage";
+
+// ======================================================================
+
+ClusterWideDataGetElementResponseMessage::ClusterWideDataGetElementResponseMessage(std::string const & managerName, std::string const & elementNameRegex, std::vector<std::string> const & elementNameList, std::vector<ValueDictionary> const & elementDictionaryList, unsigned long const requestId, unsigned long const lockKey) :
+	GameNetworkMessage(ms_messageName),
+	m_managerName(managerName),
+	m_elementNameRegex(elementNameRegex),
+	m_requestId(static_cast<uint32>(requestId)),
+	m_lockKey(static_cast<uint32>(lockKey)),
+	m_elementNameList(),
+	m_elementDictionaryList()
+{
+	m_elementNameList.set(elementNameList);
+	m_elementDictionaryList.set(elementDictionaryList);
+
+	addVariable(m_managerName);
+	addVariable(m_elementNameRegex);
+	addVariable(m_requestId);
+	addVariable(m_lockKey);
+	addVariable(m_elementNameList);
+	addVariable(m_elementDictionaryList);
+}
+
+// ----------------------------------------------------------------------
+
+ClusterWideDataGetElementResponseMessage::ClusterWideDataGetElementResponseMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage(ms_messageName),
+	m_managerName(),
+	m_elementNameRegex(),
+	m_requestId(0),
+	m_lockKey(0),
+	m_elementNameList(),
+	m_elementDictionaryList()
+{
+	addVariable(m_managerName);
+	addVariable(m_elementNameRegex);
+	addVariable(m_requestId);
+	addVariable(m_lockKey);
+	addVariable(m_elementNameList);
+	addVariable(m_elementDictionaryList);
+
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ClusterWideDataGetElementResponseMessage::~ClusterWideDataGetElementResponseMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataGetElementResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataGetElementResponseMessage.h
new file mode 100644
index 00000000..81ce5f5c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataGetElementResponseMessage.h
@@ -0,0 +1,101 @@
+// ======================================================================
+//
+// ClusterWideDataGetElementResponseMessage.h
+// Copyright 2004 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_ClusterWideDataGetElementResponseMessage_H
+#define INCLUDED_ClusterWideDataGetElementResponseMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+// ======================================================================
+
+class ValueDictionary;
+
+// ======================================================================
+
+class ClusterWideDataGetElementResponseMessage : public GameNetworkMessage
+{
+public: //ctor/dtor
+	ClusterWideDataGetElementResponseMessage(std::string const & managerName, std::string const & elementNameRegex, std::vector<std::string> const & elementNameList, std::vector<ValueDictionary> const & elementDictionaryList, unsigned long requestId, unsigned long lockKey);
+	explicit ClusterWideDataGetElementResponseMessage(Archive::ReadIterator & source);
+	~ClusterWideDataGetElementResponseMessage();
+
+public: // methods
+	std::string const &                  getManagerName() const;
+	std::string const &                  getElementNameRegex() const;
+	unsigned long                        getRequestId() const;
+	unsigned long                        getLockKey() const;
+	std::vector<std::string> const &     getElementNameList() const;
+	std::vector<ValueDictionary> const & getElementDictionaryList() const;
+
+public:
+	// message name
+	static std::string const                             ms_messageName;
+
+private: 
+	Archive::AutoVariable<std::string>                   m_managerName;
+	Archive::AutoVariable<std::string>                   m_elementNameRegex;
+	Archive::AutoVariable<uint32>                        m_requestId;
+	Archive::AutoVariable<uint32>                        m_lockKey;
+	Archive::AutoArray<std::string>                      m_elementNameList;
+	Archive::AutoArray<ValueDictionary>                  m_elementDictionaryList;
+
+	// Disabled.
+	ClusterWideDataGetElementResponseMessage();
+	ClusterWideDataGetElementResponseMessage(ClusterWideDataGetElementResponseMessage const &);
+	ClusterWideDataGetElementResponseMessage &operator =(ClusterWideDataGetElementResponseMessage const &);
+};
+
+//-----------------------------------------------------------------------
+
+inline std::string const & ClusterWideDataGetElementResponseMessage::getManagerName() const
+{
+	return m_managerName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & ClusterWideDataGetElementResponseMessage::getElementNameRegex() const
+{
+	return m_elementNameRegex.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned long ClusterWideDataGetElementResponseMessage::getRequestId() const
+{
+	return static_cast<unsigned long>(m_requestId.get());
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned long ClusterWideDataGetElementResponseMessage::getLockKey() const
+{
+	return static_cast<unsigned long>(m_lockKey.get());
+}
+
+//-----------------------------------------------------------------------
+
+inline std::vector<std::string> const & ClusterWideDataGetElementResponseMessage::getElementNameList() const
+{
+	return m_elementNameList.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::vector<ValueDictionary> const & ClusterWideDataGetElementResponseMessage::getElementDictionaryList() const
+{
+	return m_elementDictionaryList.get();
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataReleaseLockMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataReleaseLockMessage.cpp
new file mode 100644
index 00000000..14b03564
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataReleaseLockMessage.cpp
@@ -0,0 +1,46 @@
+// ======================================================================
+//
+// ClusterWideDataReleaseLockMessage.cpp
+// Copyright 2004 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ClusterWideDataReleaseLockMessage.h"
+
+// ======================================================================
+
+std::string const ClusterWideDataReleaseLockMessage::ms_messageName = "ClusterWideDataReleaseLockMessage";
+
+// ======================================================================
+
+ClusterWideDataReleaseLockMessage::ClusterWideDataReleaseLockMessage(std::string const & managerName, unsigned long const lockKey) :
+	GameNetworkMessage(ms_messageName),
+	m_managerName(managerName),
+	m_lockKey(static_cast<uint32>(lockKey))
+{
+	addVariable(m_managerName);
+	addVariable(m_lockKey);
+}
+
+// ----------------------------------------------------------------------
+
+ClusterWideDataReleaseLockMessage::ClusterWideDataReleaseLockMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage(ms_messageName),
+	m_managerName(),
+	m_lockKey(0)
+{
+	addVariable(m_managerName);
+	addVariable(m_lockKey);
+
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ClusterWideDataReleaseLockMessage::~ClusterWideDataReleaseLockMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataReleaseLockMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataReleaseLockMessage.h
new file mode 100644
index 00000000..8e840d42
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataReleaseLockMessage.h
@@ -0,0 +1,61 @@
+// ======================================================================
+//
+// ClusterWideDataReleaseLockMessage.h
+// Copyright 2004 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_ClusterWideDataReleaseLockMessage_H
+#define INCLUDED_ClusterWideDataReleaseLockMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+// ======================================================================
+
+class ClusterWideDataReleaseLockMessage : public GameNetworkMessage
+{
+public: //ctor/dtor
+	ClusterWideDataReleaseLockMessage(std::string const & managerName, unsigned long lockKey);
+	explicit ClusterWideDataReleaseLockMessage(Archive::ReadIterator & source);
+	~ClusterWideDataReleaseLockMessage();
+
+public: // methods
+	std::string const &                  getManagerName() const;
+	unsigned long                        getLockKey() const;
+
+public:
+	// message name
+	static std::string const                             ms_messageName;
+
+private: 
+	Archive::AutoVariable<std::string>                   m_managerName;
+	Archive::AutoVariable<uint32>                        m_lockKey;
+
+	// Disabled.
+	ClusterWideDataReleaseLockMessage();
+	ClusterWideDataReleaseLockMessage(ClusterWideDataReleaseLockMessage const &);
+	ClusterWideDataReleaseLockMessage &operator =(ClusterWideDataReleaseLockMessage const &);
+};
+
+//-----------------------------------------------------------------------
+
+inline std::string const & ClusterWideDataReleaseLockMessage::getManagerName() const
+{
+	return m_managerName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned long ClusterWideDataReleaseLockMessage::getLockKey() const
+{
+	return static_cast<unsigned long>(m_lockKey.get());
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataRemoveElementMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataRemoveElementMessage.cpp
new file mode 100644
index 00000000..0b134b57
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataRemoveElementMessage.cpp
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// ClusterWideDataRemoveElementMessage.cpp
+// Copyright 2004 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ClusterWideDataRemoveElementMessage.h"
+
+// ======================================================================
+
+std::string const ClusterWideDataRemoveElementMessage::ms_messageName = "ClusterWideDataRemoveElementMessage";
+
+// ======================================================================
+
+ClusterWideDataRemoveElementMessage::ClusterWideDataRemoveElementMessage(std::string const & managerName, std::string const & elementNameRegex, unsigned long const lockKey) :
+	GameNetworkMessage(ms_messageName),
+	m_managerName(managerName),
+	m_elementNameRegex(elementNameRegex),
+	m_lockKey(static_cast<uint32>(lockKey))
+{
+	addVariable(m_managerName);
+	addVariable(m_elementNameRegex);
+	addVariable(m_lockKey);
+}
+
+// ----------------------------------------------------------------------
+
+ClusterWideDataRemoveElementMessage::ClusterWideDataRemoveElementMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage(ms_messageName),
+	m_managerName(),
+	m_elementNameRegex(),
+	m_lockKey(0)
+{
+	addVariable(m_managerName);
+	addVariable(m_elementNameRegex);
+	addVariable(m_lockKey);
+
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ClusterWideDataRemoveElementMessage::~ClusterWideDataRemoveElementMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataRemoveElementMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataRemoveElementMessage.h
new file mode 100644
index 00000000..49f0ffe3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataRemoveElementMessage.h
@@ -0,0 +1,70 @@
+// ======================================================================
+//
+// ClusterWideDataRemoveElementMessage.h
+// Copyright 2004 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_ClusterWideDataRemoveElementMessage_H
+#define INCLUDED_ClusterWideDataRemoveElementMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+// ======================================================================
+
+class ClusterWideDataRemoveElementMessage : public GameNetworkMessage
+{
+public: //ctor/dtor
+	ClusterWideDataRemoveElementMessage(std::string const & managerName, std::string const & elementNameRegex, unsigned long lockKey);
+	explicit ClusterWideDataRemoveElementMessage(Archive::ReadIterator & source);
+	~ClusterWideDataRemoveElementMessage();
+
+public: // methods
+	std::string const &                  getManagerName() const;
+	std::string const &                  getElementNameRegex() const;
+	unsigned long                        getLockKey() const;
+
+public:
+	// message name
+	static std::string const                             ms_messageName;
+
+private: 
+	Archive::AutoVariable<std::string>                   m_managerName;
+	Archive::AutoVariable<std::string>                   m_elementNameRegex;
+	Archive::AutoVariable<uint32>                        m_lockKey;
+
+	// Disabled.
+	ClusterWideDataRemoveElementMessage();
+	ClusterWideDataRemoveElementMessage(ClusterWideDataRemoveElementMessage const &);
+	ClusterWideDataRemoveElementMessage &operator =(ClusterWideDataRemoveElementMessage const &);
+};
+
+//-----------------------------------------------------------------------
+
+inline std::string const & ClusterWideDataRemoveElementMessage::getManagerName() const
+{
+	return m_managerName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & ClusterWideDataRemoveElementMessage::getElementNameRegex() const
+{
+	return m_elementNameRegex.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned long ClusterWideDataRemoveElementMessage::getLockKey() const
+{
+	return static_cast<unsigned long>(m_lockKey.get());
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataUpdateDictionaryMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataUpdateDictionaryMessage.cpp
new file mode 100644
index 00000000..3310c93f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataUpdateDictionaryMessage.cpp
@@ -0,0 +1,64 @@
+// ======================================================================
+//
+// ClusterWideDataUpdateDictionaryMessage.cpp
+// Copyright 2004 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ClusterWideDataUpdateDictionaryMessage.h"
+
+#include "sharedUtility/ValueDictionaryArchive.h"
+
+// ======================================================================
+
+std::string const ClusterWideDataUpdateDictionaryMessage::ms_messageName = "ClusterWideDataUpdateDictionaryMessage";
+
+// ======================================================================
+
+ClusterWideDataUpdateDictionaryMessage::ClusterWideDataUpdateDictionaryMessage(std::string const & managerName, std::string const & elementNameRegex, ValueDictionary const & dictionary, bool const replaceDictionary, bool const autoRemove, unsigned long const lockKey) :
+	GameNetworkMessage(ms_messageName),
+	m_managerName(managerName),
+	m_elementNameRegex(elementNameRegex),
+	m_dictionary(dictionary),
+	m_replaceDictionary(replaceDictionary),
+	m_autoRemove(autoRemove),
+	m_lockKey(static_cast<uint32>(lockKey))
+{
+	addVariable(m_managerName);
+	addVariable(m_elementNameRegex);
+	addVariable(m_dictionary);
+	addVariable(m_replaceDictionary);
+	addVariable(m_autoRemove);
+	addVariable(m_lockKey);
+}
+
+// ----------------------------------------------------------------------
+
+ClusterWideDataUpdateDictionaryMessage::ClusterWideDataUpdateDictionaryMessage(Archive::ReadIterator & source) :
+	GameNetworkMessage(ms_messageName),
+	m_managerName(),
+	m_elementNameRegex(),
+	m_dictionary(),
+	m_replaceDictionary(false),
+	m_autoRemove(false),
+	m_lockKey(0)
+{
+	addVariable(m_managerName);
+	addVariable(m_elementNameRegex);
+	addVariable(m_dictionary);
+	addVariable(m_replaceDictionary);
+	addVariable(m_autoRemove);
+	addVariable(m_lockKey);
+
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+ClusterWideDataUpdateDictionaryMessage::~ClusterWideDataUpdateDictionaryMessage()
+{
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataUpdateDictionaryMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataUpdateDictionaryMessage.h
new file mode 100644
index 00000000..6166eefd
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ClusterWideDataUpdateDictionaryMessage.h
@@ -0,0 +1,99 @@
+// ======================================================================
+//
+// ClusterWideDataUpdateDictionaryMessage.h
+// Copyright 2004 Sony Online Entertainment, Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_ClusterWideDataUpdateDictionaryMessage_H
+#define INCLUDED_ClusterWideDataUpdateDictionaryMessage_H
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include "sharedUtility/ValueDictionary.h"
+
+#include <string>
+
+// ======================================================================
+
+class ClusterWideDataUpdateDictionaryMessage : public GameNetworkMessage
+{
+public: //ctor/dtor
+	ClusterWideDataUpdateDictionaryMessage(std::string const & managerName, std::string const & elementNameRegex, ValueDictionary const & dictionary, bool replaceDictionary, bool autoRemove, unsigned long lockKey);
+	explicit ClusterWideDataUpdateDictionaryMessage(Archive::ReadIterator & source);
+	~ClusterWideDataUpdateDictionaryMessage();
+
+public: // methods
+	std::string const &                  getManagerName() const;
+	std::string const &                  getElementNameRegex() const;
+	ValueDictionary const &              getDictionary() const;
+	bool                                 getReplaceDictionary() const;
+	bool                                 getAutoRemove() const;
+	unsigned long                        getLockKey() const;
+
+public:
+	// message name
+	static std::string const                             ms_messageName;
+
+private: 
+	Archive::AutoVariable<std::string>                   m_managerName;
+	Archive::AutoVariable<std::string>                   m_elementNameRegex;
+	Archive::AutoVariable<ValueDictionary>               m_dictionary;
+	Archive::AutoVariable<bool>                          m_replaceDictionary;
+	Archive::AutoVariable<bool>                          m_autoRemove;
+	Archive::AutoVariable<uint32>                        m_lockKey;
+
+	// Disabled.
+	ClusterWideDataUpdateDictionaryMessage();
+	ClusterWideDataUpdateDictionaryMessage(ClusterWideDataUpdateDictionaryMessage const &);
+	ClusterWideDataUpdateDictionaryMessage &operator =(ClusterWideDataUpdateDictionaryMessage const &);
+};
+
+//-----------------------------------------------------------------------
+
+inline std::string const & ClusterWideDataUpdateDictionaryMessage::getManagerName() const
+{
+	return m_managerName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & ClusterWideDataUpdateDictionaryMessage::getElementNameRegex() const
+{
+	return m_elementNameRegex.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline ValueDictionary const & ClusterWideDataUpdateDictionaryMessage::getDictionary() const
+{
+	return m_dictionary.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ClusterWideDataUpdateDictionaryMessage::getReplaceDictionary() const
+{
+	return m_replaceDictionary.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool ClusterWideDataUpdateDictionaryMessage::getAutoRemove() const
+{
+	return m_autoRemove.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline unsigned long ClusterWideDataUpdateDictionaryMessage::getLockKey() const
+{
+	return static_cast<unsigned long>(m_lockKey.get());
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/DeltasMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/DeltasMessage.cpp
new file mode 100644
index 00000000..67781f1f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/DeltasMessage.cpp
@@ -0,0 +1,65 @@
+// 
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/DeltasMessage.h"
+
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+
+//===================================================================
+
+MEMORY_BLOCK_MANAGER_IMPLEMENTATION_WITH_INSTALL(DeltasMessage, true, 0, 0, 0);
+
+//===================================================================
+
+DeltasMessage::DeltasMessage(const NetworkId & sourceObject, const Tag& tag, const Archive::AutoDeltaByteStream & sourcePackage, const unsigned char newPackageId) :
+GameNetworkMessage("DeltasMessage"),
+target(sourceObject),
+typeId(tag),
+packageId(newPackageId),
+package()
+{
+	static Archive::ByteStream bs;
+	AutoByteStream::addVariable(target);
+	AutoByteStream::addVariable(typeId);
+	AutoByteStream::addVariable(packageId);
+	AutoByteStream::addVariable(package);
+	bs.clear();
+	sourcePackage.packDeltas(bs);
+	package.set(bs);
+}
+
+//-----------------------------------------------------------------------
+
+DeltasMessage::DeltasMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("DeltasMessage"),
+target(NetworkId::cms_invalid),
+typeId(0),
+packageId(0),
+package()
+{
+	AutoByteStream::addVariable(target);
+	AutoByteStream::addVariable(typeId);
+	AutoByteStream::addVariable(packageId);
+	AutoByteStream::addVariable(package);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+DeltasMessage::~DeltasMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void DeltasMessage::pack(Archive::ByteStream & target) const
+{
+	AutoByteStream::pack(target);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/DeltasMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/DeltasMessage.h
new file mode 100644
index 00000000..d6fe2500
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/DeltasMessage.h
@@ -0,0 +1,90 @@
+// DeltasMessage.h
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+#ifndef	_DeltasMessage_H
+#define	_DeltasMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/Tag.h"
+#include "sharedFoundation/MemoryBlockManagerMacros.h"
+
+class MemoryBlockManager;
+
+//-----------------------------------------------------------------------
+
+class DeltasMessage : public GameNetworkMessage
+{
+	MEMORY_BLOCK_MANAGER_INTERFACE_WITH_INSTALL;
+
+public:
+	DeltasMessage(const NetworkId & sourceObject, const Tag& tag, const Archive::AutoDeltaByteStream & sourcePackage, const unsigned char packageId);
+	DeltasMessage(Archive::ReadIterator & source);
+	~DeltasMessage();
+
+
+	const unsigned char          getPackageId  () const;
+	const Archive::ByteStream &  getPackage    () const;
+	const NetworkId              getTarget     () const;
+	const Tag                    getTypeId     () const;
+
+	void                         pack          (Archive::ByteStream & target) const;
+
+	enum
+	{
+		DELTAS_CLIENT_ONLY,
+		DELTAS_CLIENT_SERVER,
+		DELTAS_SERVER,
+		DELTAS_SHARED,
+		DELTAS_CLIENT_SERVER_NP,
+		DELTAS_SERVER_NP,
+		DELTAS_SHARED_NP,
+		DELTAS_UI,
+		DELTAS_FIRST_PARENT_CLIENT_SERVER,
+		DELTAS_FIRST_PARENT_CLIENT_SERVER_NP
+	};
+
+private:
+	Archive::AutoVariable<NetworkId>            target;
+	Archive::AutoVariable<Tag>                  typeId;
+	Archive::AutoVariable<unsigned char>        packageId;
+	Archive::AutoVariable<Archive::ByteStream>  package;
+
+	static MemoryBlockManager* memoryBlockManager;
+
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId DeltasMessage::getTarget() const
+{
+	return target.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const unsigned char DeltasMessage::getPackageId() const
+{
+	return packageId.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Archive::ByteStream & DeltasMessage::getPackage() const
+{
+	return package.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const Tag DeltasMessage::getTypeId() const
+{
+	return typeId.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif // _DeltasMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ErrorMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/ErrorMessage.cpp
new file mode 100644
index 00000000..335cf96a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ErrorMessage.cpp
@@ -0,0 +1,38 @@
+//-----------------------------------------------------------------------
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ErrorMessage.h"
+
+//-----------------------------------------------------------------------
+
+ErrorMessage::ErrorMessage(const std::string & newErrorName, const std::string & newDescription, const bool f) :
+GameNetworkMessage("ErrorMessage"),
+errorName(newErrorName),
+description(newDescription),
+fatal(f)
+{
+	AutoByteStream::addVariable(errorName);
+	AutoByteStream::addVariable(description);
+	AutoByteStream::addVariable(fatal);
+}
+
+//-----------------------------------------------------------------------
+
+ErrorMessage::ErrorMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("ErrorMessage"),
+errorName(),
+description(),
+fatal()
+{
+	AutoByteStream::addVariable(errorName);
+	AutoByteStream::addVariable(description);
+	AutoByteStream::addVariable(fatal);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+ErrorMessage::~ErrorMessage()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/ErrorMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/ErrorMessage.h
new file mode 100644
index 00000000..3ef622d9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/ErrorMessage.h
@@ -0,0 +1,53 @@
+// ErrorMessage.h
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+
+#ifndef _ErrorMessage_H
+#define _ErrorMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ErrorMessage : public GameNetworkMessage
+{
+public:
+	ErrorMessage(const std::string & errorName, const std::string & description, const bool fatal=false);
+	ErrorMessage(Archive::ReadIterator & source);
+	virtual ~ErrorMessage();
+
+	const std::string & getErrorName() const;
+	const bool          getFatal() const;
+	const std::string & getDescription() const;
+private:
+	Archive::AutoVariable<std::string> errorName;
+	Archive::AutoVariable<std::string> description;
+	Archive::AutoVariable<bool>        fatal;
+};
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ErrorMessage::getErrorName() const
+{
+	return errorName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const bool ErrorMessage::getFatal() const
+{
+	return fatal.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & ErrorMessage::getDescription() const
+{
+	return description.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif // _ErrorMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/FrameEndMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/FrameEndMessage.cpp
new file mode 100644
index 00000000..e1741366
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/FrameEndMessage.cpp
@@ -0,0 +1,47 @@
+// ======================================================================
+//
+// FrameEndMessage.cpp
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/FrameEndMessage.h"
+
+// ======================================================================
+
+FrameEndMessage::FrameEndMessage(unsigned int pid, unsigned long frameTime, char const *profilerData) :
+	GameNetworkMessage("FrameEndMessage"),
+	m_processId(pid),
+	m_frameTime(frameTime),
+	m_profilerData(profilerData)
+{
+	addVariable(m_processId);
+	addVariable(m_frameTime);
+	addVariable(m_profilerData);
+}
+
+// ----------------------------------------------------------------------
+
+FrameEndMessage::FrameEndMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("FrameEndMessage"),
+	m_processId(),
+	m_frameTime(),
+	m_profilerData()
+{
+	addVariable(m_processId);
+	addVariable(m_frameTime);
+	addVariable(m_profilerData);
+	
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+FrameEndMessage::~FrameEndMessage()
+{
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/FrameEndMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/FrameEndMessage.h
new file mode 100644
index 00000000..d65192e6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/FrameEndMessage.h
@@ -0,0 +1,63 @@
+// ======================================================================
+//
+// FrameEndMessage.h
+//
+// Copyright 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef _FrameEndMessage_H_
+#define _FrameEndMessage_H_
+
+// ======================================================================
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class FrameEndMessage: public GameNetworkMessage
+{
+public:
+	FrameEndMessage(unsigned int processId, unsigned long frameTime, char const *profilerData);
+	FrameEndMessage(Archive::ReadIterator &source);
+	~FrameEndMessage();
+
+	unsigned int getProcessId() const;
+	unsigned long getFrameTime() const;
+	std::string const &getProfilerData() const;
+
+private:
+	Archive::AutoVariable<unsigned int> m_processId;
+	Archive::AutoVariable<unsigned long> m_frameTime;
+	Archive::AutoVariable<std::string> m_profilerData;
+
+	FrameEndMessage();
+	FrameEndMessage(FrameEndMessage const &);
+	FrameEndMessage &operator=(FrameEndMessage const &);
+};
+
+// ----------------------------------------------------------------------
+
+inline unsigned int FrameEndMessage::getProcessId() const
+{
+	return m_processId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned long FrameEndMessage::getFrameTime() const
+{
+	return m_frameTime.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline std::string const &FrameEndMessage::getProfilerData() const
+{
+	return m_profilerData.get();
+}
+
+// ======================================================================
+
+#endif // _FrameEndMessage_H_
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.cpp
new file mode 100644
index 00000000..3fbdeb5c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.cpp
@@ -0,0 +1,139 @@
+// ======================================================================
+//
+// GameNetworkMessage.cpp
+//
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include "sharedFoundation/CrcString.h"
+#include "sharedNetworkMessages/NetworkMessageFactory.h"
+#include <algorithm>
+#include <hash_map>
+
+// ======================================================================
+
+// id = date-time
+std::string const GameNetworkMessage::NetworkVersionId = "20100225-17:43";
+
+namespace GameNetworkMessageNamespace
+{
+	std::hash_map<unsigned long, int>  gs_messageCount;
+
+	// ----------------------------------------------------------------------
+
+	struct SortPair
+	{
+		bool operator()(const std::pair<std::string, int> & x, const std::pair<std::string, int> & y) const
+		{
+			return (x.second < y.second);
+		}
+	};
+
+	std::hash_map<unsigned long, std::string> s_messageTypes;
+}
+
+using namespace GameNetworkMessageNamespace;
+
+// ======================================================================
+
+GameNetworkMessage::GameNetworkMessage(std::string const &newCmd) :
+	MessageDispatch::Message<Archive::ByteStream>(newCmd.c_str()),
+	cmd()
+{
+	unsigned long const cmdCrc = getType();
+	cmd.set(cmdCrc);
+	addVariable(cmd);
+	++(gs_messageCount[cmdCrc]);
+	s_messageTypes[cmdCrc] = newCmd;
+}
+
+// ----------------------------------------------------------------------
+
+GameNetworkMessage::GameNetworkMessage(CrcString const &newCmd) :
+	MessageDispatch::Message<Archive::ByteStream>(newCmd.getCrc()),
+	cmd(newCmd.getCrc())
+{
+	unsigned long const cmdCrc = getType();
+	addVariable(cmd);
+	++(gs_messageCount[cmdCrc]);
+	s_messageTypes[cmdCrc] = newCmd.getString();
+}
+
+// ----------------------------------------------------------------------
+
+GameNetworkMessage::GameNetworkMessage(Archive::ReadIterator & source) :
+	AutoByteStream(),
+	cmd()
+{
+	setValue(source);
+	addVariable(cmd);
+	Archive::ReadIterator ri = getValue().begin();
+	AutoByteStream::unpack(ri);
+	unsigned long const cmdCrc = cmd.get();
+	setType(cmdCrc);
+}
+
+// ----------------------------------------------------------------------
+
+GameNetworkMessage::GameNetworkMessage(const GameNetworkMessage & source) :
+	MessageDispatch::Message<Archive::ByteStream>(source),
+	cmd(source.cmd)
+{
+}
+
+// ----------------------------------------------------------------------
+
+GameNetworkMessage::~GameNetworkMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+const Archive::ByteStream & GameNetworkMessage::getByteStream() const
+{
+	return getValue();
+}
+
+// ----------------------------------------------------------------------
+
+std::vector<std::pair<std::string, int> > const GameNetworkMessage::getMessageCount() // static
+{
+	std::vector<std::pair<std::string, int> > result;
+
+	for (std::hash_map<unsigned long, int>::const_iterator i = gs_messageCount.begin(); i != gs_messageCount.end(); ++i)
+		result.push_back(std::make_pair(s_messageTypes[(*i).first], (*i).second));
+
+	std::sort(result.begin(), result.end(), SortPair());
+
+	return result;
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &GameNetworkMessage::getCmdName() const
+{
+	return getCmdName(getType());
+}
+
+// ----------------------------------------------------------------------
+
+std::string const &GameNetworkMessage::getCmdName(unsigned long cmdCrc) // static
+{
+	std::string &val = s_messageTypes[cmdCrc];
+	if (val.empty())
+	{
+		char buf[32];
+		snprintf(buf, sizeof(buf)-1, "unknown(%08lx)", cmdCrc);
+		buf[sizeof(buf)-1] = '\0';
+		val = buf;
+	}
+	return val;
+}
+
+// ======================================================================
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.h
new file mode 100644
index 00000000..3e8f93b4
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.h
@@ -0,0 +1,52 @@
+// ======================================================================
+//
+// GameNetworkMessage.h
+//
+// copyright 2001 Verant Interactive
+// Author: Justin Randall
+//
+// ======================================================================
+
+#ifndef	_INCLUDED_GameNetworkMessage_H
+#define	_INCLUDED_GameNetworkMessage_H
+
+// ======================================================================
+
+#include "Archive/AutoByteStream.h"
+#include "sharedMessageDispatch/Message.h"
+
+// ======================================================================
+
+class CrcString;
+
+// ======================================================================
+
+class GameNetworkMessage: public Archive::AutoByteStream, public MessageDispatch::Message<Archive::ByteStream>
+{
+public:
+
+	static std::string const NetworkVersionId;
+
+	explicit GameNetworkMessage(std::string const &newCommand);
+	explicit GameNetworkMessage(CrcString const &newCommand);
+	explicit GameNetworkMessage(Archive::ReadIterator &source);
+	explicit GameNetworkMessage(GameNetworkMessage const &source);
+	virtual ~GameNetworkMessage();
+
+	GameNetworkMessage & operator=(GameNetworkMessage const &rhs);
+
+	Archive::ByteStream const &getByteStream() const;
+	std::string const &getCmdName() const;
+	
+	static std::vector<std::pair<std::string, int> > const getMessageCount();
+	static std::string const &getCmdName(unsigned long cmdCrc);
+
+private:
+	GameNetworkMessage();
+	Archive::AutoVariable<unsigned long> cmd;
+};
+
+// ======================================================================
+
+#endif	// _INCLUDED_GameNetworkMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/GenericValueTypeMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/GenericValueTypeMessage.h
new file mode 100644
index 00000000..6265d001
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/GenericValueTypeMessage.h
@@ -0,0 +1,83 @@
+// GenericValueTypeMessage.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_GenericValueTypeMessage_H
+#define	_INCLUDED_GenericValueTypeMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class CrcString;
+
+//-----------------------------------------------------------------------
+
+template<typename ValueType>
+class GenericValueTypeMessage : public GameNetworkMessage
+{
+public:
+	GenericValueTypeMessage(const std::string & messageName, const ValueType & value);
+	GenericValueTypeMessage(CrcString const &messageName, const ValueType & value);
+	explicit  GenericValueTypeMessage  (Archive::ReadIterator & source);
+	~GenericValueTypeMessage();
+
+	const ValueType &  getValue  ()  const;
+
+private:
+	GenericValueTypeMessage & operator = (const GenericValueTypeMessage & rhs);
+	GenericValueTypeMessage(const GenericValueTypeMessage & source);
+
+	Archive::AutoVariable<ValueType>  value;
+};
+
+//-----------------------------------------------------------------------
+
+template<typename ValueType>
+GenericValueTypeMessage<ValueType>::GenericValueTypeMessage(const std::string & n, const ValueType & v) :
+GameNetworkMessage(n),
+value(v)
+{
+	addVariable(value);
+}
+
+//-----------------------------------------------------------------------
+
+template<typename ValueType>
+GenericValueTypeMessage<ValueType>::GenericValueTypeMessage(CrcString const &n, const ValueType & v) :
+GameNetworkMessage(n),
+value(v)
+{
+	addVariable(value);
+}
+
+//-----------------------------------------------------------------------
+
+template<typename ValueType>
+GenericValueTypeMessage<ValueType>::GenericValueTypeMessage(Archive::ReadIterator & source) :
+GameNetworkMessage(""),
+value()
+{
+	addVariable(value);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+template<typename ValueType>
+GenericValueTypeMessage<ValueType>::~GenericValueTypeMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+template<typename ValueType>
+inline const ValueType & GenericValueTypeMessage<ValueType>::getValue() const
+{
+	return value.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_GenericValueTypeMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueCommandTimer.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueCommandTimer.h
new file mode 100644
index 00000000..741c5143
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueCommandTimer.h
@@ -0,0 +1,271 @@
+// MessageQueueCommandTimer.h
+// Copyright 2005, Sony Online Entertainment Inc., all rights reserved.
+
+#ifndef	_INCLUDED_MessageQueueCommandTimer_H
+#define	_INCLUDED_MessageQueueCommandTimer_H
+
+#include "sharedFoundation/MessageQueue.h"
+
+class MessageQueueCommandTimer : public MessageQueue::Data
+{
+public:
+	enum Flags
+	{
+		F_warmup,
+		F_execute,
+		F_cooldown,
+		F_failed,
+		F_failedRetry,
+		F_cooldown2,
+		F_MAX
+	};
+
+	MessageQueueCommandTimer( uint32 sequenceId, int cooldownGroup, int cooldownGroup2, uint32 commandNameCrc );
+
+	/**
+	 * @brief sets the current time for the given state
+	 */
+	void              setCurrentTime( Flags flag, float time );
+
+	/**
+	 * @brief gets the current time for the requested state
+	 */
+	float             getCurrentTime( Flags flag ) const;
+
+	/**
+	 * @brief gets the maximum time for the given state
+	 */
+	void              setMaxTime( Flags flag, float time );
+
+	/**
+	 * @brief sets the maximum time for the given state
+	 */
+	float             getMaxTime( Flags flag ) const;
+
+	/**
+	 * @brief sets the cooldown group for this command
+	 */
+	void              setCooldownGroup( int group );
+
+	/**
+	 * @brief gets the cooldown group for this command, if it has one.
+	 * this method returns -1 if this command is not part of a cooldown group.
+	 * NOTE: the -1 value is reserved for future use; all commands are part of a cooldown group.
+	 */
+	int               getCooldownGroup() const;
+
+	/**
+	 * @brief returns true if this command is part of a cooldown group.  as per
+	 * the current design, this method should always return true.
+	 */
+	bool              hasCooldownGroup() const;
+
+	/**
+	 * @brief sets the cooldown group for this command
+	 */
+	void              setCooldownGroup2( int group );
+
+	/**
+	 * @brief gets the cooldown group 2 for this command, if it has one.
+	 * this method returns -1 if this command is not part of a cooldown group 2.
+	 * NOTE: unlike cooldown group 1, this value can certainly be -1.
+	 */
+	int               getCooldownGroup2() const;
+
+	/**
+	 * @brief returns true if this command is part of a cooldown group.
+	 */
+	bool              hasCooldownGroup2() const;
+
+	/**
+	 * @brief indicates that this message means the corresponding command failed
+	 */
+	void              setFailed();
+
+	/**
+	 * @brief indicates that this message means the corresponding command failed
+	 */
+	bool              getFailed() const;
+
+	/**
+	 * @brief indicates that this message means the corresponding command failed
+	 */
+	void              setFailedRetry();
+
+	/**
+	 * @brief indicates that this message means the corresponding command failed
+	 */
+	bool              getFailedRetry() const;
+
+	/**
+	 * @brief returns the flag bit field
+	 */
+	uint32            getFlags() const;
+
+	/**
+	 * @brief returns true if this packet contains time information
+	 * for the requested state.
+	 */
+	bool              hasTime( Flags flag ) const;
+
+	/**
+	 * @brief sets the sequence id for this command
+	 */
+	void              setSequenceId( uint32 id );
+
+	/**
+	 * @brief gets the sequence id for this command
+	 */
+	uint32            getSequenceId() const;
+
+	/**
+	 * @brief sets the command name crc for this command
+	 */
+	void              setCommandNameCrc( uint32 commandNameCrc );
+
+	/**
+	 * @brief gets the command name crc for this command
+	 */
+	uint32            getCommandNameCrc() const;
+
+	/**
+	 * @brief returns the given flag as a bit value
+	 */
+	static uint32     toBitValue( Flags flag );
+
+private:
+	uint32                    m_commandNameCrc;
+	uint32                    m_flags;
+	uint32                    m_sequenceId;
+	int                       m_cooldownGroup;
+	int                       m_cooldownGroup2;
+	std::pair< float, float > m_time[ F_MAX ];
+};
+
+#define NULL_COOLDOWN_GROUP -1
+
+inline MessageQueueCommandTimer::MessageQueueCommandTimer( uint32 sequenceId, int cooldownGroup, int cooldownGroup2, uint32 commandNameCrc ) :
+m_commandNameCrc( commandNameCrc ),
+m_flags( 0 ),
+m_sequenceId( sequenceId ),
+m_cooldownGroup( cooldownGroup ),
+m_cooldownGroup2( cooldownGroup2 )
+{
+	for ( int i = 0 ; i < F_MAX; ++i )
+	{
+		m_time[ i ] = std::pair<float,float>( 0.f, 0.f );
+	}
+}
+
+inline bool MessageQueueCommandTimer::hasTime( Flags flag ) const
+{
+	return ( m_flags & toBitValue( flag ) ) != 0;
+}
+
+inline void MessageQueueCommandTimer::setCurrentTime( Flags flag, float time )
+{
+	FATAL( flag >= F_MAX, ( "invalid command timer id\n" ) );
+	m_time[ (int)flag ].first = time;
+	m_flags |= toBitValue( flag );
+}
+
+inline float MessageQueueCommandTimer::getCurrentTime( Flags flag ) const
+{
+	FATAL( flag >= F_MAX, ( "invalid command timer id\n" ) );
+	return m_time[ (int)flag ].first;
+}
+
+inline void MessageQueueCommandTimer::setMaxTime( Flags flag, float time )
+{
+	FATAL( flag >= F_MAX, ( "invalid command timer id\n" ) );
+	m_time[ (int)flag ].second = time;
+	m_flags |= toBitValue( flag );
+}
+
+inline float MessageQueueCommandTimer::getMaxTime( Flags flag ) const
+{
+	FATAL( flag >= F_MAX, ( "invalid command timer id\n" ) );
+	return m_time[ (int)flag ].second;
+}
+
+inline void MessageQueueCommandTimer::setCooldownGroup( int group )
+{
+	m_cooldownGroup = group;
+}
+
+inline bool MessageQueueCommandTimer::hasCooldownGroup() const
+{
+	return m_cooldownGroup != NULL_COOLDOWN_GROUP;
+}
+
+inline int MessageQueueCommandTimer::getCooldownGroup() const
+{
+	return m_cooldownGroup;
+}
+
+inline void MessageQueueCommandTimer::setCooldownGroup2( int group  )
+{
+	m_cooldownGroup2 = group;
+}
+
+inline int MessageQueueCommandTimer::getCooldownGroup2() const
+{
+	return m_cooldownGroup2;
+}
+
+inline bool MessageQueueCommandTimer::hasCooldownGroup2() const
+{
+	return m_cooldownGroup2 != NULL_COOLDOWN_GROUP;
+}
+
+inline uint32 MessageQueueCommandTimer::getFlags() const
+{
+	return m_flags;
+}
+
+inline void MessageQueueCommandTimer::setSequenceId( uint32 sequenceId )
+{
+	m_sequenceId = sequenceId;
+}
+
+inline uint32 MessageQueueCommandTimer::getSequenceId() const
+{
+	return m_sequenceId;
+}
+
+inline void MessageQueueCommandTimer::setCommandNameCrc( uint32 commandNameCrc )
+{
+	m_commandNameCrc = commandNameCrc;
+}
+
+inline uint32 MessageQueueCommandTimer::getCommandNameCrc() const
+{
+	return m_commandNameCrc;
+}
+
+inline uint32 MessageQueueCommandTimer::toBitValue( Flags flag )
+{
+	return 1 << (int)flag;
+}
+
+inline void MessageQueueCommandTimer::setFailed()
+{
+	m_flags |= toBitValue( F_failed );
+}
+
+inline bool MessageQueueCommandTimer::getFailed() const
+{
+	return ( m_flags & toBitValue( F_failed ) ) != 0;
+}
+
+inline void MessageQueueCommandTimer::setFailedRetry()
+{
+	m_flags |= toBitValue( F_failedRetry );
+}
+
+inline bool MessageQueueCommandTimer::getFailedRetry() const
+{
+	return ( m_flags & toBitValue( F_failedRetry ) ) != 0;
+}
+
+#endif // _INCLUDED_MessageQueueCommandTimer_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueGenericValueType.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueGenericValueType.h
new file mode 100644
index 00000000..14bf8212
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueGenericValueType.h
@@ -0,0 +1,56 @@
+// MessageQueueGenericValueType.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_MessageQueueGenericValueType_H
+#define	_INCLUDED_MessageQueueGenericValueType_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+
+//-----------------------------------------------------------------------
+
+template<typename ValueType>
+class MessageQueueGenericValueType : public MessageQueue::Data
+{
+public:
+	MessageQueueGenericValueType(const ValueType & value);
+	~MessageQueueGenericValueType();
+
+	const ValueType &  getValue  () const;
+
+private:
+	MessageQueueGenericValueType & operator = (const MessageQueueGenericValueType & rhs);
+	MessageQueueGenericValueType(const MessageQueueGenericValueType & source);
+
+	ValueType  m_value;
+};
+
+//-----------------------------------------------------------------------
+
+template<typename ValueType>
+inline MessageQueueGenericValueType<ValueType>::MessageQueueGenericValueType(const ValueType & v) :
+MessageQueue::Data(),
+m_value(v)
+{
+}
+
+//-----------------------------------------------------------------------
+
+template<typename ValueType>
+inline MessageQueueGenericValueType<ValueType>::~MessageQueueGenericValueType()
+{
+}
+
+//-----------------------------------------------------------------------
+
+template<typename ValueType>
+inline const ValueType & MessageQueueGenericValueType<ValueType>::getValue() const
+{
+	return m_value;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MessageQueueGenericValueType_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueNetworkIdAndTransform.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueNetworkIdAndTransform.cpp
new file mode 100644
index 00000000..07ce1b9a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueNetworkIdAndTransform.cpp
@@ -0,0 +1,69 @@
+// MessageQueueNetworkIdAndTransform.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "MessageQueueNetworkIdAndTransform.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedMathArchive/TransformArchive.h"
+
+//===================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION_NO_INSTALL(MessageQueueNetworkIdAndTransform);
+
+//===================================================================
+
+void MessageQueueNetworkIdAndTransform::install() 
+{ 
+	installMemoryBlockManager();
+	ControllerMessageFactory::registerControllerMessageHandler(CM_transferObjectToCell, pack, unpack); 
+	ExitChain::add(&remove, "MessageQueueNetworkIdAndTransform::remove"); 
+} 
+
+//-----------------------------------------------------------------------
+
+MessageQueueNetworkIdAndTransform::MessageQueueNetworkIdAndTransform(const NetworkId & n, const Transform & t) :
+MessageQueue::Data(),
+m_networkId(n),
+m_transform(t)
+{
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueueNetworkIdAndTransform::~MessageQueueNetworkIdAndTransform()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void MessageQueueNetworkIdAndTransform::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueNetworkIdAndTransform* const msg = safe_cast<const MessageQueueNetworkIdAndTransform*> (data);
+	if(msg)
+	{
+		Archive::put(target, msg->getNetworkId());
+		Archive::put(target, msg->getTransform());
+	}
+}
+
+//-----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueNetworkIdAndTransform::unpack(Archive::ReadIterator & source)
+{
+	NetworkId id;
+	Transform t;
+	
+	Archive::get(source, id);
+	Archive::get(source, t);
+	
+	return new MessageQueueNetworkIdAndTransform(id, t);
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueNetworkIdAndTransform.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueNetworkIdAndTransform.h
new file mode 100644
index 00000000..aee6d30e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueNetworkIdAndTransform.h
@@ -0,0 +1,53 @@
+// MessageQueueNetworkIdAndTransform.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_MessageQueueNetworkIdAndTransform_H
+#define	_INCLUDED_MessageQueueNetworkIdAndTransform_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedMath/Transform.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+class MemoryBlockManager;
+//-----------------------------------------------------------------------
+
+class MessageQueueNetworkIdAndTransform : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	MessageQueueNetworkIdAndTransform(const NetworkId & networkId, const Transform & transform);
+	~MessageQueueNetworkIdAndTransform();
+
+	const NetworkId &  getNetworkId  () const;
+	const Transform &  getTransform  () const;
+
+private:
+	MessageQueueNetworkIdAndTransform & operator = (const MessageQueueNetworkIdAndTransform & rhs);
+	MessageQueueNetworkIdAndTransform(const MessageQueueNetworkIdAndTransform & source);
+
+	NetworkId  m_networkId;
+	Transform  m_transform;
+};
+
+//-----------------------------------------------------------------------
+
+inline const NetworkId & MessageQueueNetworkIdAndTransform::getNetworkId() const
+{
+	return m_networkId;
+}
+
+//-----------------------------------------------------------------------
+
+inline const Transform & MessageQueueNetworkIdAndTransform::getTransform() const
+{
+	return m_transform;
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_MessageQueueNetworkIdAndTransform_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.cpp
new file mode 100644
index 00000000..7133b286
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.cpp
@@ -0,0 +1,80 @@
+//======================================================================
+//
+// MessageQueueUpdateShipOnCollision.cpp
+// copyright (c) 2004 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/MessageQueueUpdateShipOnCollision.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/MemoryBlockManager.h"
+
+
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+
+//======================================================================
+
+CONTROLLER_MESSAGE_IMPLEMENTATION(MessageQueueUpdateShipOnCollision, CM_updateShipOnCollision);
+
+//===================================================================
+
+MessageQueueUpdateShipOnCollision::MessageQueueUpdateShipOnCollision(Vector const & deltaToMove, Vector const & newVelocity, float const clampedStrengthOfImpact)
+: m_deltaToMove(deltaToMove)
+, m_newVelocity(newVelocity)
+, m_clampedStrengthOfImpact(clampedStrengthOfImpact)
+{ }
+
+// ----------------------------------------------------------------------
+
+MessageQueueUpdateShipOnCollision::~MessageQueueUpdateShipOnCollision()
+{ }
+
+//----------------------------------------------------------------------
+
+void MessageQueueUpdateShipOnCollision::pack(const MessageQueue::Data* const data, Archive::ByteStream & target)
+{
+	const MessageQueueUpdateShipOnCollision* const msg = safe_cast<const MessageQueueUpdateShipOnCollision*> (data);
+	if (msg)
+	{
+		Vector const deltaToMove = msg->getDeltaToMove();
+		Vector const newVelocity = msg->getNewVelocity();
+		float const clampedStrengthOfImpact = msg->getClampedStrengthOfImpact();
+
+		Archive::put(target, deltaToMove.x);
+		Archive::put(target, deltaToMove.y);
+		Archive::put(target, deltaToMove.z);
+		Archive::put(target, newVelocity.x);
+		Archive::put(target, newVelocity.y);
+		Archive::put(target, newVelocity.z);
+		Archive::put(target, clampedStrengthOfImpact);
+
+	}
+}
+
+//----------------------------------------------------------------------
+
+MessageQueue::Data* MessageQueueUpdateShipOnCollision::unpack(Archive::ReadIterator & source)
+{
+	Vector deltaToMove;
+	Vector newVelocity;
+	float clampedStrengthOfImpact;
+
+	Archive::get(source, deltaToMove.x);
+	Archive::get(source, deltaToMove.y);
+	Archive::get(source, deltaToMove.z);
+	Archive::get(source, newVelocity.x);
+	Archive::get(source, newVelocity.y);
+	Archive::get(source, newVelocity.z);
+	Archive::get(source, clampedStrengthOfImpact);
+
+	MessageQueueUpdateShipOnCollision * const msg = new MessageQueueUpdateShipOnCollision(deltaToMove, newVelocity, clampedStrengthOfImpact);
+	NOT_NULL(msg);
+
+	return msg;
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.h
new file mode 100644
index 00000000..14f186f5
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/MessageQueueUpdateShipOnCollision.h
@@ -0,0 +1,55 @@
+//======================================================================
+//
+// MessageQueueUpdateShipOnCollision.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_MessageQueueUpdateShipOnCollision_H
+#define INCLUDED_MessageQueueUpdateShipOnCollision_H
+
+//======================================================================
+
+#include "sharedFoundation/MessageQueue.h"
+#include "sharedMath/Vector.h"
+
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/ControllerMessageMacros.h"
+
+//----------------------------------------------------------------------
+
+class MessageQueueUpdateShipOnCollision : public MessageQueue::Data
+{
+	CONTROLLER_MESSAGE_INTERFACE;
+
+public:
+	MessageQueueUpdateShipOnCollision(Vector const & deltaToMove, Vector const & newVelocity, float const clampedStrengthOfImpact);
+	virtual ~MessageQueueUpdateShipOnCollision();
+
+	Vector const & getDeltaToMove() const;
+	Vector const & getNewVelocity() const;
+	float getClampedStrengthOfImpact() const;
+private:
+	Vector m_deltaToMove;
+	Vector m_newVelocity;
+	float m_clampedStrengthOfImpact;
+};
+
+//======================================================================
+
+inline Vector const & MessageQueueUpdateShipOnCollision::getDeltaToMove() const
+{
+	return(m_deltaToMove);
+}
+
+inline Vector const & MessageQueueUpdateShipOnCollision::getNewVelocity() const
+{
+	return(m_newVelocity);
+}
+
+inline float MessageQueueUpdateShipOnCollision::getClampedStrengthOfImpact() const
+{
+	return(m_clampedStrengthOfImpact);
+}
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/SetTransformMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/SetTransformMessage.cpp
new file mode 100644
index 00000000..8982f80c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/SetTransformMessage.cpp
@@ -0,0 +1,49 @@
+// SetTransformMessage.cpp
+// copyright 2002 Verant Interactive
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/SetTransformMessage.h"
+
+//-----------------------------------------------------------------------
+
+SetTransformMessage::SetTransformMessage(const NetworkId & id, const Transform& transform, const NetworkId& cellId) :
+GameNetworkMessage("SetTransformMessage"),
+m_id(id),
+m_transform(transform),
+m_cellId(cellId)
+{
+	addVariable(m_id);
+	addVariable(m_transform);
+	addVariable(m_cellId);
+}
+
+//-----------------------------------------------------------------------
+
+SetTransformMessage::SetTransformMessage(Archive::ReadIterator & source) :
+GameNetworkMessage("SetTransformMessage"),
+m_id(NetworkId::cms_invalid),
+m_transform(),
+m_cellId(NetworkId::cms_invalid)
+{
+	addVariable(m_id);
+	addVariable(m_transform);
+	addVariable(m_cellId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+SetTransformMessage::~SetTransformMessage  ()
+{
+}
+
+//-----------------------------------------------------------------------
+
+void SetTransformMessage::pack(Archive::ByteStream & target) const
+{
+	AutoByteStream::pack(target);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/SetTransformMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/common/SetTransformMessage.h
new file mode 100644
index 00000000..ef50b7c6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/SetTransformMessage.h
@@ -0,0 +1,57 @@
+// SetTransformMessage.h
+// copyright 2002 Sony Online Entertainment
+
+
+#ifndef	_SetTransformMessage_H
+#define	_SetTransformMessage_H
+
+//-----------------------------------------------------------------------
+
+class Object;
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedMath/Transform.h"
+#include "sharedMathArchive/TransformArchive.h"
+
+//-----------------------------------------------------------------------
+
+class SetTransformMessage : public GameNetworkMessage
+{
+public: //ctor/dtor
+	SetTransformMessage   (const NetworkId & id, const Transform& transform, const NetworkId& cellId);
+	explicit SetTransformMessage   (Archive::ReadIterator & source);
+	~SetTransformMessage  ();
+
+public: // methods
+	const NetworkId &            getNetworkId       () const;
+	const Transform &            getTransform       () const;
+	const NetworkId &            getCellId          () const;
+
+	void                         pack               (Archive::ByteStream & target) const;
+
+private: 
+	Archive::AutoVariable<NetworkId>            m_id;
+	Archive::AutoVariable<Transform>           m_transform;
+	Archive::AutoVariable<NetworkId>            m_cellId;
+};
+
+//-----------------------------------------------------------------------
+const NetworkId & SetTransformMessage::getNetworkId() const
+{
+	return m_id.get();
+}
+//-----------------------------------------------------------------------
+const Transform & SetTransformMessage::getTransform() const
+{
+	return m_transform.get();
+}
+//-----------------------------------------------------------------------
+const NetworkId & SetTransformMessage::getCellId() const
+{
+	return m_cellId.get();
+}
+//-----------------------------------------------------------------------
+
+
+#endif // _SetTransformMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/core/ControllerMessageMacros.h b/engine/shared/library/sharedNetworkMessages/src/shared/core/ControllerMessageMacros.h
new file mode 100644
index 00000000..18ee43f3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/core/ControllerMessageMacros.h
@@ -0,0 +1,115 @@
+// ======================================================================
+//
+// ControllerMessageMacros.h
+// Copyright 2002, Sony Online Entertainment Inc.
+// All Rights Reserved.
+//
+// ======================================================================
+
+#ifndef INCLUDED_ControllerMessageMacros_H
+#define INCLUDED_ControllerMessageMacros_H
+
+// ======================================================================
+#include "sharedFoundation/MemoryBlockManagerMacros.h"
+#include "Archive/Archive.h"
+
+#define CONTROLLER_MESSAGE_INTERFACE \
+	MEMORY_BLOCK_MANAGER_INTERFACE_WITHOUT_INSTALL; \
+	public: \
+		static void                   install(); \
+		static void                   pack(const MessageQueue::Data* data, Archive::ByteStream & target); \
+		static MessageQueue::Data*    unpack(Archive::ReadIterator & source); \
+	private: \
+		static void                   remove(); 
+
+#define CONTROLLER_MESSAGE_IMPLEMENTATION(className, message) \
+	MEMORY_BLOCK_MANAGER_IMPLEMENTATION_WITHOUT_INSTALL(className, true, 0, 0, 0); \
+	void className::install() \
+	{ \
+		installMemoryBlockManager(); \
+		ControllerMessageFactory::registerControllerMessageHandler(static_cast<int>(message), pack, unpack); \
+		ExitChain::add(&remove, #className "::remove"); \
+	} \
+	void className::remove() \
+	{ \
+		removeMemoryBlockManager(); \
+	} 
+
+#define CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION(className, message) \
+	MEMORY_BLOCK_MANAGER_IMPLEMENTATION_WITHOUT_INSTALL(className, true, 0, 0, 0); \
+	void className::install() \
+	{ \
+		installMemoryBlockManager(); \
+		ControllerMessageFactory::registerControllerMessageHandler(static_cast<int>(message), pack, unpack, true); \
+		ExitChain::add(&remove, #className "::remove"); \
+	} \
+	void className::remove() \
+	{ \
+		removeMemoryBlockManager(); \
+	} 
+
+#define CONTROLLER_MESSAGE_IMPLEMENTATION_WITH_ARCHIVE(className, message) \
+	MEMORY_BLOCK_MANAGER_IMPLEMENTATION_WITHOUT_INSTALL(className, true, 0, 0, 0); \
+	void className::install() \
+	{ \
+		installMemoryBlockManager(); \
+		ControllerMessageFactory::registerControllerMessageHandler(static_cast<int>(message), pack, unpack); \
+		ExitChain::add(&remove, #className "::remove"); \
+	} \
+	void className::remove() \
+	{ \
+		removeMemoryBlockManager(); \
+	} \
+	void className::pack(const MessageQueue::Data* const data, Archive::ByteStream & target) \
+	{ \
+		className ## Archive::put (data, target); \
+	} \
+	MessageQueue::Data* className::unpack(Archive::ReadIterator & source) \
+	{ \
+		return className ## Archive::get (source); \
+	}	
+
+#define CONTROLLER_MESSAGE_ALLOW_FROM_CLIENT_IMPLEMENTATION_WITH_ARCHIVE(className, message) \
+	MEMORY_BLOCK_MANAGER_IMPLEMENTATION_WITHOUT_INSTALL(className, true, 0, 0, 0); \
+	void className::install() \
+	{ \
+		installMemoryBlockManager(); \
+		ControllerMessageFactory::registerControllerMessageHandler(static_cast<int>(message), pack, unpack, true); \
+		ExitChain::add(&remove, #className "::remove"); \
+	} \
+	void className::remove() \
+	{ \
+		removeMemoryBlockManager(); \
+	} \
+	void className::pack(const MessageQueue::Data* const data, Archive::ByteStream & target) \
+	{ \
+		className ## Archive::put (data, target); \
+	} \
+	MessageQueue::Data* className::unpack(Archive::ReadIterator & source) \
+	{ \
+		return className ## Archive::get (source); \
+	}	
+
+#define CONTROLLER_MESSAGE_IMPLEMENTATION_NO_INSTALL(className) \
+	MEMORY_BLOCK_MANAGER_IMPLEMENTATION_WITHOUT_INSTALL(className, true, 0, 0, 0); \
+	void className::remove() \
+	{ \
+		removeMemoryBlockManager(); \
+	} 
+
+#define CONTROLLER_MESSAGE_IMPLEMENTATION_WITH_ARCHIVE_NO_INSTALL(className) \
+	MEMORY_BLOCK_MANAGER_IMPLEMENTATION_WITHOUT_INSTALL(className, true, 0, 0, 0); \
+	void className::remove() \
+	{ \
+		removeMemoryBlockManager(); \
+	} \
+	void className::pack(const MessageQueue::Data* const data, Archive::ByteStream & target) \
+	{ \
+		className ## Archive::put (data, target); \
+	} \
+	MessageQueue::Data* className::unpack(Archive::ReadIterator & source) \
+	{ \
+		return className ## Archive::get (source); \
+	}	
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/core/FirstSharedNetworkMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/core/FirstSharedNetworkMessages.h
new file mode 100644
index 00000000..1796d15a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/core/FirstSharedNetworkMessages.h
@@ -0,0 +1,25 @@
+// ======================================================================
+//
+// FirstNetworkMessages.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_FirstNetworkMessages_H
+#define INCLUDED_FirstNetworkMessages_H
+
+// ======================================================================
+
+#include "sharedFoundation/FirstSharedFoundation.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkId.h"
+#include <string>
+#include "sharedNetworkMessages/ClientCentralMessages.h"
+#include "sharedNetworkMessages/ClientLoginMessages.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/core/NetworkStringIds.h b/engine/shared/library/sharedNetworkMessages/src/shared/core/NetworkStringIds.h
new file mode 100644
index 00000000..3b3179e9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/core/NetworkStringIds.h
@@ -0,0 +1,28 @@
+// ======================================================================
+//
+// NetworkStringIds.h
+// copyright (c) 2003 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_NetworkStringIds_H
+#define INCLUDED_NetworkStringIds_H
+
+// ======================================================================
+
+#include "StringId.h"
+
+//======================================================================
+
+#define MAKE_STRING_ID(a, b) const StringId b(#a,#b);
+
+//----------------------------------------------------------------------
+
+namespace SharedStringIds
+{
+	MAKE_STRING_ID(shared,      character_create_failed_bad_location);
+}
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/core/SetupSharedNetworkMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/core/SetupSharedNetworkMessages.cpp
new file mode 100644
index 00000000..e92dd770
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/core/SetupSharedNetworkMessages.cpp
@@ -0,0 +1,446 @@
+// ======================================================================
+//
+// SetupSharedNetworkMessages.cpp
+// copyright 1998 Bootprint Entertainment
+// copyright 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/SetupSharedNetworkMessages.h"
+
+#include "sharedFoundation/ExitChain.h"
+#include "sharedFoundation/GameControllerMessage.h"
+#include "sharedNetworkMessages/BaselinesMessage.h"
+#include "sharedNetworkMessages/DeltasMessage.h"
+#include "sharedNetworkMessages/SceneChannelMessages.h"
+#include "sharedMathArchive/TransformArchive.h"
+#include "sharedNetworkMessages/ObjectChannelMessages.h"
+#include "sharedNetworkMessages/ControllerMessageFactory.h"
+#include "sharedUtility/ValueDictionary.h"
+#include "sharedUtility/ValueDictionaryArchive.h"
+
+#include "sharedNetworkMessages/BuffBuilderChangeMessage.h"
+#include "sharedNetworkMessages/BuffBuilderStartMessage.h"
+#include "sharedNetworkMessages/DroidCommandProgrammingMessage.h"
+#include "sharedNetworkMessages/EnvironmentalHitData.h"
+#include "sharedNetworkMessages/ImageDesignChangeMessage.h"
+#include "sharedNetworkMessages/ImageDesignStartMessage.h"
+#include "sharedNetworkMessages/IncubatorCommitMessage.h"
+#include "sharedNetworkMessages/IncubatorStartMessage.h"
+#include "sharedNetworkMessages/MessageQueueChangeRoleIconChoice.h"
+#include "sharedNetworkMessages/MessageQueueCombatSpam.h"
+#include "sharedNetworkMessages/MessageQueueCommandQueueEnqueue.h"
+#include "sharedNetworkMessages/MessageQueueCommandQueueRemove.h"
+#include "sharedNetworkMessages/MessageQueueCreateSaga.h"
+#include "sharedNetworkMessages/MessageQueueCraftCustomization.h"
+#include "sharedNetworkMessages/MessageQueueCraftEmptySlot.h"
+#include "sharedNetworkMessages/MessageQueueCraftExperiment.h"
+#include "sharedNetworkMessages/MessageQueueCraftFillSlot.h"
+#include "sharedNetworkMessages/MessageQueueCraftIngredients.h"
+#include "sharedNetworkMessages/MessageQueueCraftRequestSession.h"
+#include "sharedNetworkMessages/MessageQueueCraftSelectSchematic.h"
+#include "sharedNetworkMessages/MessageQueueCyberneticsChangeRequest.h"
+#include "sharedNetworkMessages/MessageQueueCyberneticsOpen.h"
+#include "sharedNetworkMessages/MessageQueueDataTransform.h"
+#include "sharedNetworkMessages/MessageQueueDataTransformWithParent.h"
+#include "sharedNetworkMessages/MessageQueueDraftSchematics.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlots.h"
+#include "sharedNetworkMessages/MessageQueueDraftSlotsQueryResponse.h"
+#include "sharedNetworkMessages/MessageQueueGeneric.h"
+#include "sharedNetworkMessages/MessageQueueGenericIntResponse.h"
+#include "sharedNetworkMessages/MessageQueueGenericResponse.h"
+#include "sharedNetworkMessages/MessageQueueGenericString.h"
+#include "sharedNetworkMessages/MessageQueueHarvesterResourceData.h"
+#include "sharedNetworkMessages/MessageQueueMissionCreateRequest.h"
+#include "sharedNetworkMessages/MessageQueueMissionCreateRequestData.h"
+#include "sharedNetworkMessages/MessageQueueMissionDetailsRequest.h"
+#include "sharedNetworkMessages/MessageQueueMissionDetailsResponse.h"
+#include "sharedNetworkMessages/MessageQueueMissionDetailsResponseData.h"
+#include "sharedNetworkMessages/MessageQueueMissionGenericRequest.h"
+#include "sharedNetworkMessages/MessageQueueMissionGenericResponse.h"
+#include "sharedNetworkMessages/MessageQueueMissionListRequest.h"
+#include "sharedNetworkMessages/MessageQueueMissionListResponse.h"
+#include "sharedNetworkMessages/MessageQueueNetworkId.h"
+#include "sharedNetworkMessages/MessageQueueNetworkIdAndTransform.h"
+#include "sharedNetworkMessages/MessageQueueNetworkIdPair.h"
+#include "sharedNetworkMessages/MessageQueueNpcConversationMessage.h"
+#include "sharedNetworkMessages/MessageQueueObjectMenuRequest.h"
+#include "sharedNetworkMessages/MessageQueueOpponentInfo.h"
+#include "sharedNetworkMessages/MessageQueuePosture.h"
+#include "sharedNetworkMessages/MessageQueuePushCreature.h"
+#include "sharedNetworkMessages/MessageQueueQuestTaskCounterMessage.h"
+#include "sharedNetworkMessages/MessageQueueQuestTaskLocationMessage.h"
+#include "sharedNetworkMessages/MessageQueueQuestTaskTimerMessage.h"
+#include "sharedNetworkMessages/MessageQueueResourceEmptyHopper.h"
+#include "sharedNetworkMessages/MessageQueueResourceWeights.h"
+#include "sharedNetworkMessages/MessageQueueSecureTrade.h"
+#include "sharedNetworkMessages/MessageQueueSelectCurrentWorkingSkill.h"
+#include "sharedNetworkMessages/MessageQueueSelectProfessionTemplate.h"
+#include "sharedNetworkMessages/MessageQueueShipHit.h"
+#include "sharedNetworkMessages/MessageQueueShowCombatText.h"
+#include "sharedNetworkMessages/MessageQueueShowFlyText.h"
+#include "sharedNetworkMessages/MessageQueueSitOnObject.h"
+#include "sharedNetworkMessages/MessageQueueSlowDownEffect.h"
+#include "sharedNetworkMessages/MessageQueueSocial.h"
+#include "sharedNetworkMessages/MessageQueueSpaceMiningSellResource.h"
+#include "sharedNetworkMessages/MessageQueueSpatialChat.h"
+#include "sharedNetworkMessages/MessageQueueStartNpcConversation.h"
+#include "sharedNetworkMessages/MessageQueueStopNpcConversation.h"
+#include "sharedNetworkMessages/MessageQueueString.h"
+#include "sharedNetworkMessages/MessageQueueStringList.h"
+#include "sharedNetworkMessages/MessageQueueTeleportAck.h"
+#include "sharedNetworkMessages/MessageQueueUpdateShipOnCollision.h"
+#include "sharedNetworkMessages/NebulaLightningHitData.h"
+#include "sharedNetworkMessages/ShipDamageMessage.h"
+#include "sharedNetworkMessages/ShipDamageMessageArchive.h"
+#include "sharedNetworkMessages/UpdateTransformMessage.h"
+#include "sharedNetworkMessages/UpdateTransformWithParentMessage.h"
+
+// ----------------------------------------------------------------------
+namespace SetupSharedNetworkMessagesNamespace
+{
+	static bool g_installed = false;
+
+	void packGenericUint32Message(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		MessageQueueGenericValueType<uint32> const * const msg = safe_cast<MessageQueueGenericValueType<uint32> const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	MessageQueue::Data* unpackGenericUint32Message(Archive::ReadIterator & source)
+	{
+		uint32 v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<uint32> * const result = new MessageQueueGenericValueType<uint32>(v);
+		return result;
+	}
+
+	void packGenericUint32FloatMessage(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		MessageQueueGenericValueType<std::pair<uint32, float> > const * const msg = safe_cast<MessageQueueGenericValueType<std::pair<uint32, float> > const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+	
+	MessageQueue::Data* unpackGenericUint32FloatMessage(Archive::ReadIterator & source)
+	{
+		std::pair<uint32, float> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<uint32, float> >(v);
+	}
+
+	void packNothing(MessageQueue::Data const *, Archive::ByteStream &)
+	{
+	}
+
+	MessageQueue::Data* unpackNothing(Archive::ReadIterator &)
+	{
+		return NULL;
+	}
+
+	void packGenericShipDamageMessage(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		if (data)
+		{
+			const MessageQueueGenericValueType<ShipDamageMessage> * const shipDamage = safe_cast<const MessageQueueGenericValueType<ShipDamageMessage> *>(data);
+			Archive::put(target, shipDamage->getValue());
+		}
+	}
+	
+	MessageQueue::Data* unpackGenericShipDamageMessage(Archive::ReadIterator & source)
+	{
+		ShipDamageMessage shipDamage;
+		Archive::get(source, shipDamage);
+		MessageQueueGenericValueType<ShipDamageMessage> * const result = new MessageQueueGenericValueType<ShipDamageMessage>(shipDamage);
+		return result;
+	}
+
+	//----------------------------------------------------------------------
+
+	void packGenericNebulaLightningHitData(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		if (data)
+		{
+			MessageQueueGenericValueType<NebulaLightningHitData> const * const message = safe_cast<const MessageQueueGenericValueType<NebulaLightningHitData> *>(data);
+			Archive::put(target, message->getValue());
+		}
+	}
+
+	//----------------------------------------------------------------------
+
+	MessageQueue::Data* unpackGenericNebulaLightningHitData(Archive::ReadIterator & source)
+	{
+		NebulaLightningHitData messageData;
+		Archive::get(source, messageData);
+		return new MessageQueueGenericValueType<NebulaLightningHitData>(messageData);
+	}
+
+	//----------------------------------------------------------------------
+
+	void packGenericEnvironmentalHitData(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		if (data)
+		{
+			MessageQueueGenericValueType<EnvironmentalHitData> const * const message = safe_cast<const MessageQueueGenericValueType<EnvironmentalHitData> *>(data);
+			Archive::put(target, message->getValue());
+		}
+	}
+
+	//----------------------------------------------------------------------		
+		
+	MessageQueue::Data * unpackGenericEnvironmentalHitData(Archive::ReadIterator & source)
+	{
+		EnvironmentalHitData messageData;
+		Archive::get(source, messageData);
+		return new MessageQueueGenericValueType<EnvironmentalHitData>(messageData);
+	}
+
+	//----------------------------------------------------------------------
+
+	void packGenericNetworkIdStringMessage(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		MessageQueueGenericValueType<std::pair<NetworkId, std::string> > const * const msg = safe_cast<MessageQueueGenericValueType<std::pair<NetworkId, std::string> > const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+	
+	//----------------------------------------------------------------------
+
+	MessageQueue::Data* unpackGenericNetworkIdStringMessage(Archive::ReadIterator & source)
+	{
+		std::pair<NetworkId, std::string> v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<std::pair<NetworkId, std::string> >(v);
+	}
+
+	//----------------------------------------------------------------------
+
+	void packGenericValueDictionaryMessage(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		MessageQueueGenericValueType<ValueDictionary> const * const msg = safe_cast<MessageQueueGenericValueType<ValueDictionary> const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	//----------------------------------------------------------------------
+
+	MessageQueue::Data* unpackGenericValueDictionaryMessage(Archive::ReadIterator & source)
+	{
+		ValueDictionary v;
+		Archive::get(source, v);
+		return new MessageQueueGenericValueType<ValueDictionary>(v);
+	}
+	//----------------------------------------------------------------------
+
+	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 packGenericStringStringMessage(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		MessageQueueGenericValueType<std::pair<std::string, std::string> > const * const msg = safe_cast<MessageQueueGenericValueType<std::pair<std::string, std::string> > const *>(data);
+		if (msg)
+			Archive::put(target, msg->getValue());
+	}
+
+	//----------------------------------------------------------------------
+
+	MessageQueue::Data* unpackGenericStringStringMessage(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 packNetworkIdMessage(const MessageQueue::Data * data, Archive::ByteStream & target)
+	{
+		const MessageQueueGenericValueType<NetworkId> * const msg = dynamic_cast<const MessageQueueGenericValueType<NetworkId> *>(data);
+		if(msg)
+		{
+			Archive::put(target, msg->getValue());
+		}
+	}
+
+	MessageQueue::Data* unpackNetworkIdMessage(Archive::ReadIterator & source)
+	{
+		NetworkId v;
+		Archive::get(source, v);
+		MessageQueueGenericValueType<NetworkId> * result = new MessageQueueGenericValueType<NetworkId>(v);
+		return result;
+	}
+}
+
+using namespace SetupSharedNetworkMessagesNamespace;
+
+// ----------------------------------------------------------------------
+
+void SetupSharedNetworkMessages::install ()
+{
+	DEBUG_FATAL(g_installed, ("SetupSharedNetworkMessages::install - is already installed"));
+
+	ControllerMessageFactory::install ();
+
+	BaselinesMessage::install();
+	DeltasMessage::install();
+	DroidCommandProgrammingMessage::install();
+	BuffBuilderChangeMessage::install();
+	BuffBuilderStartMessage::install();
+	ImageDesignChangeMessage::install();
+	ImageDesignStartMessage::install();
+	IncubatorCommitMessage::install();
+	IncubatorStartMessage::install();
+	ObjControllerMessage::install();
+	SceneCreateObjectByName::install();
+	SceneCreateObjectByCrc::install();
+	SceneDestroyObject::install();
+	SceneEndBaselines::install();
+	UpdateTransformMessage::install();
+	UpdateTransformWithParentMessage::install();
+
+	MessageQueueSelectProfessionTemplate::install();
+	MessageQueueSelectCurrentWorkingSkill::install();
+	MessageQueueChangeRoleIconChoice::install();
+	MessageQueueCombatSpam::install();
+	MessageQueueCommandQueueEnqueue::install();
+	MessageQueueCommandQueueRemove::install();
+	MessageQueueCreateSaga::install();
+	MessageQueueCraftCustomization::install();
+	MessageQueueCraftEmptySlot::install();
+	MessageQueueCraftExperiment::install();
+	MessageQueueCraftFillSlot::install();
+	MessageQueueCraftIngredients::install();
+	MessageQueueCraftRequestSession::install();
+	MessageQueueCraftSelectSchematic::install();
+	MessageQueueCyberneticsChangeRequest::install();
+	MessageQueueCyberneticsOpen::install();
+	MessageQueueDataTransform::install();
+	MessageQueueDataTransformWithParent::install();
+	MessageQueueDraftSchematics::install();
+	MessageQueueDraftSlots::install();
+	MessageQueueDraftSlotsQueryResponse::install();
+	MessageQueueGeneric::install();
+	MessageQueueGenericIntResponse::install();
+	MessageQueueGenericResponse::install();
+	MessageQueueGenericString::install();
+	MessageQueueHarvesterResourceData::install();
+	MessageQueueMissionCreateRequest::install();
+	MessageQueueMissionDetailsRequest::install();
+	MessageQueueMissionDetailsResponse::install();
+	MessageQueueMissionGenericRequest::install();
+	MessageQueueMissionGenericResponse::install();
+	MessageQueueMissionListRequest::install();
+	MessageQueueMissionListResponse::install();
+	MessageQueueNetworkId::install();
+	MessageQueueNetworkIdAndTransform::install();
+	MessageQueueNetworkIdPair::install();
+	MessageQueueNpcConversationMessage::install();
+	MessageQueueObjectMenuRequest::install();
+	MessageQueueOpponentInfo::install();
+	MessageQueuePosture::install();
+	MessageQueuePushCreature::install();
+	MessageQueueResourceEmptyHopper::install();
+	MessageQueueResourceWeights::install();
+	MessageQueueSecureTrade::install();
+	MessageQueueShipHit::install();
+	MessageQueueShowFlyText::install();
+	MessageQueueShowCombatText::install();
+	MessageQueueSitOnObject::install();
+	MessageQueueSlowDownEffect::install();
+	MessageQueueSocial::install();
+	MessageQueueSpatialChat::install();
+	MessageQueueStartNpcConversation::install();
+	MessageQueueStopNpcConversation::install();
+	MessageQueueString::install();
+	MessageQueueStringList::install();
+	MessageQueueTeleportAck::install();
+	MessageQueueUpdateShipOnCollision::install();
+	MessageQueueQuestTaskCounterMessage::install();
+	MessageQueueQuestTaskLocationMessage::install();
+	MessageQueueQuestTaskTimerMessage::install();
+	MessageQueueSpaceMiningSellResource::install();
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_modData, packGenericUint32FloatMessage, unpackGenericUint32FloatMessage);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_cancelMod, packGenericUint32Message, unpackGenericUint32Message);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_objectMenuDirty, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_attributesDirty, packNothing, unpackNothing);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_imageDesignerCancel, ImageDesignChangeMessage::pack, ImageDesignChangeMessage::unpack, true);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_buffBuilderCancel, BuffBuilderChangeMessage::pack, BuffBuilderChangeMessage::unpack, true);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_incubatorCancel, IncubatorCommitMessage::pack, IncubatorCommitMessage::unpack, true);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_shipDamageMessage, packGenericShipDamageMessage, unpackGenericShipDamageMessage);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_lightningHitShip, packGenericNebulaLightningHitData, unpackGenericNebulaLightningHitData);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_environmentHitShip, packGenericEnvironmentalHitData, unpackGenericEnvironmentalHitData);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_uiPlayEffect, packGenericNetworkIdStringMessage, unpackGenericNetworkIdStringMessage);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_removeSlowDownEffect, packNothing, unpackNothing);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_shipStopFiring, packInt, unpackInt, true);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_spaceMiningSaleOpen, packGenericNetworkIdStringMessage, unpackGenericNetworkIdStringMessage);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_setCurrentQuest, packGenericUint32Message, unpackGenericUint32Message, true);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_jump, packNothing, unpackNothing);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_openCustomizationWindow, packGenericNetworkIdStringMessage, unpackGenericNetworkIdStringMessage);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_customizeFinished, packGenericNetworkIdStringMessage, unpackGenericNetworkIdStringMessage, true);
+	
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientMinigameOpen, packGenericValueDictionaryMessage, unpackGenericValueDictionaryMessage);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientMinigameClose, packGenericValueDictionaryMessage, unpackGenericValueDictionaryMessage);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_clientMinigameResult, packGenericValueDictionaryMessage, unpackGenericValueDictionaryMessage, true);
+
+	ControllerMessageFactory::registerControllerMessageHandler(CM_openRatingWindow, packGenericStringStringMessage, unpackGenericStringStringMessage);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_ratingFinished, packInt, unpackInt, true);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_abandonPlayerQuest, packNetworkIdMessage, unpackNetworkIdMessage, true);
+	ControllerMessageFactory::registerControllerMessageHandler(CM_openRecipe, packNetworkIdMessage, unpackNetworkIdMessage, true);
+
+	g_installed = true;
+	ExitChain::add (SetupSharedNetworkMessages::remove, "SetupSharedNetworkMessages");
+}
+// ----------------------------------------------------------------------
+
+void SetupSharedNetworkMessages::remove ( void )
+{
+	DEBUG_FATAL(!g_installed, ("SetupSharedNetworkMessages::remove - not already installed"));
+	BaselinesMessage::remove();
+	ObjControllerMessage::remove();
+	SceneCreateObjectByName::remove();
+	SceneCreateObjectByCrc::remove();
+	SceneDestroyObject::remove();
+	SceneEndBaselines::remove();
+	UpdateTransformMessage::remove();
+	UpdateTransformWithParentMessage::remove();
+
+	//-- @todo this should be moved to SetupSharedNetworkMessages
+	ControllerMessageFactory::remove ();
+
+	g_installed = false;
+}
+
+// ----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/core/SetupSharedNetworkMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/core/SetupSharedNetworkMessages.h
new file mode 100644
index 00000000..2e948a7a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/core/SetupSharedNetworkMessages.h
@@ -0,0 +1,30 @@
+// ======================================================================
+//
+// SetupSharedNetworkMessages.h
+// copyright 2001 Sony Online Entertainment
+// 
+// ======================================================================
+
+#ifndef INCLUDED_SetupSharedNetworkMessages_H
+#define INCLUDED_SetupSharedNetworkMessages_H
+
+// ======================================================================
+
+class SetupSharedNetworkMessages
+{
+public:
+
+	static void install ( void );
+	static void remove();
+
+private:
+
+	SetupSharedNetworkMessages();
+	~SetupSharedNetworkMessages();
+	SetupSharedNetworkMessages(const SetupSharedNetworkMessages&);
+	SetupSharedNetworkMessages& operator= (const SetupSharedNetworkMessages&);
+};
+
+// ======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentMessage.cpp
new file mode 100644
index 00000000..0affd109
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentMessage.cpp
@@ -0,0 +1,51 @@
+// ======================================================================
+//
+// AppendCommentMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/AppendCommentMessage.h"
+
+// ======================================================================
+
+AppendCommentMessage::AppendCommentMessage(
+	unsigned int ticketId, 
+	const std::string &characterName, 
+	const Unicode::String &comment 
+) :
+GameNetworkMessage("AppendCommentMessage"),
+m_ticketId(ticketId),
+m_characterName(characterName),
+m_comment(comment),
+m_stationId(0)
+{
+	addVariable(m_ticketId);
+	addVariable(m_characterName);
+	addVariable(m_comment);
+	addVariable(m_stationId);
+}
+
+// ======================================================================
+
+AppendCommentMessage::AppendCommentMessage(Archive::ReadIterator &source) :
+GameNetworkMessage("AppendCommentMessage"),
+m_ticketId(0),
+m_characterName(),
+m_comment(),
+m_stationId(0)
+{
+	addVariable(m_ticketId);
+	addVariable(m_characterName);
+	addVariable(m_comment);
+	addVariable(m_stationId);
+	unpack(source);
+}
+
+// ======================================================================
+
+AppendCommentMessage::~AppendCommentMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentMessage.h
new file mode 100644
index 00000000..0c097869
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentMessage.h
@@ -0,0 +1,85 @@
+// ======================================================================
+//
+// AppendCommentMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AppendCommentMessage_H
+#define	_AppendCommentMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class AppendCommentMessage : public GameNetworkMessage
+{
+public:
+
+	AppendCommentMessage(unsigned int ticketId, const std::string &characterName, const Unicode::String &comment);
+	explicit AppendCommentMessage(Archive::ReadIterator &source);
+
+	~AppendCommentMessage();
+
+public: 
+
+	unsigned int                          getTicketId() const;
+	const std::string &                   getCharacterName() const;
+	const Unicode::String &               getComment() const;
+	unsigned int                          getStationId() const;
+	void                                  setStationId(unsigned int id);
+
+private: 
+	Archive::AutoVariable<unsigned int>    m_ticketId;  
+	Archive::AutoVariable<std::string>     m_characterName;  
+	Archive::AutoVariable<Unicode::String> m_comment;  
+	Archive::AutoVariable<unsigned int>    m_stationId;  
+};
+
+// ----------------------------------------------------------------------
+
+inline const std::string & AppendCommentMessage::getCharacterName() const
+{
+	return m_characterName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int AppendCommentMessage::getTicketId() const
+{
+	return m_ticketId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & AppendCommentMessage::getComment() const
+{
+	return m_comment.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int AppendCommentMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void AppendCommentMessage::setStationId(unsigned int id)
+{
+	m_stationId.set(id);
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _AppendCommentMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentResponseMessage.cpp
new file mode 100644
index 00000000..0025da3b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentResponseMessage.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// AppendCommentResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/AppendCommentResponseMessage.h"
+
+// ======================================================================
+
+AppendCommentResponseMessage::AppendCommentResponseMessage(int32 result, unsigned int ticketId) :
+	GameNetworkMessage("AppendCommentResponseMessage"),
+	m_result(result),
+	m_ticketId(ticketId)
+{
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_ticketId);
+}
+
+// ======================================================================
+
+AppendCommentResponseMessage::AppendCommentResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("AppendCommentResponseMessage"),
+	m_result(0),
+	m_ticketId(0)
+{
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_ticketId);
+	unpack(source);
+}
+
+// ======================================================================
+
+AppendCommentResponseMessage::~AppendCommentResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentResponseMessage.h
new file mode 100644
index 00000000..c64cc7e1
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/AppendCommentResponseMessage.h
@@ -0,0 +1,57 @@
+// ======================================================================
+//
+// AppendCommentResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_AppendCommentResponseMessage_H
+#define	_AppendCommentResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class AppendCommentResponseMessage : public GameNetworkMessage
+{
+public:
+	AppendCommentResponseMessage(int32 result, unsigned int ticketId);
+	explicit AppendCommentResponseMessage(Archive::ReadIterator &source);
+
+	~AppendCommentResponseMessage();
+
+public: // methods
+
+	int32                            getResult() const;
+	unsigned int                     getTicketId() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<int32>          m_result;  
+	Archive::AutoVariable<unsigned int>   m_ticketId;  
+};
+
+// ----------------------------------------------------------------------
+
+inline int32 AppendCommentResponseMessage::getResult() const
+{
+	return m_result.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int AppendCommentResponseMessage::getTicketId() const
+{
+	return m_ticketId.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _AppendCommentResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketMessage.cpp
new file mode 100644
index 00000000..50fa5eae
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketMessage.cpp
@@ -0,0 +1,46 @@
+// ======================================================================
+//
+// CancelTicketMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CancelTicketMessage.h"
+
+// ======================================================================
+
+CancelTicketMessage::CancelTicketMessage(
+	unsigned int ticketId, 
+	const Unicode::String &comment 
+) :
+GameNetworkMessage("CancelTicketMessage"),
+m_ticketId(ticketId),
+m_comment(comment),
+m_stationId(0)
+{
+	addVariable(m_ticketId);
+	addVariable(m_comment);
+	addVariable(m_stationId);
+}
+
+// ======================================================================
+
+CancelTicketMessage::CancelTicketMessage(Archive::ReadIterator &source) :
+GameNetworkMessage("CancelTicketMessage"),
+m_ticketId(0),
+m_comment(),
+m_stationId(0)
+{
+	addVariable(m_ticketId);
+	addVariable(m_comment);
+	addVariable(m_stationId);
+	unpack(source);
+}
+
+// ======================================================================
+
+CancelTicketMessage::~CancelTicketMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketMessage.h
new file mode 100644
index 00000000..63c56e19
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketMessage.h
@@ -0,0 +1,76 @@
+// ======================================================================
+//
+// CancelTicketMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_CancelTicketMessage_H
+#define	_CancelTicketMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class CancelTicketMessage : public GameNetworkMessage
+{
+public:
+
+	CancelTicketMessage(unsigned int ticketId, const Unicode::String &comment);
+	explicit CancelTicketMessage(Archive::ReadIterator &source);
+
+	~CancelTicketMessage();
+
+public: 
+
+	unsigned int                          getTicketId() const;
+	const Unicode::String &               getComment() const;
+	unsigned int                          getStationId() const;
+	void                                  setStationId(unsigned int id);
+
+private: 
+	Archive::AutoVariable<unsigned int>    m_ticketId;  
+	Archive::AutoVariable<Unicode::String> m_comment;  
+	Archive::AutoVariable<unsigned int>    m_stationId;  
+};
+
+// ----------------------------------------------------------------------
+
+inline unsigned int CancelTicketMessage::getTicketId() const
+{
+	return m_ticketId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & CancelTicketMessage::getComment() const
+{
+	return m_comment.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int CancelTicketMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void CancelTicketMessage::setStationId(unsigned int id)
+{
+	m_stationId.set(id);
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _CancelTicketMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketResponseMessage.cpp
new file mode 100644
index 00000000..72a1663b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketResponseMessage.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// CancelTicketResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CancelTicketResponseMessage.h"
+
+// ======================================================================
+
+CancelTicketResponseMessage::CancelTicketResponseMessage(int32 result, unsigned int ticketId) :
+	GameNetworkMessage("CancelTicketResponseMessage"),
+	m_result(result),
+	m_ticketId(ticketId)
+{
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_ticketId);
+}
+
+// ======================================================================
+
+CancelTicketResponseMessage::CancelTicketResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("CancelTicketResponseMessage"),
+	m_result(0),
+	m_ticketId(0)
+{
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_ticketId);
+	unpack(source);
+}
+
+// ======================================================================
+
+CancelTicketResponseMessage::~CancelTicketResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketResponseMessage.h
new file mode 100644
index 00000000..8ff83118
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CancelTicketResponseMessage.h
@@ -0,0 +1,57 @@
+// ======================================================================
+//
+// CancelTicketResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_CancelTicketResponseMessage_H
+#define	_CancelTicketResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class CancelTicketResponseMessage : public GameNetworkMessage
+{
+public:
+	CancelTicketResponseMessage(int32 result, unsigned int ticketId);
+	explicit CancelTicketResponseMessage(Archive::ReadIterator &source);
+
+	~CancelTicketResponseMessage();
+
+public: // methods
+
+	int32                            getResult() const;
+	unsigned int                     getTicketId() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<int32>          m_result;  
+	Archive::AutoVariable<unsigned int>   m_ticketId;  
+};
+
+// ----------------------------------------------------------------------
+
+inline int32 CancelTicketResponseMessage::getResult() const
+{
+	return m_result.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int CancelTicketResponseMessage::getTicketId() const
+{
+	return m_ticketId.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _CancelTicketResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerMessage.cpp
new file mode 100644
index 00000000..c238ba45
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerMessage.cpp
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// ConnectPlayerMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ConnectPlayerMessage.h"
+
+// ======================================================================
+
+ConnectPlayerMessage::ConnectPlayerMessage() :
+	GameNetworkMessage("ConnectPlayerMessage"),
+	m_stationId(0)
+{
+	addVariable(m_stationId);
+}
+
+// ======================================================================
+
+ConnectPlayerMessage::ConnectPlayerMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("ConnectPlayerMessage"),
+	m_stationId(0)
+{
+	addVariable(m_stationId);
+	unpack(source);
+}
+
+// ======================================================================
+
+ConnectPlayerMessage::~ConnectPlayerMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerMessage.h
new file mode 100644
index 00000000..52a7f21a
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerMessage.h
@@ -0,0 +1,56 @@
+// ======================================================================
+//
+// ConnectPlayerMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_ConnectPlayerMessage_H
+#define	_ConnectPlayerMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class ConnectPlayerMessage : public GameNetworkMessage
+{
+public:
+
+	ConnectPlayerMessage();
+	explicit ConnectPlayerMessage(Archive::ReadIterator &source);
+
+	~ConnectPlayerMessage();
+
+public: 
+
+	unsigned int                          getStationId() const;
+	void                                  setStationId(unsigned int id);
+
+private: 
+	Archive::AutoVariable<unsigned int>   m_stationId;  
+};
+
+// ----------------------------------------------------------------------
+
+inline unsigned int ConnectPlayerMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void ConnectPlayerMessage::setStationId(unsigned int id)
+{
+	m_stationId.set(id);
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _ConnectPlayerMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerResponseMessage.cpp
new file mode 100644
index 00000000..5fbd5165
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerResponseMessage.cpp
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// ConnectPlayerResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ConnectPlayerResponseMessage.h"
+
+// ======================================================================
+
+ConnectPlayerResponseMessage::ConnectPlayerResponseMessage(int32 result) :
+	GameNetworkMessage("ConnectPlayerResponseMessage"),
+	m_result(result)
+{
+	AutoByteStream::addVariable(m_result);
+}
+
+// ======================================================================
+
+ConnectPlayerResponseMessage::ConnectPlayerResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("ConnectPlayerResponseMessage"),
+	m_result()
+{
+	AutoByteStream::addVariable(m_result);
+	unpack(source);
+}
+
+// ======================================================================
+
+ConnectPlayerResponseMessage::~ConnectPlayerResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerResponseMessage.h
new file mode 100644
index 00000000..235a2a3e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/ConnectPlayerResponseMessage.h
@@ -0,0 +1,49 @@
+// ======================================================================
+//
+// ConnectPlayerResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_ConnectPlayerResponseMessage_H
+#define	_ConnectPlayerResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class ConnectPlayerResponseMessage : public GameNetworkMessage
+{
+public:
+	ConnectPlayerResponseMessage(int32 result);
+	explicit ConnectPlayerResponseMessage(Archive::ReadIterator &source);
+
+	~ConnectPlayerResponseMessage();
+
+public: // methods
+
+	int32                            getResult() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<int32>   m_result;  
+};
+
+// ----------------------------------------------------------------------
+
+inline int32 ConnectPlayerResponseMessage::getResult() const
+{
+	return m_result.get();
+}
+
+
+// ----------------------------------------------------------------------
+
+#endif // _ConnectPlayerResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketMessage.cpp
new file mode 100644
index 00000000..cc004265
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketMessage.cpp
@@ -0,0 +1,75 @@
+// ======================================================================
+//
+// CreateTicketMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CreateTicketMessage.h"
+
+// ======================================================================
+
+CreateTicketMessage::CreateTicketMessage(
+	const std::string &characterName, 
+	unsigned category, 
+	unsigned subCategory, 
+	const Unicode::String &details, 
+	const Unicode::String &hiddenDetails, 
+	const Unicode::String &harassingPlayerName,
+	const std::string &language,
+	bool isBug
+) :
+GameNetworkMessage("CreateTicketMessage"),
+m_characterName(characterName),
+m_category(category),
+m_subCategory(subCategory),
+m_details(details),
+m_hiddenDetails(hiddenDetails),
+m_harassingPlayerName(harassingPlayerName),
+m_language(language),
+m_stationId(0),
+m_isBug(isBug)
+{
+	addVariable(m_characterName);
+	addVariable(m_category);
+	addVariable(m_subCategory);
+	addVariable(m_details);
+	addVariable(m_hiddenDetails);
+	addVariable(m_harassingPlayerName);
+	addVariable(m_language);
+	addVariable(m_stationId);
+	addVariable(m_isBug);
+}
+
+// ======================================================================
+
+CreateTicketMessage::CreateTicketMessage(Archive::ReadIterator &source) :
+GameNetworkMessage("CreateTicketMessage"),
+m_category(0),
+m_subCategory(0),
+m_details(),
+m_hiddenDetails(),
+m_harassingPlayerName(),
+m_language(),
+m_stationId(0),
+m_isBug(false)
+{
+	addVariable(m_characterName);
+	addVariable(m_category);
+	addVariable(m_subCategory);
+	addVariable(m_details);
+	addVariable(m_hiddenDetails);
+	addVariable(m_harassingPlayerName);
+	addVariable(m_language);
+	addVariable(m_stationId);
+	addVariable(m_isBug);
+	unpack(source);
+}
+
+// ======================================================================
+
+CreateTicketMessage::~CreateTicketMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketMessage.h
new file mode 100644
index 00000000..26dc79fa
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketMessage.h
@@ -0,0 +1,130 @@
+// ======================================================================
+//
+// CreateTicketMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_CreateTicketMessage_H
+#define	_CreateTicketMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class CreateTicketMessage : public GameNetworkMessage
+{
+public:
+
+	CreateTicketMessage(const std::string &characterName, unsigned category, unsigned subCategory, const Unicode::String &details, const Unicode::String &hiddenDetails, const Unicode::String &harassingPlayerName, const std::string &language, bool isBug = false);
+	explicit CreateTicketMessage(Archive::ReadIterator &source);
+
+	~CreateTicketMessage();
+
+public: 
+
+	const std::string &     getCharacterName() const;
+	unsigned int            getCategory() const;
+	unsigned int            getSubCategory() const;
+	const Unicode::String & getDetails() const;
+	const Unicode::String & getHiddenDetails() const;
+	const Unicode::String & getHarassingPlayerName() const;
+	const std::string &     getLanguage() const;
+	unsigned int            getStationId() const;
+	void                    setStationId(unsigned int id);
+	bool                    isBug() const;
+
+private: 
+	Archive::AutoVariable<std::string>     m_characterName;  
+	Archive::AutoVariable<unsigned int>    m_category;  
+	Archive::AutoVariable<unsigned int>    m_subCategory;  
+	Archive::AutoVariable<Unicode::String> m_details;  
+	Archive::AutoVariable<Unicode::String> m_hiddenDetails;  
+	Archive::AutoVariable<Unicode::String> m_harassingPlayerName;  
+	Archive::AutoVariable<std::string>     m_language;  
+	Archive::AutoVariable<unsigned int>    m_stationId;  
+	Archive::AutoVariable<bool>            m_isBug;  
+};
+
+// ----------------------------------------------------------------------
+
+inline const std::string & CreateTicketMessage::getCharacterName() const
+{
+	return m_characterName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int CreateTicketMessage::getCategory() const
+{
+	return m_category.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int CreateTicketMessage::getSubCategory() const
+{
+	return m_subCategory.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & CreateTicketMessage::getDetails() const
+{
+	return m_details.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & CreateTicketMessage::getHiddenDetails() const
+{
+	return m_hiddenDetails.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & CreateTicketMessage::getHarassingPlayerName() const
+{
+	return m_harassingPlayerName.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string & CreateTicketMessage::getLanguage() const
+{
+	return m_language.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int CreateTicketMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void CreateTicketMessage::setStationId(unsigned int id)
+{
+	m_stationId.set(id);
+}
+
+// ----------------------------------------------------------------------
+
+inline bool CreateTicketMessage::isBug() const
+{
+	return m_isBug.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _CreateTicketMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketResponseMessage.cpp
new file mode 100644
index 00000000..b3fa9aeb
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketResponseMessage.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// CreateTicketResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CreateTicketResponseMessage.h"
+
+// ======================================================================
+
+CreateTicketResponseMessage::CreateTicketResponseMessage(int32 result, unsigned int ticketId) :
+	GameNetworkMessage("CreateTicketResponseMessage"),
+	m_result(result),
+	m_ticketId(ticketId)
+{
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_ticketId);
+}
+
+// ======================================================================
+
+CreateTicketResponseMessage::CreateTicketResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("CreateTicketResponseMessage"),
+	m_result(0),
+	m_ticketId(0)
+{
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_ticketId);
+	unpack(source);
+}
+
+// ======================================================================
+
+CreateTicketResponseMessage::~CreateTicketResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketResponseMessage.h
new file mode 100644
index 00000000..b5c2700e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CreateTicketResponseMessage.h
@@ -0,0 +1,57 @@
+// ======================================================================
+//
+// CreateTicketResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_CreateTicketResponseMessage_H
+#define	_CreateTicketResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class CreateTicketResponseMessage : public GameNetworkMessage
+{
+public:
+	CreateTicketResponseMessage(int32 result, unsigned int ticketId);
+	explicit CreateTicketResponseMessage(Archive::ReadIterator &source);
+
+	~CreateTicketResponseMessage();
+
+public: // methods
+
+	int32                            getResult() const;
+	unsigned int                     getTicketId() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<int32>          m_result;  
+	Archive::AutoVariable<unsigned int>   m_ticketId;  
+};
+
+// ----------------------------------------------------------------------
+
+inline int32 CreateTicketResponseMessage::getResult() const
+{
+	return m_result.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int CreateTicketResponseMessage::getTicketId() const
+{
+	return m_ticketId.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _CreateTicketResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCategory.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCategory.cpp
new file mode 100644
index 00000000..6a95ee8d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCategory.cpp
@@ -0,0 +1,55 @@
+// CustomerServiceCategory.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved.
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CustomerServiceCategory.h"
+
+//-----------------------------------------------------------------------
+
+CustomerServiceCategory::CustomerServiceCategory() :
+m_categoryName(),
+m_categoryId(0),
+m_subCategories(),
+m_isBugType(false),
+m_isServiceType(false)
+{
+}
+
+//-----------------------------------------------------------------------
+
+CustomerServiceCategory::CustomerServiceCategory(Unicode::String const & categoryName, int const categoryId, bool const isBugType, bool const isServiceType) :
+m_categoryName(categoryName),
+m_categoryId(categoryId),
+m_subCategories(),
+m_isBugType(isBugType),
+m_isServiceType(isServiceType)
+{
+}
+
+//-----------------------------------------------------------------------
+
+CustomerServiceCategory::~CustomerServiceCategory()
+{
+/*
+	std::vector<CustomerServiceCategory *>::iterator categoriesIterator = 
+		m_subCategories.begin();
+	while (categoriesIterator != m_subCategories.end())
+	{
+		CustomerServiceCategory *category = (*categoriesIterator);
+		delete category;
+		++categoriesIterator;
+	}
+	*/
+	m_subCategories.clear();
+}
+
+//-----------------------------------------------------------------------
+
+void CustomerServiceCategory::addSubCategory(CustomerServiceCategory category)
+{
+	m_subCategories.push_back(category);
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCategory.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCategory.h
new file mode 100644
index 00000000..a2c8e9dc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCategory.h
@@ -0,0 +1,33 @@
+// CustomerServiceCategory.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved.
+
+#ifndef INCLUDED_CustomerServiceCategory_H
+#define INCLUDED_CustomerServiceCategory_H
+
+#include <string>
+#include <vector>
+
+//--------------------------------------------------------
+
+class CustomerServiceCategory
+{
+public:
+
+	CustomerServiceCategory();
+	CustomerServiceCategory(Unicode::String const & categoryName, int const categoryId, bool const isBugType, bool const isServiceType);
+	~CustomerServiceCategory();
+
+	void addSubCategory(CustomerServiceCategory category);
+
+	Unicode::String const & getCategoryName() const { return m_categoryName; }
+	int getCategoryId() const { return m_categoryId; }
+	std::vector<CustomerServiceCategory> const & getSubCategories() const { return m_subCategories; }
+
+	Unicode::String m_categoryName;
+	int m_categoryId;
+	std::vector<CustomerServiceCategory> m_subCategories;
+	bool m_isBugType;
+	bool m_isServiceType;
+};
+
+#endif //INCLUDED_CustomerServiceCategory_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCategoryArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCategoryArchive.cpp
new file mode 100644
index 00000000..3d69835f
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCategoryArchive.cpp
@@ -0,0 +1,55 @@
+//======================================================================
+//
+// CustomerServiceCategoryArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CustomerServiceCategoryArchive.h"
+
+#include "sharedNetworkMessages/CustomerServiceCategory.h"
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, CustomerServiceCategory & target)
+	{
+		get (source, target.m_categoryName);	
+		get (source, target.m_categoryId);	
+		int size = 0;
+		get (source, size);
+
+		target.m_subCategories.clear();
+		for (int i = 0; i < size; ++i)
+		{
+			CustomerServiceCategory category;	
+			get (source, category);
+			target.m_subCategories.push_back(category);
+		}
+		get (source, target.m_isBugType);	
+		get (source, target.m_isServiceType);	
+	}
+
+	void put (ByteStream & target, const CustomerServiceCategory & source)
+	{
+		put (target, source.m_categoryName);
+		put (target, source.m_categoryId);
+
+		int size = source.m_subCategories.size();
+		put (target, size);
+
+		std::vector<CustomerServiceCategory>::const_iterator i = source.m_subCategories.begin();
+		while (i != source.m_subCategories.end())
+		{
+			put (target, (*i));
+			++i;
+		}
+
+		put (target, source.m_isBugType);	
+		put (target, source.m_isServiceType);	
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCategoryArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCategoryArchive.h
new file mode 100644
index 00000000..585c1c37
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCategoryArchive.h
@@ -0,0 +1,27 @@
+//======================================================================
+//
+// CustomerServiceCategoryArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_CustomerServiceCategoryArchive_H
+#define INCLUDED_CustomerServiceCategoryArchive_H
+
+//======================================================================
+
+#include "Archive/ByteStream.h"
+
+class CustomerServiceCategory;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, CustomerServiceCategory & target);
+	void put (ByteStream & target, const CustomerServiceCategory & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceComment.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceComment.cpp
new file mode 100644
index 00000000..850aed4b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceComment.cpp
@@ -0,0 +1,43 @@
+// CustomerServiceComment.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved.
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CustomerServiceComment.h"
+
+//-----------------------------------------------------------------------
+
+CustomerServiceComment::CustomerServiceComment(
+	unsigned int ticketId, 
+	unsigned int commentId, 
+	bool fromCsr, 
+	const Unicode::String &comment, 
+	const std::string &commentorName
+) :
+m_ticketId(ticketId),
+m_commentId(commentId),
+m_fromCsr(fromCsr),
+m_comment(comment),
+m_commentorName(commentorName)
+{
+}
+
+//-----------------------------------------------------------------------
+
+CustomerServiceComment::CustomerServiceComment() :
+m_ticketId(0),
+m_commentId(0),
+m_fromCsr(0),
+m_comment(),
+m_commentorName()
+{
+}
+
+//-----------------------------------------------------------------------
+
+CustomerServiceComment::~CustomerServiceComment()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceComment.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceComment.h
new file mode 100644
index 00000000..c6d99031
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceComment.h
@@ -0,0 +1,36 @@
+// CustomerServiceComment.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved.
+
+#ifndef _INCLUDED_CustomerServiceComment_H
+#define _INCLUDED_CustomerServiceComment_H
+
+#include <string>
+#include <vector>
+
+//--------------------------------------------------------
+
+class CustomerServiceComment
+{
+private:
+
+protected:
+
+public:
+	CustomerServiceComment();
+	CustomerServiceComment(unsigned int ticketId, unsigned int commentId, bool fromR, const Unicode::String &comment, const std::string &commentorName);
+	~CustomerServiceComment();
+
+	int                    getTicketId()       const {return m_ticketId;}
+	int                    getCommentId()      const {return m_commentId;}
+	bool                   isFromCsr()         const {return m_fromCsr;}
+	const Unicode::String &getComment()        const {return m_comment;}
+	const std::string &    getCommentorName()  const {return m_commentorName;}
+
+	unsigned int                          m_ticketId;
+	unsigned int                          m_commentId;
+	bool                                  m_fromCsr;
+	Unicode::String                       m_comment;
+	std::string                           m_commentorName;
+};
+
+#endif //_INCLUDED_CustomerServiceComment_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCommentArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCommentArchive.cpp
new file mode 100644
index 00000000..e52da73c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCommentArchive.cpp
@@ -0,0 +1,36 @@
+//======================================================================
+//
+// CustomerServiceCommentArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CustomerServiceCommentArchive.h"
+
+#include "sharedNetworkMessages/CustomerServiceComment.h"
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, CustomerServiceComment & target)
+	{
+		get (source, target.m_ticketId);	
+		get (source, target.m_commentId);	
+		get (source, target.m_fromCsr);	
+		get (source, target.m_comment);	
+		get (source, target.m_commentorName);	
+	}
+
+	void put (ByteStream & target, const CustomerServiceComment & source)
+	{
+		put (target, source.m_ticketId);
+		put (target, source.m_commentId);
+		put (target, source.m_fromCsr);
+		put (target, source.m_comment);
+		put (target, source.m_commentorName);
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCommentArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCommentArchive.h
new file mode 100644
index 00000000..3fb2aaca
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceCommentArchive.h
@@ -0,0 +1,27 @@
+//======================================================================
+//
+// CustomerServiceCommentArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_CustomerServiceCommentArchive_H
+#define INCLUDED_CustomerServiceCommentArchive_H
+
+//======================================================================
+
+#include "Archive/ByteStream.h"
+
+class CustomerServiceComment;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, CustomerServiceComment & target);
+	void put (ByteStream & target, const CustomerServiceComment & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceSearchResult.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceSearchResult.cpp
new file mode 100644
index 00000000..5d2b0fa2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceSearchResult.cpp
@@ -0,0 +1,37 @@
+// CustomerServiceSearchResult.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved.
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CustomerServiceSearchResult.h"
+
+//-----------------------------------------------------------------------
+
+CustomerServiceSearchResult::CustomerServiceSearchResult(
+	const Unicode::String &title, 
+	const std::string &id, 
+	short matchPercent
+) :
+m_title(title),
+m_id(id),
+m_matchPercent(matchPercent)
+{
+}
+
+//-----------------------------------------------------------------------
+
+CustomerServiceSearchResult::CustomerServiceSearchResult() :
+m_title(),
+m_id(),
+m_matchPercent(0)
+{
+}
+
+//-----------------------------------------------------------------------
+
+CustomerServiceSearchResult::~CustomerServiceSearchResult()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceSearchResult.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceSearchResult.h
new file mode 100644
index 00000000..cc165731
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceSearchResult.h
@@ -0,0 +1,32 @@
+// CustomerServiceSearchResult.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved.
+
+#ifndef _INCLUDED_CustomerServiceSearchResult_H
+#define _INCLUDED_CustomerServiceSearchResult_H
+
+#include <string>
+#include <vector>
+
+//--------------------------------------------------------
+
+class CustomerServiceSearchResult
+{
+private:
+
+protected:
+
+public:
+	CustomerServiceSearchResult();
+	CustomerServiceSearchResult(const Unicode::String &title, const std::string &id, short matchPercent);
+	~CustomerServiceSearchResult();
+
+	const Unicode::String &getTitle()        const {return m_title;}
+	const std::string &    getId()           const {return m_id;}
+	short                  getMatchPercent() const {return m_matchPercent;}
+
+	Unicode::String                       m_title;
+	std::string                           m_id;
+	short                                 m_matchPercent;
+};
+
+#endif //_INCLUDED_CustomerServiceSearchResult_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceSearchResultArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceSearchResultArchive.cpp
new file mode 100644
index 00000000..d3fd4ed6
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceSearchResultArchive.cpp
@@ -0,0 +1,32 @@
+//======================================================================
+//
+// CustomerServiceSearchResultArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CustomerServiceSearchResultArchive.h"
+
+#include "sharedNetworkMessages/CustomerServiceSearchResult.h"
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, CustomerServiceSearchResult & target)
+	{
+		get (source, target.m_title);	
+		get (source, target.m_id);	
+		get (source, target.m_matchPercent);	
+	}
+
+	void put (ByteStream & target, const CustomerServiceSearchResult & source)
+	{
+		put (target, source.m_title);
+		put (target, source.m_id);
+		put (target, source.m_matchPercent);
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceSearchResultArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceSearchResultArchive.h
new file mode 100644
index 00000000..e4dd87ac
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceSearchResultArchive.h
@@ -0,0 +1,27 @@
+//======================================================================
+//
+// CustomerServiceSearchResultArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_CustomerServiceSearchResultArchive_H
+#define INCLUDED_CustomerServiceSearchResultArchive_H
+
+//======================================================================
+
+#include "Archive/ByteStream.h"
+
+class CustomerServiceSearchResult;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, CustomerServiceSearchResult & target);
+	void put (ByteStream & target, const CustomerServiceSearchResult & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceTicket.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceTicket.cpp
new file mode 100644
index 00000000..a311d031
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceTicket.cpp
@@ -0,0 +1,55 @@
+// CustomerServiceTicket.cpp
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved.
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CustomerServiceTicket.h"
+
+//-----------------------------------------------------------------------
+
+CustomerServiceTicket::CustomerServiceTicket(
+	unsigned int categoryId, 
+	unsigned int subCategoryId, 
+	const std::string &characterName, 
+	const Unicode::String &details, 
+	const std::string &language,
+	unsigned int ticketId,
+	int64 modifiedDate,
+	bool read,
+	bool closed
+) :
+m_categoryId(categoryId),
+m_subCategoryId(subCategoryId),
+m_characterName(characterName),
+m_details(details),
+m_language(language),
+m_ticketId(ticketId),
+m_modifiedDate(modifiedDate),
+m_read(read),
+m_closed(closed)
+{
+}
+
+//-----------------------------------------------------------------------
+
+CustomerServiceTicket::CustomerServiceTicket() :
+m_categoryId(0),
+m_subCategoryId(0),
+m_characterName(),
+m_details(),
+m_language(),
+m_ticketId(0),
+m_modifiedDate(0),
+m_read(false),
+m_closed(false)
+{
+}
+
+//-----------------------------------------------------------------------
+
+CustomerServiceTicket::~CustomerServiceTicket()
+{
+}
+
+//-----------------------------------------------------------------------
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceTicket.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceTicket.h
new file mode 100644
index 00000000..0571a131
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceTicket.h
@@ -0,0 +1,44 @@
+// CustomerServiceTicket.h
+// Copyright 2000-02, Sony Online Entertainment Inc., all rights reserved.
+
+#ifndef _INCLUDED_CustomerServiceTicket_H
+#define _INCLUDED_CustomerServiceTicket_H
+
+#include <string>
+#include <vector>
+
+//--------------------------------------------------------
+
+class CustomerServiceTicket
+{
+private:
+
+protected:
+
+public:
+	CustomerServiceTicket();
+	CustomerServiceTicket(unsigned int categoryId, unsigned int subCategoryId, const std::string &characterName, const Unicode::String &details, const std::string &language, unsigned int ticketId, int64 modifiedDate, bool read, bool closed);
+	~CustomerServiceTicket();
+
+	int                    getCategoryId()      const {return m_categoryId;}
+	int                    getSubCategoryId()   const {return m_subCategoryId;}
+	const std::string &    getCharacterName()   const {return m_characterName;}
+	const Unicode::String &getDetails()         const {return m_details;}
+	const std::string &    getLanguage()        const {return m_language;}
+	unsigned int           getTicketId()        const {return m_ticketId;}
+	int64                  getModifiedDate()    const {return m_modifiedDate;}
+	bool                   isRead() const { return m_read; }
+	bool                   isClosed() const { return m_closed; }
+
+	unsigned int    m_categoryId;
+	unsigned int    m_subCategoryId;
+	std::string     m_characterName;
+	Unicode::String m_details;
+	std::string     m_language;
+	unsigned int    m_ticketId;
+	int64           m_modifiedDate;
+	bool            m_read;
+	bool            m_closed;
+};
+
+#endif //_INCLUDED_CustomerServiceTicket_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceTicketArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceTicketArchive.cpp
new file mode 100644
index 00000000..933e0d64
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceTicketArchive.cpp
@@ -0,0 +1,44 @@
+//======================================================================
+//
+// CustomerServiceTicketArchive.cpp
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/CustomerServiceTicketArchive.h"
+
+#include "sharedNetworkMessages/CustomerServiceTicket.h"
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, CustomerServiceTicket & target)
+	{
+		get (source, target.m_categoryId);	
+		get (source, target.m_subCategoryId);	
+		get (source, target.m_characterName);	
+		get (source, target.m_details);	
+		get (source, target.m_language);	
+		get (source, target.m_ticketId);	
+		get (source, target.m_modifiedDate);	
+		get (source, target.m_read);	
+		get (source, target.m_closed);	
+	}
+
+	void put (ByteStream & target, const CustomerServiceTicket & source)
+	{
+		put (target, source.m_categoryId);
+		put (target, source.m_subCategoryId);
+		put (target, source.m_characterName);
+		put (target, source.m_details);
+		put (target, source.m_language);
+		put (target, source.m_ticketId);
+		put (target, source.m_modifiedDate);
+		put (target, source.m_read);
+		put (target, source.m_closed);
+	}
+}
+
+//======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceTicketArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceTicketArchive.h
new file mode 100644
index 00000000..70138d38
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/CustomerServiceTicketArchive.h
@@ -0,0 +1,27 @@
+//======================================================================
+//
+// CustomerServiceTicketArchive.h
+// copyright (c) 2002 Sony Online Entertainment
+//
+//======================================================================
+
+#ifndef INCLUDED_CustomerServiceTicketArchive_H
+#define INCLUDED_CustomerServiceTicketArchive_H
+
+//======================================================================
+
+#include "Archive/ByteStream.h"
+
+class CustomerServiceTicket;
+
+//----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, CustomerServiceTicket & target);
+	void put (ByteStream & target, const CustomerServiceTicket & source);
+}
+
+//======================================================================
+
+#endif
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerMessage.cpp
new file mode 100644
index 00000000..541d3207
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerMessage.cpp
@@ -0,0 +1,31 @@
+// ======================================================================
+//
+// DisconnectPlayerMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/DisconnectPlayerMessage.h"
+
+// ======================================================================
+
+DisconnectPlayerMessage::DisconnectPlayerMessage() :
+	GameNetworkMessage("DisconnectPlayerMessage")
+{
+}
+
+// ======================================================================
+
+DisconnectPlayerMessage::DisconnectPlayerMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("DisconnectPlayerMessage")
+{
+	unpack(source);
+}
+
+// ======================================================================
+
+DisconnectPlayerMessage::~DisconnectPlayerMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerMessage.h
new file mode 100644
index 00000000..63e10353
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerMessage.h
@@ -0,0 +1,38 @@
+// ======================================================================
+//
+// DisconnectPlayerMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_DisconnectPlayerMessage_H
+#define	_DisconnectPlayerMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+//-----------------------------------------------------------------------
+
+class DisconnectPlayerMessage : public GameNetworkMessage
+{
+public:
+
+	DisconnectPlayerMessage();
+	explicit DisconnectPlayerMessage(Archive::ReadIterator &source);
+
+	~DisconnectPlayerMessage();
+
+public: 
+
+private: 
+};
+
+// ----------------------------------------------------------------------
+
+#endif // _DisconnectPlayerMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerResponseMessage.cpp
new file mode 100644
index 00000000..566f6072
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerResponseMessage.cpp
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// DisconnectPlayerResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/DisconnectPlayerResponseMessage.h"
+
+// ======================================================================
+
+DisconnectPlayerResponseMessage::DisconnectPlayerResponseMessage(int32 result) :
+	GameNetworkMessage("DisconnectPlayerResponseMessage"),
+	m_result(result)
+{
+	AutoByteStream::addVariable(m_result);
+}
+
+// ======================================================================
+
+DisconnectPlayerResponseMessage::DisconnectPlayerResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("DisconnectPlayerResponseMessage"),
+	m_result()
+{
+	AutoByteStream::addVariable(m_result);
+	unpack(source);
+}
+
+// ======================================================================
+
+DisconnectPlayerResponseMessage::~DisconnectPlayerResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerResponseMessage.h
new file mode 100644
index 00000000..7416ec40
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/DisconnectPlayerResponseMessage.h
@@ -0,0 +1,49 @@
+// ======================================================================
+//
+// DisconnectPlayerResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_DisconnectPlayerResponseMessage_H
+#define	_DisconnectPlayerResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class DisconnectPlayerResponseMessage : public GameNetworkMessage
+{
+public:
+	DisconnectPlayerResponseMessage(int32 result);
+	explicit DisconnectPlayerResponseMessage(Archive::ReadIterator &source);
+
+	~DisconnectPlayerResponseMessage();
+
+public: // methods
+
+	int32                            getResult() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<int32>   m_result;  
+};
+
+// ----------------------------------------------------------------------
+
+inline int32 DisconnectPlayerResponseMessage::getResult() const
+{
+	return m_result.get();
+}
+
+
+// ----------------------------------------------------------------------
+
+#endif // _DisconnectPlayerResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleMessage.cpp
new file mode 100644
index 00000000..2ec16787
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleMessage.cpp
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// GetArticleMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GetArticleMessage.h"
+
+// ======================================================================
+
+GetArticleMessage::GetArticleMessage(
+	const std::string &id,
+	const std::string &language
+) :
+GameNetworkMessage("GetArticleMessage"),
+m_id(id),
+m_language(language)
+{
+	addVariable(m_id);
+	addVariable(m_language);
+}
+
+// ======================================================================
+
+GetArticleMessage::GetArticleMessage(Archive::ReadIterator &source) :
+GameNetworkMessage("GetArticleMessage"),
+m_id(),
+m_language()
+{
+	addVariable(m_id);
+	addVariable(m_language);
+	unpack(source);
+}
+
+// ======================================================================
+
+GetArticleMessage::~GetArticleMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleMessage.h
new file mode 100644
index 00000000..163f1877
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleMessage.h
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// GetArticleMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_GetArticleMessage_H
+#define	_GetArticleMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class GetArticleMessage : public GameNetworkMessage
+{
+public:
+
+	GetArticleMessage(const std::string &id, const std::string &language);
+	explicit GetArticleMessage(Archive::ReadIterator &source);
+
+	~GetArticleMessage();
+
+public: 
+
+	const std::string     &                 getId()           const;
+	const std::string     &                 getLanguage()     const;
+
+private: 
+	Archive::AutoVariable<std::string>        m_id;  
+	Archive::AutoVariable<std::string>        m_language;  
+};
+
+// ----------------------------------------------------------------------
+
+inline const std::string & GetArticleMessage::getId() const
+{
+	return m_id.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string & GetArticleMessage::getLanguage() const
+{
+	return m_language.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _GetArticleMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleResponseMessage.cpp
new file mode 100644
index 00000000..b420fe8b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleResponseMessage.cpp
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// GetArticleResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GetArticleResponseMessage.h"
+
+// ======================================================================
+
+GetArticleResponseMessage::GetArticleResponseMessage(
+	int32 result, 
+	const Unicode::String &article
+) :
+	GameNetworkMessage("GetArticleResponseMessage"),
+	m_result(result),
+	m_article(article)
+{
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_article);
+}
+
+// ======================================================================
+
+GetArticleResponseMessage::GetArticleResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("GetArticleResponseMessage"),
+	m_result(0),
+	m_article()
+{
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_article);
+	unpack(source);
+}
+
+// ======================================================================
+
+GetArticleResponseMessage::~GetArticleResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleResponseMessage.h
new file mode 100644
index 00000000..5cd39451
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetArticleResponseMessage.h
@@ -0,0 +1,58 @@
+// ======================================================================
+//
+// GetArticleResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_GetArticleResponseMessage_H
+#define	_GetArticleResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "unicodeArchive/UnicodeArchive.h"
+
+//-----------------------------------------------------------------------
+
+class GetArticleResponseMessage : public GameNetworkMessage
+{
+public:
+	GetArticleResponseMessage(int32 result, const Unicode::String &article);
+	explicit GetArticleResponseMessage(Archive::ReadIterator &source);
+
+	~GetArticleResponseMessage();
+
+public: // methods
+
+	int32                            getResult() const;
+	const Unicode::String &          getArticle() const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<int32>           m_result;  
+	Archive::AutoVariable<Unicode::String> m_article;  
+};
+
+// ----------------------------------------------------------------------
+
+inline int32 GetArticleResponseMessage::getResult() const
+{
+	return m_result.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & GetArticleResponseMessage::getArticle() const
+{
+	return m_article.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _GetArticleResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsMessage.cpp
new file mode 100644
index 00000000..183eb96e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsMessage.cpp
@@ -0,0 +1,37 @@
+// ======================================================================
+//
+// GetCommentsMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GetCommentsMessage.h"
+
+// ======================================================================
+
+GetCommentsMessage::GetCommentsMessage(
+	unsigned int ticketId 
+) :
+GameNetworkMessage("GetCommentsMessage"),
+m_ticketId(ticketId)
+{
+	addVariable(m_ticketId);
+}
+
+// ======================================================================
+
+GetCommentsMessage::GetCommentsMessage(Archive::ReadIterator &source) :
+GameNetworkMessage("GetCommentsMessage"),
+m_ticketId(0)
+{
+	addVariable(m_ticketId);
+	unpack(source);
+}
+
+// ======================================================================
+
+GetCommentsMessage::~GetCommentsMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsMessage.h
new file mode 100644
index 00000000..205be3a7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsMessage.h
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// GetCommentsMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_GetCommentsMessage_H
+#define	_GetCommentsMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class GetCommentsMessage : public GameNetworkMessage
+{
+public:
+
+	GetCommentsMessage(unsigned int ticketId);
+	explicit GetCommentsMessage(Archive::ReadIterator &source);
+
+	~GetCommentsMessage();
+
+public: 
+
+	unsigned int                          getTicketId() const;
+
+private: 
+	Archive::AutoVariable<unsigned int>    m_ticketId;  
+};
+
+// ----------------------------------------------------------------------
+
+inline unsigned int GetCommentsMessage::getTicketId() const
+{
+	return m_ticketId.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _GetCommentsMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsResponseMessage.cpp
new file mode 100644
index 00000000..5d172660
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsResponseMessage.cpp
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// GetCommentsResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GetCommentsResponseMessage.h"
+
+// ======================================================================
+
+GetCommentsResponseMessage::GetCommentsResponseMessage(
+	int32 result, 
+	const std::vector<CustomerServiceComment> &comments
+) :
+	GameNetworkMessage("GetCommentsResponseMessage"),
+	m_result(result),
+	m_comments()
+{
+	m_comments.set(comments);
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_comments);
+}
+
+// ======================================================================
+
+GetCommentsResponseMessage::GetCommentsResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("GetCommentsResponseMessage"),
+	m_result(0),
+	m_comments()
+{
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_comments);
+	unpack(source);
+}
+
+// ======================================================================
+
+GetCommentsResponseMessage::~GetCommentsResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsResponseMessage.h
new file mode 100644
index 00000000..28828651
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetCommentsResponseMessage.h
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// GetCommentsResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_GetCommentsResponseMessage_H
+#define	_GetCommentsResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/CustomerServiceComment.h"
+#include "sharedNetworkMessages/CustomerServiceCommentArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class GetCommentsResponseMessage : public GameNetworkMessage
+{
+public:
+	GetCommentsResponseMessage(int32 result, const std::vector<CustomerServiceComment> &comments );
+	explicit GetCommentsResponseMessage(Archive::ReadIterator &source);
+
+	~GetCommentsResponseMessage();
+
+public: // methods
+
+	int32                            getResult()           const;
+	const std::vector<CustomerServiceComment> &   getComments()         const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<int32>          m_result;  
+	Archive::AutoArray<CustomerServiceComment>         m_comments;   
+};
+
+// ----------------------------------------------------------------------
+
+inline const std::vector<CustomerServiceComment> & GetCommentsResponseMessage::getComments() const
+{
+	return m_comments.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 GetCommentsResponseMessage::getResult() const
+{
+	return m_result.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _GetCommentsResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsMessage.cpp
new file mode 100644
index 00000000..1ce806e2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsMessage.cpp
@@ -0,0 +1,46 @@
+// ======================================================================
+//
+// GetTicketsMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GetTicketsMessage.h"
+
+// ======================================================================
+
+GetTicketsMessage::GetTicketsMessage(
+	unsigned int start, 
+	unsigned int count 
+) :
+GameNetworkMessage("GetTicketsMessage"),
+m_start(start),
+m_count(count),
+m_stationId(0)
+{
+	addVariable(m_start);
+	addVariable(m_count);
+	addVariable(m_stationId);
+}
+
+// ======================================================================
+
+GetTicketsMessage::GetTicketsMessage(Archive::ReadIterator &source) :
+GameNetworkMessage("GetTicketsMessage"),
+m_start(0),
+m_count(0),
+m_stationId(0)
+{
+	addVariable(m_start);
+	addVariable(m_count);
+	addVariable(m_stationId);
+	unpack(source);
+}
+
+// ======================================================================
+
+GetTicketsMessage::~GetTicketsMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsMessage.h
new file mode 100644
index 00000000..5c2740ee
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsMessage.h
@@ -0,0 +1,76 @@
+// ======================================================================
+//
+// GetTicketsMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_GetTicketsMessage_H
+#define	_GetTicketsMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class GetTicketsMessage : public GameNetworkMessage
+{
+public:
+
+	GetTicketsMessage(unsigned int start, unsigned int count);
+	explicit GetTicketsMessage(Archive::ReadIterator &source);
+
+	~GetTicketsMessage();
+
+public: 
+
+	unsigned int                          getStart() const;
+	unsigned int                          getCount() const;
+	unsigned int                          getStationId() const;
+	void                                  setStationId(unsigned int id);
+
+private: 
+	Archive::AutoVariable<unsigned int>    m_start;  
+	Archive::AutoVariable<unsigned int>    m_count;  
+	Archive::AutoVariable<unsigned int>    m_stationId;  
+};
+
+// ----------------------------------------------------------------------
+
+inline unsigned int GetTicketsMessage::getStart() const
+{
+	return m_start.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int GetTicketsMessage::getCount() const
+{
+	return m_count.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int GetTicketsMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void GetTicketsMessage::setStationId(unsigned int id)
+{
+	m_stationId.set(id);
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _GetTicketsMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsResponseMessage.cpp
new file mode 100644
index 00000000..68f17859
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsResponseMessage.cpp
@@ -0,0 +1,48 @@
+// ======================================================================
+//
+// GetTicketsResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GetTicketsResponseMessage.h"
+
+// ======================================================================
+
+GetTicketsResponseMessage::GetTicketsResponseMessage(
+	int32 result, 
+	unsigned int totalNumTickets,
+	const std::vector<CustomerServiceTicket> &tickets
+) :
+	GameNetworkMessage("GetTicketsResponseMessage"),
+	m_result(result),
+	m_totalNumTickets(totalNumTickets),
+	m_tickets()
+{
+	m_tickets.set(tickets);
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_totalNumTickets);
+	AutoByteStream::addVariable(m_tickets);
+}
+
+// ======================================================================
+
+GetTicketsResponseMessage::GetTicketsResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("GetTicketsResponseMessage"),
+	m_result(0),
+	m_totalNumTickets(0),
+	m_tickets()
+{
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_totalNumTickets);
+	AutoByteStream::addVariable(m_tickets);
+	unpack(source);
+}
+
+// ======================================================================
+
+GetTicketsResponseMessage::~GetTicketsResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsResponseMessage.h
new file mode 100644
index 00000000..ec8de2b9
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/GetTicketsResponseMessage.h
@@ -0,0 +1,68 @@
+// ======================================================================
+//
+// GetTicketsResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_GetTicketsResponseMessage_H
+#define	_GetTicketsResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/CustomerServiceTicket.h"
+#include "sharedNetworkMessages/CustomerServiceTicketArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class GetTicketsResponseMessage : public GameNetworkMessage
+{
+public:
+	GetTicketsResponseMessage(int32 result, unsigned int totalTickets, const std::vector<CustomerServiceTicket> &tickets );
+	explicit GetTicketsResponseMessage(Archive::ReadIterator &source);
+
+	~GetTicketsResponseMessage();
+
+public: // methods
+
+	int32                            getResult()          const;
+	unsigned int                     getTotalNumTickets() const;
+	const std::vector<CustomerServiceTicket> &    getTickets()         const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<int32>          m_result;  
+	Archive::AutoVariable<unsigned int>   m_totalNumTickets;  
+	Archive::AutoArray<CustomerServiceTicket>          m_tickets;   
+};
+
+// ----------------------------------------------------------------------
+
+inline const std::vector<CustomerServiceTicket> & GetTicketsResponseMessage::getTickets() const
+{
+	return m_tickets.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 GetTicketsResponseMessage::getResult() const
+{
+	return m_result.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int GetTicketsResponseMessage::getTotalNumTickets() const
+{
+	return m_totalNumTickets.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _GetTicketsResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/NewTicketActivityMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/NewTicketActivityMessage.cpp
new file mode 100644
index 00000000..09e67be3
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/NewTicketActivityMessage.cpp
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// NewTicketActivityMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/NewTicketActivityMessage.h"
+
+// ======================================================================
+
+NewTicketActivityMessage::NewTicketActivityMessage()
+ : GameNetworkMessage("NewTicketActivityMessage")
+ , m_stationId(0)
+{
+	addVariable(m_stationId);
+}
+
+// ======================================================================
+
+NewTicketActivityMessage::NewTicketActivityMessage(Archive::ReadIterator &source)
+ : GameNetworkMessage("NewTicketActivityMessage")
+ , m_stationId(0)
+{
+	addVariable(m_stationId);
+	unpack(source);
+}
+
+// ======================================================================
+
+NewTicketActivityMessage::~NewTicketActivityMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/NewTicketActivityMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/NewTicketActivityMessage.h
new file mode 100644
index 00000000..d73c6607
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/NewTicketActivityMessage.h
@@ -0,0 +1,53 @@
+// ======================================================================
+//
+// NewTicketActivityMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_NewTicketActivityMessage_H
+#define	INCLUDED_NewTicketActivityMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class NewTicketActivityMessage : public GameNetworkMessage
+{
+public:
+
+	NewTicketActivityMessage();
+	explicit NewTicketActivityMessage(Archive::ReadIterator &source);
+
+	~NewTicketActivityMessage();
+
+	void         setStationId(unsigned int id);
+	unsigned int getStationId() const;
+
+private:
+
+	Archive::AutoVariable<unsigned int> m_stationId;  
+
+};
+
+// ----------------------------------------------------------------------
+
+inline unsigned int NewTicketActivityMessage::getStationId() const
+{
+	return m_stationId.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline void NewTicketActivityMessage::setStationId(unsigned int id)
+{
+	m_stationId.set(id);
+}
+
+// ----------------------------------------------------------------------
+
+#endif // INCLUDED_NewTicketActivityMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/NewTicketActivityResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/NewTicketActivityResponseMessage.cpp
new file mode 100644
index 00000000..c2ce0f55
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/NewTicketActivityResponseMessage.cpp
@@ -0,0 +1,39 @@
+// ======================================================================
+//
+// NewTicketActivityResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/NewTicketActivityResponseMessage.h"
+
+// ======================================================================
+
+NewTicketActivityResponseMessage::NewTicketActivityResponseMessage(bool const newActivity, unsigned int const ticketCount)
+ : GameNetworkMessage("NewTicketActivityResponseMessage")
+ , m_newActivity(newActivity)
+ , m_ticketCount(ticketCount)
+{
+	AutoByteStream::addVariable(m_newActivity);
+	AutoByteStream::addVariable(m_ticketCount);
+}
+
+// ======================================================================
+
+NewTicketActivityResponseMessage::NewTicketActivityResponseMessage(Archive::ReadIterator &source)
+ : GameNetworkMessage("NewTicketActivityResponseMessage")
+ , m_newActivity(false)
+ , m_ticketCount(0)
+{
+	AutoByteStream::addVariable(m_newActivity);
+	AutoByteStream::addVariable(m_ticketCount);
+	unpack(source);
+}
+
+// ======================================================================
+
+NewTicketActivityResponseMessage::~NewTicketActivityResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/NewTicketActivityResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/NewTicketActivityResponseMessage.h
new file mode 100644
index 00000000..829b78f0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/NewTicketActivityResponseMessage.h
@@ -0,0 +1,52 @@
+// ======================================================================
+//
+// NewTicketActivityResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_NewTicketActivityResponseMessage_H
+#define	INCLUDED_NewTicketActivityResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class NewTicketActivityResponseMessage : public GameNetworkMessage
+{
+public:
+
+	explicit NewTicketActivityResponseMessage(bool const newActivity, unsigned int const ticketCount);
+	explicit NewTicketActivityResponseMessage(Archive::ReadIterator &source);
+
+	~NewTicketActivityResponseMessage();
+
+	bool         isNewActivity() const;
+	unsigned int getTicketCount() const;
+
+private:
+
+	Archive::AutoVariable<bool>         m_newActivity;  
+	Archive::AutoVariable<unsigned int> m_ticketCount;  
+};
+
+// ----------------------------------------------------------------------
+
+inline bool NewTicketActivityResponseMessage::isNewActivity() const
+{
+	return m_newActivity.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline unsigned int NewTicketActivityResponseMessage::getTicketCount() const
+{
+	return m_ticketCount.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // INCLUDED_NewTicketActivityResponseMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/RequestCategoriesMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/RequestCategoriesMessage.cpp
new file mode 100644
index 00000000..252c4f68
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/RequestCategoriesMessage.cpp
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// RequestCategoriesMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/RequestCategoriesMessage.h"
+
+// ----------------------------------------------------------------------
+RequestCategoriesMessage::RequestCategoriesMessage(std::string const & language)
+ : GameNetworkMessage("RequestCategoriesMessage")
+ , m_language(language)
+{
+	AutoByteStream::addVariable(m_language);
+}
+
+// ----------------------------------------------------------------------
+RequestCategoriesMessage::RequestCategoriesMessage(Archive::ReadIterator & source)
+ : GameNetworkMessage("RequestCategoriesMessage")
+ , m_language()
+{
+	AutoByteStream::addVariable(m_language);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+RequestCategoriesMessage::~RequestCategoriesMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+std::string RequestCategoriesMessage::getLanguage() const
+{
+	return m_language.get();
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/RequestCategoriesMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/RequestCategoriesMessage.h
new file mode 100644
index 00000000..54c40b93
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/RequestCategoriesMessage.h
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// RequestCategoriesMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDED_RequestCategoriesMessage_H
+#define	INCLUDED_RequestCategoriesMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class RequestCategoriesMessage : public GameNetworkMessage
+{
+public:
+
+	RequestCategoriesMessage(std::string const & language);
+	explicit RequestCategoriesMessage(Archive::ReadIterator & source);
+	~RequestCategoriesMessage();
+
+	std::string getLanguage() const;
+
+private: 
+
+	Archive::AutoVariable<std::string> m_language;
+};
+
+// ----------------------------------------------------------------------
+
+#endif // INCLUDED_RequestCategoriesMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/RequestCategoriesResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/RequestCategoriesResponseMessage.cpp
new file mode 100644
index 00000000..3a1c258e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/RequestCategoriesResponseMessage.cpp
@@ -0,0 +1,50 @@
+// ======================================================================
+//
+// RequestCategoriesResponseMessage.cpp
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/RequestCategoriesResponseMessage.h"
+
+// ----------------------------------------------------------------------
+RequestCategoriesResponseMessage::RequestCategoriesResponseMessage(int32 const result, std::vector<CustomerServiceCategory> const & categories)
+ : GameNetworkMessage("RequestCategoriesResponseMessage")
+ , m_result(result)
+ , m_categories()
+{
+	m_categories.set(categories);
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_categories);
+}
+
+// ----------------------------------------------------------------------
+RequestCategoriesResponseMessage::RequestCategoriesResponseMessage(Archive::ReadIterator & source)
+ : GameNetworkMessage("RequestCategoriesResponseMessage")
+ , m_result()
+ , m_categories()
+{
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_categories);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+RequestCategoriesResponseMessage::~RequestCategoriesResponseMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+int32 RequestCategoriesResponseMessage::getResult() const
+{
+	return m_result.get();
+}
+
+// ----------------------------------------------------------------------
+std::vector<CustomerServiceCategory> const & RequestCategoriesResponseMessage::getCategories() const
+{
+	return m_categories.get();
+}
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/RequestCategoriesResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/RequestCategoriesResponseMessage.h
new file mode 100644
index 00000000..e57a4602
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/RequestCategoriesResponseMessage.h
@@ -0,0 +1,35 @@
+// ======================================================================
+//
+// RequestCategoriesResponseMessage.h
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	INCLUDE_RequestCategoriesResponseMessage_H
+#define	INCLUDE_RequestCategoriesResponseMessage_H
+
+#include "sharedNetworkMessages/CustomerServiceCategory.h"
+#include "sharedNetworkMessages/CustomerServiceCategoryArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+class RequestCategoriesResponseMessage : public GameNetworkMessage
+{
+public:
+
+	RequestCategoriesResponseMessage(int32 const result, std::vector<CustomerServiceCategory> const & categories);
+	explicit RequestCategoriesResponseMessage(Archive::ReadIterator & source);
+	~RequestCategoriesResponseMessage();
+
+	int32 getResult() const;
+	std::vector<CustomerServiceCategory> const & getCategories() const;
+
+private: 
+
+	Archive::AutoVariable<int32> m_result;
+	Archive::AutoArray<CustomerServiceCategory> m_categories;
+};
+
+// ======================================================================
+
+#endif // INCLUDE_RequestCategoriesResponseMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseMessage.cpp
new file mode 100644
index 00000000..fd21246e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseMessage.cpp
@@ -0,0 +1,42 @@
+// ======================================================================
+//
+// SearchKnowledgeBaseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/SearchKnowledgeBaseMessage.h"
+
+// ======================================================================
+
+SearchKnowledgeBaseMessage::SearchKnowledgeBaseMessage(
+	const Unicode::String &searchString,
+	const std::string &language
+) :
+GameNetworkMessage("SearchKnowledgeBaseMessage"),
+m_searchString(searchString),
+m_language(language)
+{
+	addVariable(m_searchString);
+	addVariable(m_language);
+}
+
+// ======================================================================
+
+SearchKnowledgeBaseMessage::SearchKnowledgeBaseMessage(Archive::ReadIterator &source) :
+GameNetworkMessage("SearchKnowledgeBaseMessage"),
+m_searchString(),
+m_language()
+{
+	addVariable(m_searchString);
+	addVariable(m_language);
+	unpack(source);
+}
+
+// ======================================================================
+
+SearchKnowledgeBaseMessage::~SearchKnowledgeBaseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseMessage.h
new file mode 100644
index 00000000..3d41b2af
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseMessage.h
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// SearchKnowledgeBaseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_SearchKnowledgeBaseMessage_H
+#define	_SearchKnowledgeBaseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/Tag.h"
+
+#include <string>
+
+//-----------------------------------------------------------------------
+
+class SearchKnowledgeBaseMessage : public GameNetworkMessage
+{
+public:
+
+	SearchKnowledgeBaseMessage(const Unicode::String &searchString, const std::string &language);
+	explicit SearchKnowledgeBaseMessage(Archive::ReadIterator &source);
+
+	~SearchKnowledgeBaseMessage();
+
+public: 
+
+	const Unicode::String &                 getSearchString() const;
+	const std::string     &                 getLanguage()     const;
+
+private: 
+	Archive::AutoVariable<Unicode::String>    m_searchString;  
+	Archive::AutoVariable<std::string>        m_language;  
+};
+
+// ----------------------------------------------------------------------
+
+inline const Unicode::String & SearchKnowledgeBaseMessage::getSearchString() const
+{
+	return m_searchString.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline const std::string & SearchKnowledgeBaseMessage::getLanguage() const
+{
+	return m_language.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _SearchKnowledgeBaseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseResponseMessage.cpp
new file mode 100644
index 00000000..41131e01
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseResponseMessage.cpp
@@ -0,0 +1,43 @@
+// ======================================================================
+//
+// SearchKnowledgeBaseResponseMessage.cpp
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/SearchKnowledgeBaseResponseMessage.h"
+
+// ======================================================================
+
+SearchKnowledgeBaseResponseMessage::SearchKnowledgeBaseResponseMessage(
+	int32 result, 
+	const std::vector<CustomerServiceSearchResult> &searchResults
+) :
+	GameNetworkMessage("SearchKnowledgeBaseResponseMessage"),
+	m_result(result),
+	m_searchResults()
+{
+	m_searchResults.set(searchResults);
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_searchResults);
+}
+
+// ======================================================================
+
+SearchKnowledgeBaseResponseMessage::SearchKnowledgeBaseResponseMessage(Archive::ReadIterator &source) :
+	GameNetworkMessage("SearchKnowledgeBaseResponseMessage"),
+	m_result(0),
+	m_searchResults()
+{
+	AutoByteStream::addVariable(m_result);
+	AutoByteStream::addVariable(m_searchResults);
+	unpack(source);
+}
+
+// ======================================================================
+
+SearchKnowledgeBaseResponseMessage::~SearchKnowledgeBaseResponseMessage()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseResponseMessage.h
new file mode 100644
index 00000000..49a2133c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/SearchKnowledgeBaseResponseMessage.h
@@ -0,0 +1,59 @@
+// ======================================================================
+//
+// SearchKnowledgeBaseResponseMessage.h
+//
+// Copyright 2002 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef	_SearchKnowledgeBaseResponseMessage_H
+#define	_SearchKnowledgeBaseResponseMessage_H
+
+//-----------------------------------------------------------------------
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/CustomerServiceSearchResult.h"
+#include "sharedNetworkMessages/CustomerServiceSearchResultArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+
+class SearchKnowledgeBaseResponseMessage : public GameNetworkMessage
+{
+public:
+	SearchKnowledgeBaseResponseMessage(int32 result, const std::vector<CustomerServiceSearchResult> &searchResults );
+	explicit SearchKnowledgeBaseResponseMessage(Archive::ReadIterator &source);
+
+	~SearchKnowledgeBaseResponseMessage();
+
+public: // methods
+
+	int32                                 getResult()           const;
+	const std::vector<CustomerServiceSearchResult> &   getSearchResults()         const;
+
+public: // types
+
+private: 
+	Archive::AutoVariable<int32>          m_result;  
+	Archive::AutoArray<CustomerServiceSearchResult>    m_searchResults;   
+};
+
+// ----------------------------------------------------------------------
+
+inline const std::vector<CustomerServiceSearchResult> & SearchKnowledgeBaseResponseMessage::getSearchResults() const
+{
+	return m_searchResults.get();
+}
+
+// ----------------------------------------------------------------------
+
+inline int32 SearchKnowledgeBaseResponseMessage::getResult() const
+{
+	return m_result.get();
+}
+
+// ----------------------------------------------------------------------
+
+#endif // _SearchKnowledgeBaseResponseMessage_H
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/VerifyPlayerNameMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/VerifyPlayerNameMessage.cpp
new file mode 100644
index 00000000..a11efafc
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/VerifyPlayerNameMessage.cpp
@@ -0,0 +1,56 @@
+// ============================================================================
+//
+// VerifyPlayerNameMessage.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ============================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/VerifyPlayerNameMessage.h"
+
+// ============================================================================
+//
+// VerifyPlayerNameMessage
+//
+// ============================================================================
+
+//-----------------------------------------------------------------------
+VerifyPlayerNameMessage::VerifyPlayerNameMessage(const Unicode::String &playerName, const NetworkId &sourceNetworkId)
+ : GameNetworkMessage("VerifyPlayerNameMessage")
+ , m_playerName(playerName)
+ , m_sourceNetworkId(sourceNetworkId)
+{
+	addVariable(m_playerName);
+	addVariable(m_sourceNetworkId);
+}
+
+//-----------------------------------------------------------------------
+VerifyPlayerNameMessage::VerifyPlayerNameMessage(Archive::ReadIterator &source)
+ : GameNetworkMessage("VerifyPlayerNameMessage")
+ , m_playerName()
+ , m_sourceNetworkId()
+{
+	addVariable(m_playerName);
+	addVariable(m_sourceNetworkId);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+VerifyPlayerNameMessage::~VerifyPlayerNameMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+const Unicode::String &VerifyPlayerNameMessage::getPlayerName() const
+{
+	return m_playerName.get();
+}
+
+//-----------------------------------------------------------------------
+const NetworkId &VerifyPlayerNameMessage::getSourceNetworkId() const
+{
+	return m_sourceNetworkId.get();
+}
+
+// ============================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/VerifyPlayerNameMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/VerifyPlayerNameMessage.h
new file mode 100644
index 00000000..3abb74d8
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/VerifyPlayerNameMessage.h
@@ -0,0 +1,36 @@
+// ============================================================================
+//
+// VerifyPlayerNameMessage.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ============================================================================
+
+#ifndef	INCLUDED_VerifyPlayerNameMessage_H
+#define	INCLUDED_VerifyPlayerNameMessage_H
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+class VerifyPlayerNameMessage : public GameNetworkMessage
+{
+public:
+
+	VerifyPlayerNameMessage(const Unicode::String &characterName, const NetworkId &sourceNetworkId);
+	explicit VerifyPlayerNameMessage(Archive::ReadIterator &source);
+
+	~VerifyPlayerNameMessage();
+
+	const Unicode::String &getPlayerName() const;
+	const NetworkId &      getSourceNetworkId() const;
+
+private: 
+
+	Archive::AutoVariable<Unicode::String> m_playerName;
+	Archive::AutoVariable<NetworkId>       m_sourceNetworkId;
+};
+
+// ============================================================================
+
+#endif // INCLUDED_VerifyPlayerNameMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/VerifyPlayerNameResponseMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/VerifyPlayerNameResponseMessage.cpp
new file mode 100644
index 00000000..adcd46cf
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/VerifyPlayerNameResponseMessage.cpp
@@ -0,0 +1,56 @@
+// ============================================================================
+//
+// VerifyPlayerNameResponseMessage.cpp
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ============================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/VerifyPlayerNameResponseMessage.h"
+
+// ============================================================================
+//
+// VerifyPlayerNameResponseMessage
+//
+// ============================================================================
+
+//-----------------------------------------------------------------------
+VerifyPlayerNameResponseMessage::VerifyPlayerNameResponseMessage(bool const valid, Unicode::String const &playerName)
+ : GameNetworkMessage("VerifyPlayerNameResponseMessage")
+ , m_valid(valid)
+ , m_playerName(playerName)
+{
+	addVariable(m_valid);
+	addVariable(m_playerName);
+}
+
+//-----------------------------------------------------------------------
+VerifyPlayerNameResponseMessage::VerifyPlayerNameResponseMessage(Archive::ReadIterator &source)
+ : GameNetworkMessage("VerifyPlayerNameResponseMessage")
+ , m_valid(false)
+ , m_playerName()
+{
+	addVariable(m_valid);
+	addVariable(m_playerName);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+VerifyPlayerNameResponseMessage::~VerifyPlayerNameResponseMessage()
+{
+}
+
+//-----------------------------------------------------------------------
+Unicode::String const &VerifyPlayerNameResponseMessage::getPlayerName() const
+{
+	return m_playerName.get();
+}
+
+//-----------------------------------------------------------------------
+bool VerifyPlayerNameResponseMessage::isValid() const
+{
+	return m_valid.get();
+}
+
+// ============================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/customerService/VerifyPlayerNameResponseMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/VerifyPlayerNameResponseMessage.h
new file mode 100644
index 00000000..b975ab58
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/customerService/VerifyPlayerNameResponseMessage.h
@@ -0,0 +1,36 @@
+// ============================================================================
+//
+// VerifyPlayerNameResponseMessage.h
+//
+// Copyright 2004 Sony Online Entertainment
+//
+// ============================================================================
+
+#ifndef	INCLUDED_VerifyPlayerNameResponseMessage_H
+#define	INCLUDED_VerifyPlayerNameResponseMessage_H
+
+#include "Archive/AutoDeltaByteStream.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+//-----------------------------------------------------------------------
+class VerifyPlayerNameResponseMessage : public GameNetworkMessage
+{
+public:
+
+	VerifyPlayerNameResponseMessage(bool const valid, Unicode::String const &playerName);
+	explicit VerifyPlayerNameResponseMessage(Archive::ReadIterator &source);
+
+	~VerifyPlayerNameResponseMessage();
+
+	bool                   isValid() const;
+	Unicode::String const &getPlayerName() const;
+
+private: 
+
+	Archive::AutoVariable<bool>            m_valid;  
+	Archive::AutoVariable<Unicode::String> m_playerName;  
+};
+
+// ============================================================================
+
+#endif // INCLUDED_VerifyPlayerNameResponseMessage_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/GameServerStatus.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/GameServerStatus.cpp
new file mode 100644
index 00000000..882834d7
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/GameServerStatus.cpp
@@ -0,0 +1,54 @@
+// GameServerStatus.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/GameServerStatus.h"
+
+//-----------------------------------------------------------------------
+
+GameServerStatus::GameServerStatus(const bool isOnline, const ServerInfo & serverInfo) :
+GameNetworkMessage("GameServerStatus"),
+m_online(isOnline),
+m_serverInfo(serverInfo)
+{
+	addVariable(m_online);
+	addVariable(m_serverInfo);
+}
+
+//-----------------------------------------------------------------------
+
+GameServerStatus::GameServerStatus(Archive::ReadIterator & source) :
+GameNetworkMessage("GameServerStatus"),
+m_online(),
+m_serverInfo()
+{
+	addVariable(m_online);
+	addVariable(m_serverInfo);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+GameServerStatus::~GameServerStatus()
+{
+}
+
+//-----------------------------------------------------------------------
+
+const ServerInfo & GameServerStatus::getServerInfo() const
+{
+	return m_serverInfo.get();
+}
+
+//-----------------------------------------------------------------------
+
+const bool GameServerStatus::isOnline() const
+{
+	return m_online.get();
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/GameServerStatus.h b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/GameServerStatus.h
new file mode 100644
index 00000000..07305b0e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/GameServerStatus.h
@@ -0,0 +1,36 @@
+// GameServerStatus.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_GameServerStatus_H
+#define	_INCLUDED_GameServerStatus_H
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedNetworkMessages/ServerInfo.h"
+#include "sharedNetworkMessages/ServerInfoArchive.h"
+
+//-----------------------------------------------------------------------
+
+class GameServerStatus : public GameNetworkMessage
+{
+public:
+	GameServerStatus(const bool isOnline, const ServerInfo & info);
+	explicit GameServerStatus(Archive::ReadIterator & source);
+	~GameServerStatus();
+
+	const bool          isOnline       () const;
+	const ServerInfo &  getServerInfo  () const;
+
+private:
+	GameServerStatus & operator = (const GameServerStatus & rhs);
+	GameServerStatus(const GameServerStatus & source);
+	
+	Archive::AutoVariable<bool>        m_online;
+	Archive::AutoVariable<ServerInfo>  m_serverInfo;
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_GameServerStatus_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetNodeStatusMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetNodeStatusMessage.cpp
new file mode 100644
index 00000000..ad141472
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetNodeStatusMessage.cpp
@@ -0,0 +1,96 @@
+// ======================================================================
+//
+// PlanetNodeStatusMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/PlanetNodeStatusMessage.h"
+
+#include <vector>
+
+// ======================================================================
+
+PlanetNodeStatusMessage::PlanetNodeStatusMessage(const std::vector<PlanetNodeStatusMessageData> &data) :
+		GameNetworkMessage("PlanetNodeStatusMessage"),
+		m_data()
+{
+	m_data.set(data);
+	addVariable(m_data);
+}
+
+//-----------------------------------------------------------------------
+
+PlanetNodeStatusMessage::PlanetNodeStatusMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("PlanetNodeStatusMessage"),
+		m_data()
+{
+	addVariable(m_data);
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+PlanetNodeStatusMessage::~PlanetNodeStatusMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetNodeStatusMessage::getData(std::vector<PlanetNodeStatusMessageData> &data)
+{
+	data=m_data.get();
+}
+
+// ======================================================================
+
+PlanetNodeStatusMessageData::PlanetNodeStatusMessageData(int x, int z, bool loaded, const stdvector<uint32>::fwd &servers, const stdvector<int>::fwd &subscriptionCounts) :
+		m_x(x),m_z(z),m_loaded(loaded),m_servers(servers),m_subscriptionCounts(subscriptionCounts)
+{
+}
+
+// ----------------------------------------------------------------------
+
+PlanetNodeStatusMessageData::PlanetNodeStatusMessageData()
+{
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, PlanetNodeStatusMessageData &d)
+	{
+		get(source,d.m_x);
+		get(source,d.m_z);
+		get(source,d.m_loaded);
+
+		AutoArray<uint32> temp;
+		get(source,temp);
+		d.m_servers=temp.get();
+
+		AutoArray<int> temp2;
+		get(source,temp2);
+		d.m_subscriptionCounts=temp2.get();							
+	}
+
+// ----------------------------------------------------------------------
+
+	void put(ByteStream & target, const PlanetNodeStatusMessageData &d)
+	{
+		put(target,d.m_x);
+		put(target,d.m_z);
+		put(target,d.m_loaded);
+
+		AutoArray<uint32> temp;
+		temp.set(d.m_servers);
+		put(target,temp);
+
+		AutoArray<int> temp2;
+		temp2.set(d.m_subscriptionCounts);
+		put(target,temp2);
+	}
+} //namespace
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetNodeStatusMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetNodeStatusMessage.h
new file mode 100644
index 00000000..54b3dc2c
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetNodeStatusMessage.h
@@ -0,0 +1,68 @@
+// ======================================================================
+//
+// PlanetNodeStatusMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_PlanetNodeStatusMessage_H
+#define INCLUDED_PlanetNodeStatusMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+// ======================================================================
+
+class PlanetNodeStatusMessageData
+{
+  public:
+	int                 m_x;
+	int                 m_z;
+	bool                m_loaded;
+	std::vector<uint32> m_servers;
+	std::vector<int>    m_subscriptionCounts;
+	
+  public:
+	PlanetNodeStatusMessageData(int x, int z, bool loaded, const stdvector<uint32>::fwd &servers, const stdvector<int>::fwd &subscriptionCounts);
+	PlanetNodeStatusMessageData();
+};
+
+// ======================================================================
+
+/**
+ * Sent from:  PlanetServer
+ * Sent to:    PlanetWatcher
+ * Action:     Tells the PlanetWatcher the status of nodes in the spatial subdivision.
+ */
+class PlanetNodeStatusMessage : public GameNetworkMessage
+{
+  public:
+	PlanetNodeStatusMessage(const std::vector<PlanetNodeStatusMessageData> &data);
+	explicit PlanetNodeStatusMessage(Archive::ReadIterator & source);
+	virtual ~PlanetNodeStatusMessage();
+
+  public:
+	void getData(std::vector<PlanetNodeStatusMessageData> &data);
+	
+  private:
+	Archive::AutoArray<PlanetNodeStatusMessageData> m_data;
+
+  private:
+	PlanetNodeStatusMessage();
+	PlanetNodeStatusMessage(const PlanetNodeStatusMessage&);
+	PlanetNodeStatusMessage& operator= (const PlanetNodeStatusMessage&);
+};
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, PlanetNodeStatusMessageData &d);
+	void put(ByteStream & target, const PlanetNodeStatusMessageData &d);
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ClientCentralMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetObjectStatusMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetObjectStatusMessage.cpp
new file mode 100644
index 00000000..4bd00244
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetObjectStatusMessage.cpp
@@ -0,0 +1,108 @@
+// ======================================================================
+//
+// PlanetObjectStatusMessage.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/PlanetObjectStatusMessage.h"
+
+// ======================================================================
+
+PlanetObjectStatusMessage::PlanetObjectStatusMessage(const std::vector<PlanetObjectStatusMessageData> &data) :
+		GameNetworkMessage("PlanetObjectStatusMessage"),
+		m_data()
+{
+	m_data.set(data);
+	addVariable(m_data);
+}
+
+//-----------------------------------------------------------------------
+
+PlanetObjectStatusMessage::PlanetObjectStatusMessage(Archive::ReadIterator & source) :
+		GameNetworkMessage("PlanetObjectStatusMessage"),
+		m_data()
+{
+	addVariable(m_data);
+	
+	unpack(source);
+}
+
+// ----------------------------------------------------------------------
+
+PlanetObjectStatusMessage::~PlanetObjectStatusMessage()
+{
+}
+
+// ----------------------------------------------------------------------
+
+void PlanetObjectStatusMessage::getData(std::vector<PlanetObjectStatusMessageData> &data)
+{
+	data = m_data.get();
+}
+
+// ----------------------------------------------------------------------
+
+PlanetObjectStatusMessageData::PlanetObjectStatusMessageData(NetworkId const & objectId, int const x, int const z, uint32 const authoritativeServer, int const interestRadius, int const deleteObject, int const objectTypeTag, int const level, bool const hibernating, uint32 const templateCrc, int const aiActivity, int const creationType) :
+		m_objectId(objectId), 
+		m_x(x), m_z(z), 
+		m_authoritativeServer(authoritativeServer), 
+		m_interestRadius(interestRadius), 
+		m_deleteObject(deleteObject),
+		m_objectTypeTag(objectTypeTag),
+		m_level(level),
+		m_hibernating(hibernating),
+		m_templateCrc(templateCrc),
+		m_aiActivity(aiActivity),
+		m_creationType(creationType)
+{
+}
+
+// ----------------------------------------------------------------------
+
+PlanetObjectStatusMessageData::PlanetObjectStatusMessageData()
+{
+}
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, PlanetObjectStatusMessageData &d)
+	{
+		get(source,d.m_objectId);
+		get(source,d.m_x);
+		get(source,d.m_z);
+		get(source,d.m_authoritativeServer);
+		get(source,d.m_interestRadius);
+		get(source,d.m_deleteObject);
+		get(source,d.m_objectTypeTag);
+		get(source,d.m_level);
+		get(source,d.m_hibernating);
+		get(source,d.m_templateCrc);
+		get(source,d.m_aiActivity);
+		get(source,d.m_creationType);
+	}
+
+// ----------------------------------------------------------------------
+
+	void put(ByteStream & target, const PlanetObjectStatusMessageData &d)
+	{
+		put(target,d.m_objectId);
+		put(target,d.m_x);
+		put(target,d.m_z);
+		put(target,d.m_authoritativeServer);
+		put(target,d.m_interestRadius);
+		put(target,d.m_deleteObject);
+		put(target,d.m_objectTypeTag);
+		put(target,d.m_level);
+		put(target,d.m_hibernating);
+		put(target,d.m_templateCrc);
+		put(target,d.m_aiActivity);
+		put(target,d.m_creationType);
+	}
+
+} //namespace
+
+// ======================================================================
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetObjectStatusMessage.h b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetObjectStatusMessage.h
new file mode 100644
index 00000000..f50fcb6b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetObjectStatusMessage.h
@@ -0,0 +1,77 @@
+// ======================================================================
+//
+// PlanetObjectStatusMessage.h
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#ifndef INCLUDED_PlanetObjectStatusMessage_H
+#define INCLUDED_PlanetObjectStatusMessage_H
+
+// ======================================================================
+
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+#include "sharedFoundation/NetworkId.h"
+
+//-----------------------------------------------------------------------
+
+/**
+ * Not nested to allow forward declaration
+ */
+class PlanetObjectStatusMessageData
+{
+  public:
+	NetworkId m_objectId;
+	int       m_x;
+	int       m_z;
+	uint32    m_authoritativeServer;
+	int       m_interestRadius;
+	int       m_deleteObject;
+	int       m_objectTypeTag;
+	int       m_level;
+	bool      m_hibernating;
+	uint32    m_templateCrc;
+	int       m_aiActivity;
+	int       m_creationType;
+
+  public:
+	PlanetObjectStatusMessageData(const NetworkId &objectId, int x, int z, uint32 authoritativeServer, int interestRadius, int deleteObject, int objectTypeTag, int m_level, bool hibernating, uint32 templateCrc, int aiActivity, int creationType);
+	PlanetObjectStatusMessageData();
+};
+
+// ======================================================================
+
+/**
+ * Sent from:  PlanetServer
+ * Sent to:    PlanetWatcher
+ * Action:     Tells the PlanetWatcher about objects on the PlanetServer
+ */
+class PlanetObjectStatusMessage : public GameNetworkMessage
+{	
+  public:
+	PlanetObjectStatusMessage(const std::vector<PlanetObjectStatusMessageData> &data);
+	explicit PlanetObjectStatusMessage(Archive::ReadIterator & source);
+	virtual ~PlanetObjectStatusMessage();
+
+	void getData(std::vector<PlanetObjectStatusMessageData> &data);
+
+  private:
+	Archive::AutoArray<PlanetObjectStatusMessageData>   m_data;
+
+	PlanetObjectStatusMessage();
+	PlanetObjectStatusMessage(const PlanetObjectStatusMessage&);
+	PlanetObjectStatusMessage& operator= (const PlanetObjectStatusMessage&);
+};
+
+// ======================================================================
+
+namespace Archive
+{
+	void get(ReadIterator & source, PlanetObjectStatusMessageData &d);
+	void put(ByteStream & target, const PlanetObjectStatusMessageData &d);
+}
+
+// ======================================================================
+
+#endif	// _INCLUDED_ClientCentralMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/ServerInfo.h b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/ServerInfo.h
new file mode 100644
index 00000000..ca3b6b1e
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/ServerInfo.h
@@ -0,0 +1,20 @@
+// ServerInfo.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ServerInfo_H
+#define	_INCLUDED_ServerInfo_H
+
+//-----------------------------------------------------------------------
+
+struct ServerInfo
+{
+	std::string    ipAddress;
+	unsigned long  serverId;
+	unsigned long  systemPid;
+	std::string    sceneId;
+};
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ServerInfo_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/ServerInfoArchive.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/ServerInfoArchive.cpp
new file mode 100644
index 00000000..67131e29
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/ServerInfoArchive.cpp
@@ -0,0 +1,33 @@
+// ServerInfoArchive.cpp
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+//-----------------------------------------------------------------------
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "sharedNetworkMessages/ServerInfo.h"
+#include "sharedNetworkMessages/ServerInfoArchive.h"
+
+//-----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, ServerInfo & target)
+	{
+		get (source, target.ipAddress);	
+		get (source, target.serverId);	
+		get (source, target.systemPid);
+		get (source, target.sceneId);
+	}
+
+	void put (ByteStream & target, const ServerInfo & source)
+	{
+		put (target, source.ipAddress);
+		put (target, source.serverId);
+		put (target, source.systemPid);
+		put (target, source.sceneId);
+	}
+}
+
+//-----------------------------------------------------------------------
+
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/ServerInfoArchive.h b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/ServerInfoArchive.h
new file mode 100644
index 00000000..0de136e2
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/ServerInfoArchive.h
@@ -0,0 +1,22 @@
+// ServerInfoArchive.h
+// Copyright 2000-01, Sony Online Entertainment Inc., all rights reserved. 
+// Author: Justin Randall
+
+#ifndef	_INCLUDED_ServerInfoArchive_H
+#define	_INCLUDED_ServerInfoArchive_H
+
+//-----------------------------------------------------------------------
+
+struct ServerInfo;
+
+//-----------------------------------------------------------------------
+
+namespace Archive
+{
+	void get (ReadIterator & source, ServerInfo & target);
+	void put (ByteStream & target, const ServerInfo & source);
+}
+
+//-----------------------------------------------------------------------
+
+#endif	// _INCLUDED_ServerInfoArchive_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatChannelInfo.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatChannelInfo.cpp
new file mode 100644
index 00000000..e90357ed
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatChannelInfo.cpp
@@ -0,0 +1,47 @@
+
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "VoiceChatChannelInfo.h"
+
+const char* const VoiceChatChannelInfo::cms_name = "VoiceChatChannelInfo";
+
+VoiceChatChannelInfo::VoiceChatChannelInfo(std::string const & name, std::string const & displayName, std::string const & uri, std::string const & password, std::string const & announceText, uint32 flags)
+: GameNetworkMessage(cms_name),
+m_flags(flags),
+m_channelName(name),
+m_displayName(displayName),
+m_channelUri(uri),
+m_channelPassword(password),
+m_announceText(announceText)
+{
+	addVariable(m_flags);
+	addVariable(m_channelName);
+	addVariable(m_displayName);
+	addVariable(m_channelUri);
+	addVariable(m_channelPassword);
+	addVariable(m_announceText);
+}
+
+
+VoiceChatChannelInfo::VoiceChatChannelInfo(Archive::ReadIterator & source)
+: GameNetworkMessage(cms_name),
+  m_flags(CIF_None),
+  m_channelName(),
+  m_displayName(),
+  m_channelUri(),
+  m_channelPassword(),
+  m_announceText()
+{
+	addVariable(m_flags);
+	addVariable(m_channelName);
+	addVariable(m_displayName);
+	addVariable(m_channelUri);
+	addVariable(m_channelPassword);
+	addVariable(m_announceText);
+	unpack(source);
+}
+
+VoiceChatChannelInfo::~VoiceChatChannelInfo()
+{
+
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatChannelInfo.h b/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatChannelInfo.h
new file mode 100644
index 00000000..cacfae81
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatChannelInfo.h
@@ -0,0 +1,129 @@
+// VoiceChatChannelInfo.h
+// temporary message to tell a client about a channel they are allowed to join
+// Steven Wyckoff
+
+#ifndef _INCLUDED_VoiceChatChannelInfo_H
+#define _INCLUDED_VoiceChatChannelInfo_H
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+class VoiceChatChannelInfo : public GameNetworkMessage
+{
+public:
+	
+	static const char* const cms_name;
+
+	explicit VoiceChatChannelInfo(std::string const & name, std::string const & displayName, std::string const & uri, 
+		std::string const & password, std::string const & announceText = "", uint32 flags = CIF_None);
+	explicit VoiceChatChannelInfo(Archive::ReadIterator &);
+	~VoiceChatChannelInfo();
+
+	bool getIsLeaveChannelCommand() const;
+	bool getIsAutoJoin() const;
+	bool getChannelExists() const;
+	bool getTargetIsModerator() const;
+	bool getForcedShortlist() const;
+	std::string const & getName() const;
+	std::string const & getDisplayName() const;
+	std::string const & getUri() const;
+	std::string const & getPassword() const;
+	std::string const & getAnnounceText() const;
+
+	enum ChannelInfoFlags
+	{
+		CIF_None = 0x00,
+		CIF_LeaveChannel = 0x01,
+		CIF_AutoJoin = 0x02,
+		CIF_ChannelDoesNotExist = 0x04,
+		CIF_TargetModerator = 0x08,
+		CIF_ForcedShortlist = 0x10,
+	};
+
+private:
+	VoiceChatChannelInfo & operator = (const VoiceChatChannelInfo & rhs);
+	VoiceChatChannelInfo(const VoiceChatChannelInfo & source);
+
+	Archive::AutoVariable<uint32> m_flags;
+	Archive::AutoVariable<std::string> m_channelName;
+	Archive::AutoVariable<std::string> m_displayName;
+	Archive::AutoVariable<std::string> m_channelUri;
+	Archive::AutoVariable<std::string> m_channelPassword;
+	Archive::AutoVariable<std::string> m_announceText;
+};
+
+//-----------------------------------------------------------------------
+
+inline bool VoiceChatChannelInfo::getIsLeaveChannelCommand() const
+{
+	return (m_flags.get() & CIF_LeaveChannel) != CIF_None;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool VoiceChatChannelInfo::getIsAutoJoin() const
+{
+	return (m_flags.get() & CIF_AutoJoin) != CIF_None;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool VoiceChatChannelInfo::getChannelExists() const
+{
+	return (m_flags.get() & CIF_ChannelDoesNotExist) == CIF_None;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool VoiceChatChannelInfo::getTargetIsModerator() const
+{
+	return (m_flags.get() & CIF_TargetModerator) != CIF_None;
+}
+
+//-----------------------------------------------------------------------
+
+inline bool VoiceChatChannelInfo::getForcedShortlist() const
+{
+	return (m_flags.get() & CIF_ForcedShortlist) != CIF_None;
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & VoiceChatChannelInfo::getName() const
+{
+	return m_channelName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & VoiceChatChannelInfo::getDisplayName() const
+{
+	return m_displayName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & VoiceChatChannelInfo::getUri() const
+{
+	return m_channelUri.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & VoiceChatChannelInfo::getPassword() const
+{
+	return m_channelPassword.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & VoiceChatChannelInfo::getAnnounceText() const
+{
+	return m_announceText.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif // _INCLUDED_VoiceChatChannelInfo_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.cpp
new file mode 100644
index 00000000..5d88bdd0
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.cpp
@@ -0,0 +1,466 @@
+
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "VoiceChatMiscMessages.h"
+
+
+const char* const VoiceChatAddClientToChannel::cms_name = "VoiceChatAddClientToChannel";
+
+VoiceChatAddClientToChannel::VoiceChatAddClientToChannel(NetworkId const & clientId, std::string const & clientName, std::string const & roomName, bool forceShortlist)
+: GameNetworkMessage(cms_name),
+  m_clientId(clientId),
+  m_clientName(clientName),
+  m_channelName(roomName),
+  m_forceShortlist(forceShortlist)
+{
+	addVariable(m_clientId);
+	addVariable(m_clientName);
+	addVariable(m_channelName);
+	addVariable(m_forceShortlist);
+}
+
+VoiceChatAddClientToChannel::VoiceChatAddClientToChannel(Archive::ReadIterator &source)
+: GameNetworkMessage(cms_name),
+  m_clientId(),
+  m_clientName(),
+  m_channelName(),
+  m_forceShortlist(false)
+{
+	addVariable(m_clientId);
+	addVariable(m_clientName);
+	addVariable(m_channelName);
+	addVariable(m_forceShortlist);
+	unpack(source);
+}
+
+VoiceChatAddClientToChannel::~VoiceChatAddClientToChannel()
+{
+
+}
+
+
+//-----------------------------------------------------------------------
+
+const char* const VoiceChatRemoveClientFromChannel::cms_name = "VoiceChatRemoveClientFromChannel";
+
+VoiceChatRemoveClientFromChannel::VoiceChatRemoveClientFromChannel(NetworkId const & clientId, std::string const & clientName, std::string const & roomName)
+: GameNetworkMessage(cms_name),
+m_clientId(clientId),
+m_clientName(clientName),
+m_channelName(roomName)
+{
+	addVariable(m_clientId);
+	addVariable(m_clientName);
+	addVariable(m_channelName);
+}
+
+VoiceChatRemoveClientFromChannel::VoiceChatRemoveClientFromChannel(Archive::ReadIterator &source)
+: GameNetworkMessage(cms_name),
+m_clientId(),
+m_clientName(),
+m_channelName()
+{
+	addVariable(m_clientId);
+	addVariable(m_clientName);
+	addVariable(m_channelName);
+	unpack(source);
+}
+
+VoiceChatRemoveClientFromChannel::~VoiceChatRemoveClientFromChannel()
+{
+}
+
+
+
+//-----------------------------------------------------------------------
+
+const char* const VoiceChatGetChannel::cms_name = "VoiceChatGetChannel";
+
+VoiceChatGetChannel::VoiceChatGetChannel(std::string const & _roomName, std::string const & _password, bool _public, bool _persistant, uint32 _limit)
+: GameNetworkMessage(cms_name),
+  m_roomName(_roomName),
+  m_password(_password),
+  m_limit(_limit),
+  m_isPublic(_public),
+  m_persistant(_persistant)
+{
+	addVariable(m_roomName);
+	addVariable(m_password);
+	addVariable(m_limit);
+	addVariable(m_isPublic);
+	addVariable(m_persistant);
+}
+
+//-----------------------------------------------------------------------
+
+VoiceChatGetChannel::VoiceChatGetChannel(Archive::ReadIterator & source)
+: GameNetworkMessage(cms_name),
+  m_roomName(),
+  m_password(),
+  m_limit(100),
+  m_persistant(false)
+{
+	addVariable(m_roomName);
+	addVariable(m_password);
+	addVariable(m_limit);
+	addVariable(m_isPublic);
+	addVariable(m_persistant);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+VoiceChatGetChannel::~VoiceChatGetChannel()
+{
+}
+
+//-----------------------------------------------------------------------
+
+//-----------------------------------------------------------------------
+
+const char* const VoiceChatOnGetChannel::cms_name = "VoiceChatOnGetChannel";
+
+VoiceChatOnGetChannel::VoiceChatOnGetChannel(std::string const & _roomName, std::string const & _uri, std::string const & _password, bool _public, bool _persistant, bool _success)
+: GameNetworkMessage(cms_name),
+  m_roomName(_roomName),
+  m_uri(_uri),
+  m_password(_password),
+  m_isPublic(_public),
+  m_persistant(_persistant),
+  m_success(_success)
+{
+	addVariable(m_roomName);
+	addVariable(m_uri);
+	addVariable(m_password);
+	addVariable(m_isPublic);
+	addVariable(m_persistant);
+	addVariable(m_success);
+}
+
+//-----------------------------------------------------------------------
+
+VoiceChatOnGetChannel::VoiceChatOnGetChannel(Archive::ReadIterator & source)
+: GameNetworkMessage(cms_name),
+  m_roomName(),
+  m_uri(),
+  m_password(),
+  m_isPublic(false),
+  m_persistant(false),
+  m_success(false)
+{
+	addVariable(m_roomName);
+	addVariable(m_uri);
+	addVariable(m_password);
+	addVariable(m_isPublic);
+	addVariable(m_persistant);
+	addVariable(m_success);
+	unpack(source);
+}
+
+//-----------------------------------------------------------------------
+
+VoiceChatOnGetChannel::~VoiceChatOnGetChannel()
+{
+}
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+const char* const VoiceChatDeleteChannel::cms_name = "VoiceChatDeleteChannel";
+
+VoiceChatDeleteChannel::VoiceChatDeleteChannel(std::string const & _roomName)
+: GameNetworkMessage(cms_name),
+m_roomName(_roomName)
+{
+	addVariable(m_roomName);
+}
+
+VoiceChatDeleteChannel::VoiceChatDeleteChannel(Archive::ReadIterator &source)
+: GameNetworkMessage(cms_name),
+m_roomName()
+{
+	addVariable(m_roomName);
+	unpack(source);
+}
+
+VoiceChatDeleteChannel::~VoiceChatDeleteChannel()
+{
+}
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+const char* const VoiceChatChannelCommand::cms_name = "VoiceChatChannelCommand";
+
+VoiceChatChannelCommand::VoiceChatChannelCommand(std::string const & _srcUserName, std::string const & _destUserName,
+	std::string const & _channelName, uint32 _command, uint32 _banTimeout)
+: GameNetworkMessage(cms_name),
+m_srcUserName(_srcUserName),
+m_destUserName(_destUserName),
+m_channelName(_channelName),
+m_command(_command),
+m_banTimeout(_banTimeout)
+{
+	addVariable(m_srcUserName);
+	addVariable(m_destUserName);
+	addVariable(m_channelName);
+	addVariable(m_command);
+	addVariable(m_banTimeout);
+}
+
+VoiceChatChannelCommand::VoiceChatChannelCommand(Archive::ReadIterator &source)
+: GameNetworkMessage(cms_name),
+  m_srcUserName(),
+  m_destUserName(),
+  m_channelName(),
+  m_command(0),
+  m_banTimeout(0)
+{
+	addVariable(m_srcUserName);
+	addVariable(m_destUserName);
+	addVariable(m_channelName);
+	addVariable(m_command);
+	addVariable(m_banTimeout);
+	unpack(source);
+}
+
+VoiceChatChannelCommand::~VoiceChatChannelCommand()
+{
+}
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+const char* const VoiceChatOnChannelCommand::cms_name = "VoiceChatOnChannelCommand";
+
+VoiceChatOnChannelCommand::VoiceChatOnChannelCommand(std::string const & _srcUserName, std::string const & _destUserName,
+		std::string const & _channelName, uint32 _command, uint32 _banTimeout, uint32 _result)
+: GameNetworkMessage(cms_name),
+ m_srcUserName(_srcUserName),
+ m_destUserName(_destUserName),
+ m_channelName(_channelName),
+ m_command(_command),
+ m_banTimeout(_banTimeout),
+ m_result(_result)
+{
+	addVariable(m_srcUserName);
+	addVariable(m_destUserName);
+	addVariable(m_channelName);
+	addVariable(m_command);
+	addVariable(m_banTimeout);
+	addVariable(m_result);
+}
+
+VoiceChatOnChannelCommand::VoiceChatOnChannelCommand(Archive::ReadIterator &source)
+: GameNetworkMessage(cms_name),
+m_srcUserName(),
+m_destUserName(),
+m_channelName(),
+m_command(0),
+m_banTimeout(0),
+m_result(0)
+{
+	addVariable(m_srcUserName);
+	addVariable(m_destUserName);
+	addVariable(m_channelName);
+	addVariable(m_command);
+	addVariable(m_banTimeout);
+	addVariable(m_result);
+	unpack(source);
+}
+
+VoiceChatOnChannelCommand::~VoiceChatOnChannelCommand()
+{
+}
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+const char* const VoiceChatRequestPersonalChannel::cms_name = "VoiceChatRequestPersonalChannel";
+
+VoiceChatRequestPersonalChannel::VoiceChatRequestPersonalChannel (NetworkId const & owner, bool createIt)
+: GameNetworkMessage(cms_name),
+m_owner(owner),
+m_pleaseCreateIt(createIt)
+{
+	addVariable(m_owner);
+	addVariable(m_pleaseCreateIt);
+}
+
+VoiceChatRequestPersonalChannel::VoiceChatRequestPersonalChannel (Archive::ReadIterator &source)
+: GameNetworkMessage(cms_name),
+m_owner(),
+m_pleaseCreateIt(false)
+{
+	addVariable(m_owner);
+	addVariable(m_pleaseCreateIt);
+	unpack(source);
+}
+
+VoiceChatRequestPersonalChannel::~VoiceChatRequestPersonalChannel()
+{
+}
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+const char* const  VoiceChatInvite::cms_name = "VoiceChatInvite";
+
+VoiceChatInvite::VoiceChatInvite (NetworkId const & requester, std::string channelName, NetworkId const & inviteeId, std::string const & inviteeName)
+: GameNetworkMessage(cms_name),
+m_requester(requester),
+m_channelName(channelName),
+m_inviteeId(inviteeId),
+m_inviteeName(inviteeName),
+m_channelUri()
+{
+	addVariable(m_requester);
+	addVariable(m_channelName);
+	addVariable(m_inviteeId);
+	addVariable(m_inviteeName);
+	addVariable(m_channelUri);
+}
+
+VoiceChatInvite::VoiceChatInvite (NetworkId const & sourceId, NetworkId const & targetId, std::string const & channelName, std::string const & uri)
+: GameNetworkMessage(cms_name),
+m_requester(sourceId),
+m_channelName(channelName),
+m_inviteeId(targetId),
+m_inviteeName(),
+m_channelUri(uri)
+{
+	addVariable(m_requester);
+	addVariable(m_channelName);
+	addVariable(m_inviteeId);
+	addVariable(m_inviteeName);
+	addVariable(m_channelUri);
+}
+
+
+VoiceChatInvite::VoiceChatInvite (Archive::ReadIterator &source)
+: GameNetworkMessage(cms_name),
+m_requester(),
+m_channelName(),
+m_inviteeId(),
+m_inviteeName(),
+m_channelUri()
+{
+	addVariable(m_requester);
+	addVariable(m_channelName);
+	addVariable(m_inviteeId);
+	addVariable(m_inviteeName);
+	addVariable(m_channelUri);
+	unpack(source);
+}
+
+VoiceChatInvite::~VoiceChatInvite()
+{
+}
+
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+const char* const  VoiceChatKick::cms_name = "VoiceChatKick";
+
+VoiceChatKick::VoiceChatKick (NetworkId const & requester, std::string channelName, NetworkId const & kickeeId, std::string const & kickeeName)
+: GameNetworkMessage(cms_name),
+m_requester(requester),
+m_channelName(channelName),
+m_kickeeId(kickeeId),
+m_kickeeName(kickeeName)
+{
+	addVariable(m_requester);
+	addVariable(m_channelName);
+	addVariable(m_kickeeId);
+	addVariable(m_kickeeName);
+}
+
+VoiceChatKick::VoiceChatKick (NetworkId const & sourceId, NetworkId const & targetId, std::string channelName)
+: GameNetworkMessage(cms_name),
+m_requester(sourceId),
+m_channelName(channelName),
+m_kickeeId(targetId),
+m_kickeeName()
+{
+	addVariable(m_requester);
+	addVariable(m_channelName);
+	addVariable(m_kickeeId);
+	addVariable(m_kickeeName);
+}
+
+VoiceChatKick::VoiceChatKick (Archive::ReadIterator &source)
+: GameNetworkMessage(cms_name),
+m_requester(),
+m_channelName(),
+m_kickeeId(),
+m_kickeeName()
+{
+	addVariable(m_requester);
+	addVariable(m_channelName);
+	addVariable(m_kickeeId);
+	addVariable(m_kickeeName);
+	unpack(source);
+}
+
+VoiceChatKick::~VoiceChatKick()
+{
+}
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+const char* const  VoiceChatStatus::cms_name = "VoiceChatStatus";
+
+VoiceChatStatus::VoiceChatStatus (const uint32 statusCode)
+: GameNetworkMessage(cms_name),
+  m_status(statusCode)
+{
+	addVariable(m_status);
+}
+
+VoiceChatStatus::VoiceChatStatus (Archive::ReadIterator &source)
+: GameNetworkMessage(cms_name),
+  m_status(SC_VoiceStatusUnknown)
+{
+	addVariable(m_status);
+	unpack(source);
+}
+VoiceChatStatus::~VoiceChatStatus()
+{
+
+}
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+const char* const  VoiceChatRequestChannelInfo::cms_name = "VoiceChatRequestChannelInfo";
+
+VoiceChatRequestChannelInfo::VoiceChatRequestChannelInfo (NetworkId const & requester, std::string const & channelName)
+: GameNetworkMessage(cms_name),
+m_requester(requester),
+m_channelName(channelName)
+{
+	addVariable(m_requester);
+	addVariable(m_channelName);
+}
+
+VoiceChatRequestChannelInfo::VoiceChatRequestChannelInfo (Archive::ReadIterator &source)
+: GameNetworkMessage(cms_name),
+m_requester(),
+m_channelName()
+{
+	addVariable(m_requester);
+	addVariable(m_channelName);
+	unpack(source);
+}
+
+VoiceChatRequestChannelInfo::~VoiceChatRequestChannelInfo()
+{
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.h b/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.h
new file mode 100644
index 00000000..95d90171
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatMiscMessages.h
@@ -0,0 +1,447 @@
+// VoiceChatMiscMessages.h
+// temporary file to hold various messages that may or may not exist for long
+// Steven Wyckoff
+
+#ifndef _INCLUDED_VoiceChatMiscMessages_H
+#define _INCLUDED_VoiceChatMiscMessages_H
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedFoundation/NetworkIdArchive.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+/////////////////////////////////////////////////////////////////////////
+// VoiceChatAddClientToRoom
+// TODO: move this to its own file
+/////////////////////////////////////////////////////////////////////////
+
+class VoiceChatAddClientToChannel : public GameNetworkMessage
+{
+public:
+
+	static const char* const cms_name;
+
+	explicit VoiceChatAddClientToChannel(NetworkId const & clientId, std::string const & clientName, std::string const & roomName, bool forceShortlist);
+	explicit VoiceChatAddClientToChannel(Archive::ReadIterator &);
+	~VoiceChatAddClientToChannel();
+
+	inline NetworkId const & getClientId() const {return m_clientId.get();}
+	inline std::string const & getClientName() const {return m_clientName.get();}
+	inline std::string const & getChannelName() const {return m_channelName.get();}
+	inline bool getForceShortlist() const {return m_forceShortlist.get();}
+
+private:
+	VoiceChatAddClientToChannel & operator = (const VoiceChatAddClientToChannel & rhs);
+	VoiceChatAddClientToChannel(const VoiceChatAddClientToChannel & source);
+
+	Archive::AutoVariable<NetworkId> m_clientId;
+	Archive::AutoVariable<std::string> m_clientName;
+	Archive::AutoVariable<std::string> m_channelName;
+	Archive::AutoVariable<bool> m_forceShortlist;
+};
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+class VoiceChatRemoveClientFromChannel : public GameNetworkMessage
+{
+public:
+
+	static const char* const cms_name;
+
+	explicit VoiceChatRemoveClientFromChannel(NetworkId const & clientId, std::string const & clientName, std::string const & roomName);
+	explicit VoiceChatRemoveClientFromChannel(Archive::ReadIterator &);
+	~VoiceChatRemoveClientFromChannel();
+
+	inline NetworkId const & getClientId() const {return m_clientId.get();}
+	inline std::string const & getClientName() const {return m_clientName.get();}
+	inline std::string const & getChannelName() const {return m_channelName.get();}
+
+private:
+	VoiceChatRemoveClientFromChannel & operator = (const VoiceChatRemoveClientFromChannel & rhs);
+	VoiceChatRemoveClientFromChannel(const VoiceChatRemoveClientFromChannel & source);
+
+	Archive::AutoVariable<NetworkId> m_clientId;
+	Archive::AutoVariable<std::string> m_clientName;
+	Archive::AutoVariable<std::string> m_channelName;
+};
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+class VoiceChatGetChannel : public GameNetworkMessage
+{
+public:
+	static const char* const cms_name;
+
+	explicit VoiceChatGetChannel(std::string const & _roomName, std::string const & _password, bool _public, bool _persistant, uint32 _limit);
+	explicit VoiceChatGetChannel(Archive::ReadIterator &);
+	~VoiceChatGetChannel();
+
+	std::string const & getRoomName() const;
+	std::string const & getPassword() const;
+	uint32 getLimit() const;
+	bool getIsPublic() const;
+	bool getIsPersistant() const;
+
+private:
+	VoiceChatGetChannel & operator = (const VoiceChatGetChannel & rhs);
+	VoiceChatGetChannel(const VoiceChatGetChannel & source);
+
+	Archive::AutoVariable<std::string> m_roomName;
+	Archive::AutoVariable<std::string> m_password;
+	Archive::AutoVariable<uint32> m_limit;
+	Archive::AutoVariable<bool> m_isPublic;
+	Archive::AutoVariable<bool> m_persistant;
+};
+
+//-----------------------------------------------------------------------
+
+inline std::string const & VoiceChatGetChannel::getRoomName() const
+{
+	return m_roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & VoiceChatGetChannel::getPassword() const
+{
+	return m_password.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline uint32 VoiceChatGetChannel::getLimit() const
+{
+	return m_limit.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool VoiceChatGetChannel::getIsPublic() const
+{
+	return m_isPublic.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline bool VoiceChatGetChannel::getIsPersistant() const
+{
+	return m_persistant.get();
+}
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+class VoiceChatOnGetChannel : public GameNetworkMessage
+{
+public:
+	static const char* const cms_name;
+
+	explicit VoiceChatOnGetChannel(std::string const & _roomName, std::string const & _uri, std::string const & _password, bool _public, bool _persistant, bool _success);
+	explicit VoiceChatOnGetChannel(Archive::ReadIterator &);
+	~VoiceChatOnGetChannel();
+
+	std::string const & getRoomName() const;
+	std::string const & getUri() const;
+	std::string const & getPassword() const;
+	bool getIsPublic() const;
+	bool getIsPersistant() const;
+	bool getWasSuccessful() const;
+
+private:
+	VoiceChatOnGetChannel & operator = (const VoiceChatOnGetChannel & rhs);
+	VoiceChatOnGetChannel(const VoiceChatOnGetChannel & source);
+
+	Archive::AutoVariable<std::string> m_roomName;
+	Archive::AutoVariable<std::string> m_uri;
+	Archive::AutoVariable<std::string> m_password;
+	Archive::AutoVariable<bool> m_isPublic;
+	Archive::AutoVariable<bool> m_persistant;
+	Archive::AutoVariable<bool> m_success;
+};
+
+//-----------------------------------------------------------------------
+
+inline std::string const & VoiceChatOnGetChannel::getRoomName() const
+{
+	return m_roomName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & VoiceChatOnGetChannel::getUri() const
+{
+	return m_uri.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline std::string const & VoiceChatOnGetChannel::getPassword() const
+{
+	return m_password.get();
+}
+
+//-----------------------------------------------------------------------
+inline bool VoiceChatOnGetChannel::getIsPublic() const
+{
+	return m_isPublic.get();
+}
+
+inline bool VoiceChatOnGetChannel::getIsPersistant() const
+{
+	return m_persistant.get();
+}
+
+inline bool VoiceChatOnGetChannel::getWasSuccessful() const
+{
+	return m_success.get();
+}
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+class VoiceChatDeleteChannel : public GameNetworkMessage
+{
+public:
+	static const char* const cms_name;
+
+	explicit VoiceChatDeleteChannel(std::string const & _roomName);
+	explicit VoiceChatDeleteChannel(Archive::ReadIterator &);
+	~VoiceChatDeleteChannel();
+
+	std::string const & getRoomName() const { return m_roomName.get(); }
+
+private:
+	VoiceChatDeleteChannel & operator = (const VoiceChatDeleteChannel & rhs);
+	VoiceChatDeleteChannel(const VoiceChatDeleteChannel & source);
+
+	Archive::AutoVariable<std::string> m_roomName;
+};
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+enum VoiceChannelCommandType
+{
+	COMMAND_MUTE = 0,
+	COMMAND_UNMUTE,
+	COMMAND_KICK,
+	COMMAND_HANGUP,
+	COMMAND_INVITE,
+	COMMAND_BAN,
+	COMMAND_UNBAN,
+	COMMAND_CHAN_LOCK,
+	COMMAND_CHAN_UNLOCK,
+	COMMAND_MUTE_ALL,
+	COMMAND_UNMUTE_ALL,
+	COMMAND_ADD_MODERATOR,
+	COMMAND_DELETE_MODERATOR,
+	COMMAND_ADD_ACL,
+	COMMAND_DELETE_ACL,
+	COMMAND_END
+};
+
+class VoiceChatChannelCommand : public GameNetworkMessage
+{
+public:
+	static const char* const cms_name;
+
+	explicit VoiceChatChannelCommand(std::string const & _srcUserName, std::string const & _destUserName, std::string const & _channelName, uint32 _command, uint32 _banTimeout);
+	explicit VoiceChatChannelCommand(Archive::ReadIterator &);
+	~VoiceChatChannelCommand();
+
+	std::string const & getSourceUserName() const { return m_srcUserName.get(); }
+	std::string const & getTargetUserName() const { return m_destUserName.get(); }
+	std::string const & getChannelName() const { return m_channelName.get(); }
+	uint32 getCommandType() const {return m_command.get(); }
+	uint32 getBanTimeout() const {return m_banTimeout.get(); }
+
+private:
+	VoiceChatChannelCommand & operator = (const VoiceChatChannelCommand & rhs);
+	VoiceChatChannelCommand(const VoiceChatChannelCommand & source);
+
+	Archive::AutoVariable<std::string> m_srcUserName;
+	Archive::AutoVariable<std::string> m_destUserName;
+	Archive::AutoVariable<std::string> m_channelName;
+	Archive::AutoVariable<uint32> m_command;
+	Archive::AutoVariable<uint32> m_banTimeout;
+};
+
+
+class VoiceChatOnChannelCommand : public GameNetworkMessage
+{
+public:
+	static const char* const cms_name;
+
+	explicit VoiceChatOnChannelCommand(std::string const & _srcUserName, std::string const & _destUserName, std::string const & _channelName, uint32 _command, uint32 _banTimeout, uint32 _result);
+	explicit VoiceChatOnChannelCommand(Archive::ReadIterator &);
+	~VoiceChatOnChannelCommand();
+
+	std::string const & getSourceUserName() const { return m_srcUserName.get(); }
+	std::string const & getTargetUserName() const { return m_destUserName.get(); }
+	std::string const & getChannelName() const { return m_channelName.get(); }
+	uint32 getCommandType() const {return m_command.get(); }
+	uint32 getBanTimeout() const {return m_banTimeout.get(); }
+	uint32 getResult() const {return m_result.get(); }
+
+private:
+	VoiceChatOnChannelCommand & operator = (const VoiceChatOnChannelCommand & rhs);
+	VoiceChatOnChannelCommand(const VoiceChatOnChannelCommand & source);
+
+	Archive::AutoVariable<std::string> m_srcUserName;
+	Archive::AutoVariable<std::string> m_destUserName;
+	Archive::AutoVariable<std::string> m_channelName;
+	Archive::AutoVariable<uint32> m_command;
+	Archive::AutoVariable<uint32> m_banTimeout;
+	Archive::AutoVariable<uint32> m_result;
+};
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+class VoiceChatRequestPersonalChannel : public GameNetworkMessage
+{
+public:
+	static const char * const cms_name;
+
+	explicit VoiceChatRequestPersonalChannel (NetworkId const & owner, bool createIt);
+	explicit VoiceChatRequestPersonalChannel (Archive::ReadIterator &);
+	~ VoiceChatRequestPersonalChannel();
+
+	inline NetworkId const & getOwner() {return m_owner.get();}
+	inline bool getShouldCreate() {return m_pleaseCreateIt.get();}
+
+private:
+	VoiceChatRequestPersonalChannel & operator = (const VoiceChatRequestPersonalChannel & rhs);
+	VoiceChatRequestPersonalChannel(const VoiceChatOnChannelCommand & source);
+
+	Archive::AutoVariable<NetworkId> m_owner;
+	Archive::AutoVariable<bool> m_pleaseCreateIt;
+};
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+class VoiceChatInvite : public GameNetworkMessage
+{
+public:
+	static const char * const cms_name;
+
+	explicit VoiceChatInvite (NetworkId const & requester, std::string channelName, NetworkId const & inviteeId, std::string const & inviteeName);
+	explicit VoiceChatInvite (NetworkId const & sourceId, NetworkId const & targetId, std::string const & channelName, std::string const & uri);
+	explicit VoiceChatInvite (Archive::ReadIterator &);
+	~VoiceChatInvite();
+
+	inline NetworkId const & getRequester() const {return m_requester.get();}
+	inline std::string const & getChannelName() const {return m_channelName.get();}
+	inline NetworkId const & getInviteeId() const {return m_inviteeId.get();}
+	inline std::string const & getInviteeName() const {return m_inviteeName.get();}
+	inline std::string const & getChannelUri() const {return m_channelUri.get();}
+
+	inline void setChannelUri(std::string const & uri) {m_channelUri.set(uri);}
+
+private:
+	VoiceChatInvite & operator = (const VoiceChatInvite & rhs);
+	VoiceChatInvite (VoiceChatInvite const & source);
+
+	Archive::AutoVariable<NetworkId> m_requester;
+	Archive::AutoVariable<std::string> m_channelName;
+	Archive::AutoVariable<NetworkId> m_inviteeId;
+	Archive::AutoVariable<std::string> m_inviteeName;
+	Archive::AutoVariable<std::string> m_channelUri;
+};
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+class VoiceChatKick : public GameNetworkMessage
+{
+public:
+	static const char * const cms_name;
+
+	explicit VoiceChatKick (NetworkId const & requester, std::string channelName, NetworkId const & kickeeId, std::string const & kickeeName);
+	explicit VoiceChatKick (NetworkId const & sourceId, NetworkId const & targetId, std::string channelName);
+	explicit VoiceChatKick (Archive::ReadIterator &);
+	~VoiceChatKick();
+
+	inline NetworkId const & getRequester() const {return m_requester.get();}
+	inline std::string const & getChannelName() const {return m_channelName.get();}
+	inline NetworkId const & getKickeeId() const {return m_kickeeId.get();}
+	inline std::string const & getKickeeName() const {return m_kickeeName.get();}
+
+private:
+	VoiceChatKick & operator = (const VoiceChatKick & rhs);
+	VoiceChatKick (VoiceChatKick const & source);
+
+	Archive::AutoVariable<NetworkId> m_requester;
+	Archive::AutoVariable<std::string> m_channelName;
+	Archive::AutoVariable<NetworkId> m_kickeeId;
+	Archive::AutoVariable<std::string> m_kickeeName;
+};
+
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+class VoiceChatStatus : public GameNetworkMessage
+{
+public:
+	static const char * const cms_name;
+
+	enum StatusCode
+	{
+		SC_VoiceEnabled,
+		SC_VoiceStatusUnknown,
+		SC_VoiceServerDisabled,
+		SC_VoiceClientIsTrial,
+	};
+
+	explicit VoiceChatStatus (const uint32 statusCode);
+	explicit VoiceChatStatus (Archive::ReadIterator &);
+	~VoiceChatStatus();
+
+	inline uint32 getStatus() const { return m_status.get(); }
+
+private:
+	VoiceChatStatus & operator = (const VoiceChatStatus & rhs);
+	VoiceChatStatus (VoiceChatStatus const & source);
+
+	Archive::AutoVariable<uint32> m_status;
+};
+
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
+
+class VoiceChatRequestChannelInfo : public GameNetworkMessage
+{
+public:
+	static const char * const cms_name;
+
+	explicit VoiceChatRequestChannelInfo (NetworkId const & requester, std::string const & channelName);
+	explicit VoiceChatRequestChannelInfo (Archive::ReadIterator &);
+	~VoiceChatRequestChannelInfo();
+
+	inline NetworkId const & getRequester() const {return m_requester.get();}
+	inline std::string const & getChannelName() const {return m_channelName.get();}
+
+private:
+	VoiceChatRequestChannelInfo & operator = (const VoiceChatRequestChannelInfo & rhs);
+	VoiceChatRequestChannelInfo (VoiceChatRequestChannelInfo const & source);
+
+	Archive::AutoVariable<NetworkId> m_requester;
+	Archive::AutoVariable<std::string> m_channelName;
+};
+
+#endif // _INCLUDED_VoiceChatMiscMessages_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatOnGetAccount.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatOnGetAccount.cpp
new file mode 100644
index 00000000..97e2466b
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatOnGetAccount.cpp
@@ -0,0 +1,38 @@
+
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"
+#include "VoiceChatOnGetAccount.h"
+
+const char* const VoiceChatOnGetAccount::cms_name = "VoiceChatOnGetAccount";
+
+VoiceChatOnGetAccount::VoiceChatOnGetAccount(unsigned resultCode, std::string const & loginName, std::string const & password, std::string const & connectionServerAddress)
+: GameNetworkMessage(cms_name),
+  m_result(resultCode),
+  m_loginName(loginName),
+  m_password(password),
+  m_connectionServerAddress(connectionServerAddress)
+{
+	addVariable(m_result);
+	addVariable(m_loginName);
+	addVariable(m_password);
+	addVariable(m_connectionServerAddress);
+}
+
+VoiceChatOnGetAccount::VoiceChatOnGetAccount(Archive::ReadIterator & source)
+: GameNetworkMessage(cms_name),
+	m_result(GAR_FAILURE),
+	m_loginName(),
+	m_password(),
+	m_connectionServerAddress()
+{
+	addVariable(m_result);
+	addVariable(m_loginName);
+	addVariable(m_password);
+	addVariable(m_connectionServerAddress);
+	unpack(source);
+}
+
+VoiceChatOnGetAccount::~VoiceChatOnGetAccount()
+{
+
+}
diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatOnGetAccount.h b/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatOnGetAccount.h
new file mode 100644
index 00000000..23567105
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/shared/voicechat/VoiceChatOnGetAccount.h
@@ -0,0 +1,74 @@
+// VoiceChatOnGetAccount.h
+// sent to the client when the login info is ready for them
+// Steven Wyckoff
+
+#ifndef _INCLUDED_VoiceChatOnGetAccount_H
+#define _INCLUDED_VoiceChatOnGetAccount_H
+
+#include "sharedFoundation/NetworkId.h"
+#include "sharedNetworkMessages/GameNetworkMessage.h"
+
+#include <string>
+
+class VoiceChatOnGetAccount : public GameNetworkMessage
+{
+public:
+	
+	enum GetAccountResult
+	{
+		GAR_SUCCESS = 0,
+		GAR_FAILURE = 1,
+	};
+
+	static const char* const cms_name;
+
+	explicit VoiceChatOnGetAccount(unsigned resultCode, std::string const & loginName, std::string const & password, std::string const & connectionServer);
+	explicit VoiceChatOnGetAccount(Archive::ReadIterator &);
+	~VoiceChatOnGetAccount();
+
+	unsigned getResult() const;
+	std::string const & getName() const;
+	std::string const & getPassword() const;
+	std::string const & getConnectionServerAddress() const;
+
+private:
+	VoiceChatOnGetAccount & operator = (const VoiceChatOnGetAccount & rhs);
+	VoiceChatOnGetAccount(const VoiceChatOnGetAccount & source);
+
+	Archive::AutoVariable<unsigned> m_result;
+	Archive::AutoVariable<std::string> m_loginName;
+	Archive::AutoVariable<std::string> m_password;
+	Archive::AutoVariable<std::string> m_connectionServerAddress;
+};
+
+//-----------------------------------------------------------------------
+
+inline unsigned VoiceChatOnGetAccount::getResult() const
+{
+	return m_result.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & VoiceChatOnGetAccount::getName() const
+{
+	return m_loginName.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & VoiceChatOnGetAccount::getPassword() const
+{
+	return m_password.get();
+}
+
+//-----------------------------------------------------------------------
+
+inline const std::string & VoiceChatOnGetAccount::getConnectionServerAddress() const
+{
+	return m_connectionServerAddress.get();
+}
+
+//-----------------------------------------------------------------------
+
+#endif // _INCLUDED_VoiceChatOnGetAccount_H
diff --git a/engine/shared/library/sharedNetworkMessages/src/win32/FirstSharedNetworkMessages.cpp b/engine/shared/library/sharedNetworkMessages/src/win32/FirstSharedNetworkMessages.cpp
new file mode 100644
index 00000000..a5d2ce4d
--- /dev/null
+++ b/engine/shared/library/sharedNetworkMessages/src/win32/FirstSharedNetworkMessages.cpp
@@ -0,0 +1,8 @@
+// ======================================================================
+//
+// FirstNetworkMessages.cpp
+// copyright (c) 2001 Sony Online Entertainment
+//
+// ======================================================================
+
+#include "sharedNetworkMessages/FirstSharedNetworkMessages.h"