3 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/design/model/ScrambleLeague.java b/src/main/java/design/model/ScrambleLeague.java
index f5d17ee..adf2105 100644
--- a/src/main/java/design/model/ScrambleLeague.java
+++ b/src/main/java/design/model/ScrambleLeague.java
@@ -58,14 +58,16 @@ public class ScrambleLeague extends League {
     public String getType() {
         return "scramble";
     }
+    
     @Override
     public void recordPlay(Golfer player, Match match, Round round){
         if(!isPlayable()) return;
         Team team = player.getTeam();
         if (team == null) return;
-        int strokes = round.getTotalSwings();
-        team.addMemberRound(player, strokes);
+        int index = participants.indexOf(team);
+        team.addMemberRound(player, round.getTotalSwings());
         match.addRound(round);
+        match.addRoundFor(index, round);
     }
 
     @Override
diff --git a/src/main/java/design/model/StrokeLeague.java b/src/main/java/design/model/StrokeLeague.java
index 374a079..48889b7 100644
--- a/src/main/java/design/model/StrokeLeague.java
+++ b/src/main/java/design/model/StrokeLeague.java
@@ -49,11 +49,13 @@ public class StrokeLeague extends League {
     public String getType() {
         return "stroke";
     }
+    
     public void recordPlay(Golfer player, Match match, Round round){
         if(!isPlayable() || !participants.contains(player)) return;
-        int strokes = round.getTotalSwings();
-        totalStrokes.merge(player, strokes, Integer::sum);
+        int index = participants.indexOf(player);
+        totalStrokes.merge(player, round.getTotalSwings(), Integer::sum);
         match.addRound(round);
+        match.addRoundFor(index, round);
     }
 
     @Override
diff --git a/src/main/java/design/model/statistics/LeagueStats.java b/src/main/java/design/model/statistics/LeagueStats.java
index a4e6950..c80df07 100644
--- a/src/main/java/design/model/statistics/LeagueStats.java
+++ b/src/main/java/design/model/statistics/LeagueStats.java
@@ -24,7 +24,7 @@ public class LeagueStats implements Statistics{
     }
 
     public List<? extends Map.Entry<?, Integer>> getStandings(){
-        return league.getResults().entrySet().stream().sorted(Map.Entry.comparingByValue()).toList();
+        return league.getResults().entrySet().stream().sorted(Map.Entry.comparingByValue()).<Map.Entry<?, Integer>>map(e -> e).toList();
     }
 
     public List<?> getWinners(){