1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/design/model/holeplay/SetupState.java b/src/main/java/design/model/holeplay/SetupState.java
index 2715e7c..d49ea0e 100644
--- a/src/main/java/design/model/holeplay/SetupState.java
+++ b/src/main/java/design/model/holeplay/SetupState.java
@@ -3,15 +3,16 @@ package design.model.holeplay;
 import design.model.Hole;
 
 public class SetupState implements HoleState {
+
     @Override
     public void enter(HolePlayContext ctx) {
-        /* no-op */ }
+        ctx.clearInProgressPlay(); // Maybe we don't need this?
+    }
 
     @Override
     public void handleStart(HolePlayContext ctx) {
-        // Pull current hole number & par from Round/Course
-        Hole start = ctx.getRound().getStartingHole(); // or compute from current-hole tracking if you add it
-        ctx.beginNewPlay(start.getNumber(), start.getPar());
+        Hole hole = ctx.getRound().getCurrentHole();
+        ctx.beginNewPlay(hole.getNumber());
         ctx.setState(new PlayState());
     }