diff --git a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
index a9e7c5b6639e8a2a8728809d9b17c8d155baf9b6..f0a83809964a944a4f0435fc5a306601923606bc 100644
--- a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
+++ b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
@@ -111,8 +111,7 @@ public class DotsAndBoxesGrid {
         }
 
         // A box is complete if the north and south horizontals and the east and west verticals have all been drawn.
-        // FIXME: You'll need to fix this code (after writing a test first).
-        return true;
+        return horizontals[x][y] && horizontals[x][y + 1] && verticals[x][y] && verticals[x + 1][y];
     }
 
     /** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */
@@ -139,8 +138,9 @@ public class DotsAndBoxesGrid {
             throw new IndexOutOfBoundsException(String.format("y was %d, which is out of range. Range is 0 to %d", y, height));
         }
 
-        // FIXME: You need to throw an exception if the line was already drawn.
-
+        if (this.horizontals[x][y]){
+            throw new IllegalStateException("Horizontal line is already drawn here");
+        }
         this.horizontals[x][y] = true;
 
         // Try to claim the north or south boxes
@@ -170,7 +170,9 @@ public class DotsAndBoxesGrid {
             throw new IndexOutOfBoundsException(String.format("y was %d, which is out of range. Range is 0 to %d", y, height - 1));
         }
 
-        // You need to throw an exception if the line was already drawn.
+        if (this.verticals[x][y]){
+            throw new IllegalStateException("Vertical line is already drawn here");
+        }
 
         this.verticals[x][y] = true;
         // Try to claim the north or south boxes