diff --git a/src/engine/net/client/msg/VendorDialogMsg.java b/src/engine/net/client/msg/VendorDialogMsg.java
index 3fcb2b83..7053a90d 100644
--- a/src/engine/net/client/msg/VendorDialogMsg.java
+++ b/src/engine/net/client/msg/VendorDialogMsg.java
@@ -82,6 +82,11 @@ public class VendorDialogMsg extends ClientNetMsg {
             return;
         }
 
+        if(msg.getUnknown03() == 19991999){
+            Contract.handleTrainerInventoryWindow(playerCharacter,msg);
+            return;
+        }
+
         // Get NPC that player is talking to
         NPC npc = NPC.getFromCache(msg.vendorObjectID);
         int npcClassID;
@@ -147,6 +152,7 @@ public class VendorDialogMsg extends ClientNetMsg {
                 return;
         }
             //vd = VendorDialog.getVendorDialog(msg.unknown03);
+            vd = Contract.trainerDialog(vd);
             msg.updateMessage(3, vd);
         }
 
diff --git a/src/engine/objects/Contract.java b/src/engine/objects/Contract.java
index f814212f..c9c7723b 100644
--- a/src/engine/objects/Contract.java
+++ b/src/engine/objects/Contract.java
@@ -16,6 +16,7 @@ import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.msg.CityDataMsg;
 import engine.net.client.msg.ErrorPopupMsg;
+import engine.net.client.msg.VendorDialogMsg;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
@@ -329,15 +330,23 @@ public class Contract extends AbstractGameObject {
             return true;
         return false;
     }
-    public static VendorDialog trainerDialog(VendorDialog vd){
-        VendorDialog returnedVD = new VendorDialog("Test","Test",19991999);
-        returnedVD.options = new ArrayList<MenuOption>();
-        if(isClassTrainer(vd.getObjectUUID())) {
-            MenuOption option1 = new MenuOption(19991999, "Class Market", 19991999);
-            vd.getOptions().add(option1);
+
+    public static void handleTrainerInventoryWindow(PlayerCharacter pc, VendorDialogMsg msg){
+
+    }
+    public static VendorDialog trainerDialog(VendorDialog vd) {
+
+        VendorDialog returnedVD = new VendorDialog(vd.getDialogType(), vd.getIntro(), 19991999);
+        returnedVD.options = new ArrayList<>();
+        for (MenuOption mo : vd.options)
+            returnedVD.options.add(mo);
+        if (isClassTrainer(vd.getObjectUUID())) {
+            MenuOption option1 = new MenuOption(19991999, "Buy", 19991999);
+            returnedVD.options.add(option1);
         }
         return returnedVD;
     }
+
     public static VendorDialog HandleBaneCommanderOptions(int optionId, NPC npc, PlayerCharacter pc){
         pc.setLastNPCDialog(npc);
         VendorDialog vd = new VendorDialog(VendorDialog.getHostileVendorDialog().getDialogType(),VendorDialog.getHostileVendorDialog().getIntro(),-1);//VendorDialog.getHostileVendorDialog();