diff --git a/OOP_group1A1_project/src/backend/Board.java b/OOP_group1A1_project/src/backend/Board.java
index 81f150e..21b738c 100644
--- a/OOP_group1A1_project/src/backend/Board.java
+++ b/OOP_group1A1_project/src/backend/Board.java
@@ -33,10 +33,17 @@ public class Board {
 	}
 
 	public void setPiece(boolean isWhite, PieceType type, int x, int y) {
-		//TODO
-		Piece newPiece = new Piece(x, y, isWhite, type);
-	    Pieces.add(newPiece);
-				
+	    // 1) Remove any piece already at this square
+	    for (int i = 0; i < Pieces.size(); i++) {
+	        Piece p = Pieces.get(i);
+	        if (p.getX() == x && p.getY() == y) {
+	            Pieces.remove(i);
+	            break;
+	        }
+	    }
+
+	    // 2) Add the new piece
+	    Pieces.add(new Piece(x, y, isWhite, type));
 	}
 
 	public void populateBoard() {