diff --git a/knockoutwhistweb/app/model/sessions/UserSession.scala b/knockoutwhistweb/app/model/sessions/UserSession.scala
index 5379cb8..4d89cba 100644
--- a/knockoutwhistweb/app/model/sessions/UserSession.scala
+++ b/knockoutwhistweb/app/model/sessions/UserSession.scala
@@ -73,6 +73,15 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
           case None =>
             println("Card Index not found or is not a number.")
         }
+      case "PickTie" =>
+        val maybeCardIndex: Option[Int] = (data \ "cardIndex").asOpt[Int]
+        maybeCardIndex match {
+          case Some(index) =>
+            val session = gameLobby.getUserSession(user.id)
+            gameLobby.selectTie(session, index)
+          case None =>
+            println("Card Index not found or is not a number.")
+        }
       case "KickPlayer" =>
         val maybePlayerId: Option[String] = (data \ "playerId").asOpt[String]
         maybePlayerId match {
diff --git a/knockoutwhistweb/app/util/WebsocketEventMapper.scala b/knockoutwhistweb/app/util/WebsocketEventMapper.scala
index 522bd56..8e8c2e8 100644
--- a/knockoutwhistweb/app/util/WebsocketEventMapper.scala
+++ b/knockoutwhistweb/app/util/WebsocketEventMapper.scala
@@ -36,7 +36,7 @@ object WebsocketEventMapper {
   
   // Register all custom mappers here
   registerCustomMapper(ReceivedHandEventMapper)
-  registerCustomMapper(GameStateEventMapper)
+  //registerCustomMapper(GameStateEventMapper)
   registerCustomMapper(CardPlayedEventMapper)
   registerCustomMapper(NewRoundEventMapper)
   registerCustomMapper(NewTrickEventMapper)
@@ -54,6 +54,7 @@ object WebsocketEventMapper {
     }else {
       None
     }
+    //println(s"This is getting sent to client: EVENT: ${obj.id}, STATE: ${session.gameLobby.getLogic.getCurrentState.toString}, STATEDATA: ${stateToJson(session)}, DATA: ${data}")
     Json.obj(
       "id" -> ("request-" + java.util.UUID.randomUUID().toString),
       "event" -> obj.id,