@@ -5,21 +5,21 @@ namespace CommandQueuePattern
 public class CommandQueue
 {
 // queue of commands
-private readonly Queue<CommandBase> _queue;
+private readonly Queue<ICommand> _queue;
 
 // it's true when a command is running
 private bool _isPending;
 
 public CommandQueue()
 {
 // create a queue
-_queue = new Queue<CommandBase>();
+_queue = new Queue<ICommand>();
 
 // no command is running
 _isPending = false;
 }
 
-public void Enqueue(CommandBase cmd)
+public void Enqueue(ICommand cmd)
 {
 // add a command
 _queue.Enqueue(cmd);

@@ -1,22 +1,19 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
 
 namespace CommandQueuePattern
 {
-public class FirstCmd : CommandBase
+public class FirstCmd : ICommand
 {
 private readonly GameController _owner;
 
-public override bool IsFinished { get; protected set; } = false;
+public Action OnFinished { get; set; }
 
 public FirstCmd(GameController owner)
 {
 _owner = owner;
 }
 
-public override void Execute()
+public void Execute()
 {
 // activate gameobject
 _owner.firstPopUp.gameObject.SetActive(true);
@@ -33,8 +30,7 @@ private void OnClose()
 _owner.firstPopUp.gameObject.SetActive(false);
 
 // rise the OnFinished event to say we're done with this command
-CallOnFinished();
-IsFinished = true;
+OnFinished?.Invoke();
 }
 }
 }

@@ -1,17 +1,19 @@
-namespace CommandQueuePattern
+using System;
+
+namespace CommandQueuePattern
 {
-public class SecondCmd : CommandBase
+public class SecondCmd : ICommand
 {
 private readonly GameController _owner;
 
-public override bool IsFinished { get; protected set; } = false;
-
 public SecondCmd(GameController owner)
 {
 _owner = owner;
 }
 
-public override void Execute()
+public Action OnFinished { get; set; }
+
+public void Execute()
 {
 // activate gameobject
 _owner.secondPopup.gameObject.SetActive(true);
@@ -28,8 +30,7 @@ private void OnClose()
 _owner.secondPopup.gameObject.SetActive(false);
 
 // rise the OnFinished event to say we're done with this command
-CallOnFinished();
-IsFinished = true;
+OnFinished?.Invoke();
 }
 }
 }

@@ -1,17 +1,19 @@
-namespace CommandQueuePattern
+using System;
+
+namespace CommandQueuePattern
 {
-public class ThirdCmd : CommandBase
+public class ThirdCmd : ICommand
 {
 private readonly GameController _owner;
 
-public override bool IsFinished { get; protected set; } = false;
+public Action OnFinished { get; set; }
 
 public ThirdCmd(GameController owner)
 {
 _owner = owner;
 }
 
-public override void Execute()
+public void Execute()
 {
 // activate gameobject
 _owner.thirdPopup.gameObject.SetActive(true);
@@ -28,8 +30,7 @@ private void OnClose()
 _owner.thirdPopup.gameObject.SetActive(false);
 
 // rise the OnFinished event to say we're done with this command
-CallOnFinished();
-IsFinished = true;
+OnFinished?.Invoke();
 }
 }
 }

@@ -0,0 +1,11 @@
+using System;
+
+namespace CommandQueuePattern
+{
+public interface ICommand
+{
+Action OnFinished { get; set; }
+
+void Execute();
+}
+}