diff --git a/src/backend/AutoPlayer.java b/src/backend/AutoPlayer.java
index e7a3779..db673f5 100644
--- a/src/backend/AutoPlayer.java
+++ b/src/backend/AutoPlayer.java
@@ -2,86 +2,33 @@ package backend;
 
 import java.util.ArrayList;
 import java.util.Random;
-
 public class AutoPlayer {
 	private Random rand = new Random();
-	
-	
-	/**
-	 * returns the best Move to try on provided board for active player
-	 * @param board
-	 * @return
-	 */
+
 	public Move computeBestMove(Board board) {
 		ArrayList<Move> allMoves = new ArrayList<>();
-		Move bestMove = null;
-		int bestScore = Integer.MIN_VALUE;
-		
-		//Detect Ai's color
-		boolean aiIsWhite = board.isTurnWhite();
-		
 		//Go through all pieces on the board
 		for(Piece piece : board.getPieces()) {
 			//only choose the active color's piece
 			if(piece.isWhite() == board.isTurnWhite()) {
 				//Get valid moves for this piece
 				ArrayList<int[]> validMoves = board.getValidMoves(piece);
-				
 				//convert each position into a move object
 				for (int[] dest : validMoves) {
-					Board simulatedBoard = new Board(board);//copy the board first
-					Piece simpiece = simulatedBoard.board[piece.getY()][piece.getX()]; //get matching piece in the copied board
 					Move move = new Move(piece, dest[0], dest[1]);
-					simulatedBoard.playMove(move);
-					
-					int score = evaluate(simulatedBoard, aiIsWhite);
-					
-					if (score > bestScore) {
-						bestScore = score;
-						bestMove = new Move(piece, dest[0], dest[1]);//use original piece for
-					}
+					allMoves.add(move);
 				}
 			}
 		}
-		return bestMove;
-	}
-		//Helper method to score a board state
-	private int evaluate(Board board, boolean aiIsWhite) {
-			int score = 0;
+		//Pick a random move from the list
+		if (!allMoves.isEmpty()) {
+			return allMoves.get(rand.nextInt(allMoves.size()));
 			
-			for (Piece p : board.getPieces()) {
-				int value = 0;
-				
-				switch (p.getType()) {
-				case Pawn:
-					value = 1;
-					break;
-				case Knight:
-				case Bishop: 
-					value = 3;
-					break;
-				case Rook:
-					value = 5;
-					break;
-				case Queen:
-				    value = 9;
-				    break; 
-				case King:
-					value = 1000;
-					break;
-				}
-			
-		//Add value if iit's current turnn's color, subtract if opponent
-		     if (p.isWhite() == aiIsWhite) {
-			     score += value;
-		     }
-		     else {
-			     score -= value;
-		     }
+		}
+		return null;
+		
 	}
-		return score;
-}
-}
 	
 	
+}
 
diff --git a/src/backend/Board.java b/src/backend/Board.java
index 5f14069..8b7d184 100644
--- a/src/backend/Board.java
+++ b/src/backend/Board.java
@@ -428,23 +428,30 @@ public class Board {
 
 	public void playMove(Move move) {
 		//get current piece coordinate
-		int fromX = move.piece.getX();
-		int fromY = move.piece.getY();
-		//Remove the piece from the original position
-		board[fromX][fromY] = null;
-		//Update the internal position of the piece
-		move.piece.setX(move.toX);
-		move.piece.setY(move.toY);
-		//place the piece at the new position
-		board[move.toY][move.toX] = move.piece;
-		
-		//end turn logic
-		this.turnWhite = !this.turnWhite;
-		this.turnNumber++;
-		
-		//Clear selection/highlight
-		this.selectedPosition = null;
-		this.highlightedPositions.clear();
+				int fromX = move.piece.getX();
+				int fromY = move.piece.getY();
+				int toX = move.toX;
+				int toY = move.toY;
+				
+				Piece movingPiece = move.piece;
+			    Piece capturedPiece = board[toY][toX]; // capture if any
+				
+				 moveHistory.add(new MoveRecord(movingPiece, capturedPiece, fromX, fromY, toX, toY,turnNumber, turnWhite));
+				//Remove the piece from the original position
+				board[fromY][fromX] = null;
+				//Update the internal position of the piece
+				move.piece.setX(toX);
+				move.piece.setY(toY);
+				//place the piece at the new position
+				board[toY][toX] = move.piece;
+				
+				//end turn logic
+				this.turnWhite = !this.turnWhite;
+				this.turnNumber++;
+				
+				//Clear selection/highlight
+				this.selectedPosition = null;
+				this.highlightedPositions.clear();
 		
 
 	}