diff --git a/Mage.Network/src/main/java/org/mage/network/Client.java b/Mage.Network/src/main/java/org/mage/network/Client.java
index f7b4ac9d101..0f5161c2895 100644
--- a/Mage.Network/src/main/java/org/mage/network/Client.java
+++ b/Mage.Network/src/main/java/org/mage/network/Client.java
@@ -33,8 +33,8 @@ import mage.view.TournamentView;
 import mage.view.UserDataView;
 import mage.view.UserView;
 import org.apache.log4j.Logger;
-import org.mage.network.handlers.client.ClientExceptionHandler;
 import org.mage.network.handlers.PingMessageHandler;
+import org.mage.network.handlers.client.ClientExceptionHandler;
 import org.mage.network.handlers.client.ClientMessageHandler;
 import org.mage.network.handlers.client.ClientRegisteredMessageHandler;
 import org.mage.network.handlers.client.HeartbeatHandler;
@@ -412,7 +412,11 @@ public class Client {
     }
 
     public void cheat(UUID gameId, UUID playerId, DeckCardLists importDeck) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        try {
+            clientMessageHandler.cheat(gameId, playerId, importDeck);
+        } catch (Exception ex) {
+            logger.error("Error cheating", ex);
+        }
     }
 
     public UUID joinGame(UUID gameId) {
diff --git a/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java b/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java
index a4d4a95a4b1..5b5e335b61f 100644
--- a/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java
+++ b/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java
@@ -23,6 +23,7 @@ import org.mage.network.interfaces.MageClient;
 import org.mage.network.messages.ClientMessage;
 import org.mage.network.messages.requests.ChatMessageRequest;
 import org.mage.network.messages.requests.ChatRoomIdRequest;
+import org.mage.network.messages.requests.CheatRequest;
 import org.mage.network.messages.requests.CreateTableRequest;
 import org.mage.network.messages.requests.CreateTournamentRequest;
 import org.mage.network.messages.requests.GetRoomRequest;
@@ -321,4 +322,8 @@ public class ClientMessageHandler extends SimpleChannelInboundHandler<ClientMess
         ctx.writeAndFlush(new StopWatchingRequest(gameId)).addListener(WriteListener.getInstance());
     }
 
+    public void cheat(UUID gameId, UUID playerId, DeckCardLists importDeck) {
+        ctx.writeAndFlush(new CheatRequest(gameId, playerId, importDeck)).addListener(WriteListener.getInstance());
+    }
+
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/interfaces/MageServer.java b/Mage.Network/src/main/java/org/mage/network/interfaces/MageServer.java
index e37ba81676b..6b079642fc0 100644
--- a/Mage.Network/src/main/java/org/mage/network/interfaces/MageServer.java
+++ b/Mage.Network/src/main/java/org/mage/network/interfaces/MageServer.java
@@ -78,5 +78,7 @@ public interface MageServer {
     void stopWatching(UUID gameId, String sessionId);
     
     void pingTime(long milliSeconds, String sessionId);
+    
+    void cheat(UUID gameId, String sessionId, UUID playerId, DeckCardLists deckList);
 
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/CheatRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/CheatRequest.java
new file mode 100644
index 00000000000..305389c9f99
--- /dev/null
+++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/CheatRequest.java
@@ -0,0 +1,28 @@
+package org.mage.network.messages.requests;
+
+import io.netty.channel.ChannelHandlerContext;
+import java.util.UUID;
+import mage.cards.decks.DeckCardLists;
+import org.mage.network.interfaces.MageServer;
+
+/**
+ *
+ * @author Bill
+ */
+public class CheatRequest extends ServerRequest {
+    private final UUID gameId;
+    private final UUID playerId;
+    private final DeckCardLists importDeck;
+
+    public CheatRequest(UUID gameId, UUID playerId, DeckCardLists importDeck) {
+        this.gameId = gameId;
+        this.playerId = playerId;
+        this.importDeck = importDeck;
+    }
+
+    @Override
+    public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
+        server.cheat(gameId, getSessionId(ctx), playerId, importDeck);
+    }
+    
+}
diff --git a/Mage.Server/src/main/java/mage/server/ServerMain.java b/Mage.Server/src/main/java/mage/server/ServerMain.java
index 8fd6e580d51..7016510ab38 100644
--- a/Mage.Server/src/main/java/mage/server/ServerMain.java
+++ b/Mage.Server/src/main/java/mage/server/ServerMain.java
@@ -797,20 +797,15 @@ public class ServerMain implements MageServer {
     public ServerState getServerState() {
         return state;
     }
-//
-//    @Override
-//    public void cheat(final UUID gameId, final String sessionId, final UUID playerId, final DeckCardLists deckList) throws MageException {
-//        execute("cheat", sessionId, new Action() {
-//            @Override
-//            public void execute() {
-//                if (testMode) {
-//                    UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
-//                    GameManager.getInstance().cheat(gameId, userId, playerId, deckList);
-//                }
-//            }
-//        });
-//    }
-//
+
+    @Override
+    public void cheat(final UUID gameId, final String sessionId, final UUID playerId, final DeckCardLists deckList) {
+        if (testMode) {
+            UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
+            GameManager.getInstance().cheat(gameId, userId, playerId, deckList);
+        }
+    }
+
 //    @Override
 //    public boolean cheat(final UUID gameId, final String sessionId, final UUID playerId, final String cardName) throws MageException {
 //        return executeWithResult("cheatOne", sessionId, new ActionWithBooleanResult() {