diff --git a/src/engine/net/client/Protocol.java b/src/engine/net/client/Protocol.java
index 1417451e..8b7fb909 100644
--- a/src/engine/net/client/Protocol.java
+++ b/src/engine/net/client/Protocol.java
@@ -82,7 +82,7 @@ public enum Protocol {
     COMBATMODE(0xFE4BF353, ToggleCombatMsg.class, ToggleCombatMsgHandler.class), //Toggle Combat mode
     CONFIRMPROMOTE(0x153BB5F9, ConfirmPromoteMsg.class, null),
     COSTTOOPENBANK(0x135BE5E8, CostOpenBankMsg.class, null), // ACK Bank Window Opened
-    CREATECHAR(0x5D18B5C8, CommitNewCharacterMsg.class, null), // Commit New Character,
+    CREATECHAR(0x5D18B5C8, CommitNewCharacterMsg.class, CommitNewCharacterMsgHandler.class), // Commit New Character,
     CREATEPETITION(0xD489CFED, GuildCreationFinalizeMsg.class, GuildCreationFinalizeHandler.class),    //Confirm guild creation
     CUSTOMERPETITION(0x7F9D7D6D, PetitionReceivedMsg.class, PetitionReceivedMsgHandler.class),
     DELETEOBJECT(0x57F069D8, DeleteItemMsg.class, DeleteItemMsgHandler.class), //Delete Item from Inventory
@@ -133,7 +133,7 @@ public enum Protocol {
     LOADCHARACTER(0x5756BC53, null, null), // Load Player/NPC/Mob, other then self
     LOADSTRUCTURE(0xB8A3A654, LoadStructureMsg.class, null), //Load Buildings and World Detail Objects
     LOCKUNLOCKDOOR(0x8D0E8C44, LockUnlockDoorMsg.class, LockUnlockDoorMsgHandler.class), // Lock/Unlock Door
-    LOGIN(0x3D51E445, ClientLoginInfoMsg.class, null), // Login Information
+    LOGIN(0x3D51E445, ClientLoginInfoMsg.class, ClientLoginInfoMsgHandler.class), // Login Information
     LOGINFAILED(0x47B867F6, null, null), // Login Error
     LOGINTOGAMESERVER(0x77910FDF, LoginToGameServerMsg.class, LoginToGameServerMsgHandler.class), // Login to Game Server
     MANAGECITYASSETS(0xCFF01225, ManageCityAssetsMsg.class, ManageCityAssetMsgHandler.class), // Manage city assets
@@ -168,7 +168,7 @@ public enum Protocol {
     REALMDATA(0x2399B775, null, null),            //Realm Data - Optional(?)
     RECOMMENDNATION(0x6D4579E9, RecommendNationMsg.class, RecommendNationMsgHandler.class), // Recommend as Ally/Enemy, error
     RECYCLEPOWER(0x24033B67, RecyclePowerMsg.class, null), //Unlock power for reUse
-    REMOVECHAR(0x5D3F9739, DeleteCharacterMsg.class, null), // Delete Character
+    REMOVECHAR(0x5D3F9739, DeleteCharacterMsg.class, DeleteCharacterMsgHandler.class), // Delete Character
     REMOVEFRIEND(0xE0D5DB42, RemoveFriendMessage.class, RemoveFriendHandler.class),
     REPAIRBUILDING(0xAF8C2560, RepairBuildingMsg.class, RepairBuildingMsgHandler.class),
     REPAIROBJECT(0x782219CE, RepairMsg.class, RepairMsgHandler.class), //Repair Window Req/Ack, RepairObject item Req/Ack
@@ -184,9 +184,9 @@ public enum Protocol {
     ROTATEMSG(0x57F2088E, RotateObjectMsg.class, null),
     SAFEMODE(0x9CF3922A, SafeModeMsg.class, null), //Tell client they're in safe mode
     SCALEOBJECT(0xE2B392D9, null, null), // Adjust scale of object
-    SELECTCHAR(0x7E6A9338, GameServerIPRequestMsg.class, null), // Game Server IP Request
+    SELECTCHAR(0x7E6A9338, GameServerIPRequestMsg.class, GameServerIPRequestMsgHandler.class), // Game Server IP Request
     SELECTCITY(0x7E6BE630, null, null),
-    SELECTSERVER(0x440D28B7, ServerInfoMsg.class, null), // Server Info Request/Response
+    SELECTSERVER(0x440D28B7, ServerInfoMsg.class, ServerInfoMsg.class), // Server Info Request/Response
     SELLTONPC(0x57111C67, VendorSellMsg.class, VendorSellMsgHandler.class), //Sell to NPC
     SENDCITYENTRY(0xBC3B5E72, null, null), //Send Teleport/Repledge List
     SENDGUILDENTRY(0x6D5EF164, null, null),
@@ -240,7 +240,7 @@ public enum Protocol {
     VENDORDIALOG(0x98ACD594, VendorDialogMsg.class, VendorDialogMsgHandler.class), // Send/Recv Vendor Dialog
     VENDORSELLWINDOW(0x267DAB90, VendorSellWindowMsg.class, VendorSellWindowMsgHandler.class), //open Sell to NPC Window
     VENDORBUYWINDOW(0x682DAB4D, VendorBuyWindowMsg.class, VendorBuyWindowMsgHandler.class), // Open Buy From NPC Window
-    VERSIONINFO(0x4B7EE463, VersionInfoMsg.class, null), // Version Information
+    VERSIONINFO(0x4B7EE463, VersionInfoMsg.class, VersionInfoMsgHandler.class), // Version Information
     VIEWRESOURCES(0xCEFD0346, ViewResourcesMsg.class, ViewResourcesMsgHandler.class),
     VISUALUPDATE(0x33402fd2, null, null),
     WEIGHTINVENTORY(0xF1B6A85C, LootWindowResponseMsg.class, null), // MoveObjectToContainer Window Response