diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/CompositeCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/CompositeCommand.java
index 12690d29..74c5e95b 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/CompositeCommand.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/CompositeCommand.java
@@ -1,23 +1,24 @@
 package mock.model.commandFactory;
 
-import java.util.Stack;
+import java.util.ArrayDeque;
+import java.util.Queue;
 
 /**
  * Wraps multiple commands into a composite to execute queued commands during a frame.
  */
 public class CompositeCommand implements Command {
-    private Stack<Command> commands;
+    private Queue<Command> commands;
 
     public CompositeCommand() {
-        this.commands = new Stack<>();
+        this.commands = new ArrayDeque<>();
     }
 
     public void addCommand(Command command) {
-        commands.push(command);
+        commands.add(command);
     }
 
     @Override
     public void execute() {
-        while(!commands.isEmpty()) commands.pop().execute();
+        while(!commands.isEmpty()) commands.remove().execute();
     }
 }
diff --git a/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java b/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
index c95a0789..66e98d89 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
@@ -64,6 +64,7 @@ public class ControllerServer extends Observable implements Runnable {
                     BoatActionDecoder boatActionDecoder = new BoatActionDecoder(encodedMessage.getMessageBody());
                     action = boatActionDecoder.getBoatAction();
 
+                    // Notify observers of most recent action
                     this.notifyObservers();
                     this.setChanged();
                 }