diff --git a/chess/board.js b/chess/board.js
index 775f806..796cd97 100644
--- a/chess/board.js
+++ b/chess/board.js
@@ -234,6 +234,26 @@ var Board = (function() {
       return move;
     }
 
+    function undoMove() {
+      var board = [];
+      var last = state[state.length - 1].board;
+      var x,y;
+      for (var i=0;i<last.length;i += 2) {
+        var pos = last[i];
+        x = pos % 8;
+        y = (pos / 8) | 0;
+        var ct = last[i+1];
+        var type = (ct / 6) | 0;
+        var color = ct % 6;
+        board.push([type,color,x,y]);
+      }
+      state.pop();
+      move--;
+      tomove = !tomove;
+      initState(board, tomove);
+      Chess.newGameState('playing');
+    }
+
     var Board = {};
     Board.init = init;
     Board.tick = tick;
@@ -253,5 +273,6 @@ var Board = (function() {
     Board.initState = initState;
     Board.inCheck = inCheck;
     Board.setCheck = setCheck;
+    Board.undoMove = undoMove;
     return Board;
   })();
diff --git a/chess/chess.js b/chess/chess.js
index 21b62a9..c388a3a 100644
--- a/chess/chess.js
+++ b/chess/chess.js
@@ -99,21 +99,8 @@ var Chess = (function() {
             Input.mouse.buttons[0] = 0;
             var dx = Input.mouse.x;
             var dy = Input.mouse.y;
-            if (move == Board.getMove()) {
-              Pieces.select(dx,dy);
-              move = Board.getMove();
-            }
-          } else if (Input.key_state[32]) {
-            Input.key_state[32] = 0;
-            startPlayback();
-          } else if (Input.key_state[Key.LEFT]) {
-            Input.key_state[Key.LEFT] = 0;
-            move > 0 ? --move : 0;
-            Board.setState(move);
-          } else if (Input.key_state[Key.RIGHT]) {
-            Input.key_state[Key.RIGHT] = 0;
-            move < Board.getMove() ? move++ : move;
-            Board.setState(move);
+            Pieces.select(dx,dy);
+            move = Board.getMove();
           }
         }
       } else {
diff --git a/chess/pieces.js b/chess/pieces.js
index 185979f..709f4f3 100644
--- a/chess/pieces.js
+++ b/chess/pieces.js
@@ -395,7 +395,7 @@ var Pieces = (function() {
           selected = false;
           setMoveTarget(selsquare, square, 1000);
           setAnimatingCB(Publish.sendMove);
-//          Chess.newGameState('moved');
+          Chess.newGameState('moved');
         }
       }
     }
diff --git a/chess/publish.js b/chess/publish.js
index 8dd7fba..7ec5414 100644
--- a/chess/publish.js
+++ b/chess/publish.js
@@ -171,12 +171,14 @@ var Publish = (function() {
       cmd.to = req.from.id;
     }
     FB.ui(cmd, function(response) {
-      if (response && !response.error) {
-        player.active_req = 0;
-        removeRequest(req);
-        Chess.newGameState('menu');
-      }
-    });
+        if (response && !response.error) {
+          player.active_req = 0;
+          removeRequest(req);
+          Chess.newGameState('menu');
+        } else {
+          Board.undoMove();
+        }
+      });
   }
 
   function sendMove() {