===================================================================
--- original.js
+++ change.js
@@ -1,28 +1,13 @@
 var AI = function () {
-	this.makeMove = function (board, onAIMoveComplete) {
-		if (typeof onAIMoveComplete === 'function') {
-			onAIMoveComplete();
-		}
-	};
+	this.makeMove = function (board) {};
 };
 var Tile = Container.expand(function () {
 	var self = Container.call(this);
 	var tileGraphics = self.createAsset('tile', 'Game Tile', .5, .5);
 	self.state = 'empty';
-	self.flip = function (newState) {
-		self.state = newState;
-		if (self.state === 'black') {
-			self.createAsset('blackTile', 'Black Tile', .5, .5);
-		} else if (self.state === 'white') {
-			self.createAsset('whiteTile', 'White Tile', .5, .5);
-		}
-	};
-});
-var Game = Container.expand(function () {
-	var self = Container.call(this);
-	function flipTiles(board, color, x, y) {
-		var opponent = color === 'black' ? 'white' : 'black';
+	self.isValidMove = function (x, y, player, board) {
+		var opponent = player === 'black' ? 'white' : 'black';
 		var directions = [{
 			x: -1,
 			y: 0
 		}, {
@@ -46,70 +31,40 @@
 		}, {
 			x: 1,
 			y: -1
 		}];
-		directions.forEach(function (dir) {
-			var tilesToFlip = [];
-			var xIter = x + dir.x;
-			var yIter = y + dir.y;
-			while (xIter >= 0 && xIter < 8 && yIter >= 0 && yIter < 8 && board[xIter][yIter].state === opponent) {
-				tilesToFlip.push(board[xIter][yIter]);
-				xIter += dir.x;
-				yIter += dir.y;
-			}
-			if (xIter >= 0 && xIter < 8 && yIter >= 0 && yIter < 8 && board[xIter][yIter].state === color) {
-				tilesToFlip.forEach(function (tile) {
-					tile.flip(color);
-				});
-			}
-		});
-	}
-	function isValidMove(board, color, x, y) {
-		var opponent = color === 'black' ? 'white' : 'black';
-		var directions = [{
-			x: -1,
-			y: 0
-		}, {
-			x: 1,
-			y: 0
-		}, {
-			x: 0,
-			y: -1
-		}, {
-			x: 0,
-			y: 1
-		}, {
-			x: -1,
-			y: -1
-		}, {
-			x: 1,
-			y: 1
-		}, {
-			x: -1,
-			y: 1
-		}, {
-			x: 1,
-			y: -1
-		}];
 		for (var i = 0; i < directions.length; i++) {
 			var dir = directions[i];
-			var xIter = x + dir.x;
-			var yIter = y + dir.y;
-			var foundOpponent = false;
-			while (xIter >= 0 && xIter < 8 && yIter >= 0 && yIter < 8) {
-				if (board[xIter][yIter].state === opponent) {
-					foundOpponent = true;
-					xIter += dir.x;
-					yIter += dir.y;
-				} else if (board[xIter][yIter].state === color && foundOpponent) {
-					return true;
-				} else {
+			var j = 1;
+			var tilesToFlip = [];
+			while (true) {
+				var checkX = x + dir.x * j;
+				var checkY = y + dir.y * j;
+				if (checkX < 0 || checkX >= 8 || checkY < 0 || checkY >= 8) break;
+				var checkTile = board[checkX][checkY];
+				if (checkTile.state === 'empty') break;
+				if (checkTile.state === opponent) {
+					tilesToFlip.push(checkTile);
+				} else if (checkTile.state === player) {
+					if (tilesToFlip.length > 0) return true;
 					break;
 				}
+				j++;
 			}
 		}
 		return false;
-	}
+	};
+	self.flip = function (newState) {
+		self.state = newState;
+		if (self.state === 'black') {
+			self.createAsset('blackTile', 'Black Tile', .5, .5);
+		} else if (self.state === 'white') {
+			self.createAsset('whiteTile', 'White Tile', .5, .5);
+		}
+	};
+});
+var Game = Container.expand(function () {
+	var self = Container.call(this);
 	var board = [];
 	var ai = new AI();
 	var playerTurn = 'black';
 	var tile = new Tile();
@@ -125,17 +80,12 @@
 			tile.y = boardStartY + j * tile.height;
 			board[i][j] = tile;
 			tile.on('down', (function (tile, i, j) {
 				return function (obj) {
-					if (playerTurn === 'black' && tile.state === 'empty' && isValidMove(board, 'black', i, j)) {
+					if (playerTurn === 'black' && tile.state === 'empty' && tile.isValidMove(i, j, playerTurn, board)) {
 						tile.flip('black');
-						flipTiles(board, 'black', i, j);
 						playerTurn = 'white';
-						LK.setTimeout(function () {
-							ai.makeMove(board, function () {
-								playerTurn = 'black';
-							});
-						}, 0);
+						ai.makeMove(board);
 					}
 				};
 			})(tile, i, j));
 		}