From e10f2b3d079439d149f9a9a929d7805cbf410969 Mon Sep 17 00:00:00 2001
From: Lukasz Baldyga <c3ypt1c@gmail.com>
Date: Sun, 15 Nov 2020 05:43:04 +0000
Subject: [PATCH] Moved Verb to IVerb

---
 .../Advanced Software Engineering Tests.xml   |  76 ++++++-------
 .../CommandTester.cs                          | 106 +++++++++---------
 .../Advanced Software Engineering.csproj      |   3 +-
 .../Commander.cs                              |  20 ++--
 .../Verbs/DrawingVerbs/Circle.cs              |   8 +-
 .../Verbs/DrawingVerbs/Clear.cs               |   8 +-
 .../Verbs/DrawingVerbs/Dot.cs                 |   6 +-
 .../Verbs/DrawingVerbs/DrawLines.cs           |   4 +-
 .../Verbs/DrawingVerbs/DrawTo.cs              |   4 +-
 .../Verbs/DrawingVerbs/Fill.cs                |   6 +-
 .../Verbs/DrawingVerbs/FillColor.cs           |   4 +-
 .../Verbs/DrawingVerbs/MoveTo.cs              |   4 +-
 .../Verbs/DrawingVerbs/PenColor.cs            |   4 +-
 .../Verbs/DrawingVerbs/Quadrilateral.cs       |  12 +-
 .../Verbs/DrawingVerbs/Rectangle.cs           |   4 +-
 .../Verbs/DrawingVerbs/RegularPolygon.cs      |   4 +-
 .../Verbs/DrawingVerbs/ResetPen.cs            |   4 +-
 .../Verbs/DrawingVerbs/Square.cs              |  14 +--
 .../Verbs/DrawingVerbs/Triangle.cs            |  18 +--
 .../Verbs/IVerb.cs                            |  19 ++++
 .../Verbs/Verb.cs                             |  19 ----
 .../Verbs/VerbFactory.cs                      |   6 +-
 22 files changed, 177 insertions(+), 176 deletions(-)
 create mode 100644 Advanced Software Engineering/Advanced Software Engineering/Verbs/IVerb.cs
 delete mode 100644 Advanced Software Engineering/Advanced Software Engineering/Verbs/Verb.cs

diff --git a/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml b/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml
index dbef365..7427dec 100644
--- a/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml	
+++ b/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml	
@@ -6,7 +6,7 @@
     <members>
         <member name="T:Advanced_Software_Engineering_Tests.CommandTester">
             <summary>
-            The CommandTester class tests the commands possible, mostly by getting a verb and checking it's description..
+            The CommandTester class tests the commands possible, mostly by getting a IVerb and checking it's description..
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.VerbFactoryTester_Automatic1">
@@ -29,107 +29,107 @@
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.MoveToTester_Manual1">
             <summary>
-            tests the "move" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.MoveTo" />.
+            tests the "move" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.MoveTo"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.MoveToTester_Manual2">
             <summary>
-            tests the "moveto" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.MoveTo" />.
+            tests the "moveto" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.MoveTo"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.DrawToTester_Manual1">
             <summary>
-            tests the "drawto" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.DrawTo" />.
+            tests the "drawto" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.DrawTo"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.DrawToTester_Manual2">
             <summary>
-            tests the "line" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.DrawTo" />.
+            tests the "line" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.DrawTo"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.DrawToTester_Manual3">
             <summary>
-            tests the "lineto" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.DrawTo" />.
+            tests the "lineto" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.DrawTo"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.RegularPolygonTester_Manual1">
             <summary>
-            tests the "regularpolygon" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.RegularPolygon" />.
+            tests the "regularpolygon" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.RegularPolygon"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.RegularPolygonTester_Manual2">
             <summary>
-            tests the "rp" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.RegularPolygon" />.
+            tests the "rp" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.RegularPolygon"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.RegularPolygonTester_Manual3">
             <summary>
-            tests the "regularpolygon" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.RegularPolygon" />.
+            tests the "regularpolygon" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.RegularPolygon"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.RegularPolygonTester_Manual4">
             <summary>
-            tests the "rp" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.RegularPolygon" />.
+            tests the "rp" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.RegularPolygon"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.SquareTester_Manual1">
             <summary>
-            tests the "square" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Square" />.
+            tests the "square" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Square"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.SquareTester_Manual2">
             <summary>
-            tests the "square" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Square" />.
+            tests the "square" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Square"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.QuadrilateralTester_Manual1">
             <summary>
-            tests the "quadrilateral" command using <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.DrawLines" />. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Quadrilateral" />.
+            tests the "quadrilateral" command using <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.DrawLines"/>. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Quadrilateral"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.CircleTester_Manual1">
             <summary>
-            Tests the "circle" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Circle" />.
+            Tests the "circle" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Circle"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.TriangleTester_Manual1">
             <summary>
-            tests the "triangle" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Triangle" />.
+            tests the "triangle" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Triangle"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.TriangleTester_Manual2">
             <summary>
-            tests the "triangle" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Triangle" />.
+            tests the "triangle" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Triangle"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.DotTester_Manual1">
             <summary>
-            test the "dot" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Dot" />.
+            test the "dot" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Dot"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.ClearTester_Manual1">
             <summary>
-            tests the "clear" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Circle" />.
+            tests the "clear" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.Circle"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.ResetPenTester_Manual1">
             <summary>
-            Tests the "reset" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.ResetPen" />
+            Tests the "reset" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.ResetPen"/>
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.ResetPenTester_Manual2">
             <summary>
-            Tests the "resetpen" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.ResetPen" />.
+            Tests the "resetpen" command. See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.ResetPen"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.PenTester_Manual1">
             <summary>
-            Tests the command "pen". See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.PenColor" />
+            Tests the command "pen". See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.PenColor"/>
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.FillTester_Manual1">
             <summary>
-            Tests the command "fill". See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.FillColor" />.
+            Tests the command "fill". See <see cref="T:Advanced_Software_Engineering.Verbs.DrawingVerbs.FillColor"/>.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.CommandTester.IfTester_Manual1">
@@ -165,7 +165,7 @@
         </member>
         <member name="T:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester">
             <summary>
-            This class tests <see cref="T:Advanced_Software_Engineering.SettingsAndHelperFunctions" /> methods. It uses a combination of manual and random tests.
+            This class tests <see cref="T:Advanced_Software_Engineering.SettingsAndHelperFunctions"/> methods. It uses a combination of manual and random tests.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.Strip_Random1">
@@ -175,73 +175,73 @@
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.Strip_Manual1">
             <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.Strip(System.String)" /> test
+            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.Strip(System.String)"/> test
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.Strip_Manual2">
             <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.Strip(System.String)" /> test
+            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.Strip(System.String)"/> test
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.StripStringArray_Manual1">
             <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.StripStringArray(System.String[])" /> test.
+            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.StripStringArray(System.String[])"/> test.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.StripStringArray_Manual2">
             <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.StripStringArray(System.String[])" /> test.
+            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.StripStringArray(System.String[])"/> test.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.CommandAndParameterParser_Manual1">
             <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)" /> test.
+            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)"/> test.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.CommandAndParameterParser_Manual2">
             <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)" /> test.
+            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)"/> test.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.CommandAndParameterParser_Manual3">
             <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)" /> test.
+            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)"/> test.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.CommandAndParameterParser_Manual4">
             <summary>
-            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)" /> test.
+            Manual <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)"/> test.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.SettingsAndHelperFunctionsTester.CommandAndParameterParser_Random1">
             <summary>
-            Random <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)" /> test.
+            Random <see cref="M:Advanced_Software_Engineering.SettingsAndHelperFunctions.CommandAndParameterParser(System.String)"/> test.
             </summary>
         </member>
         <member name="T:Advanced_Software_Engineering_Tests.ValueHelperTester">
             <summary>
-            This class tests <see cref="T:Advanced_Software_Engineering.Verbs.ValueHelper" /> methods. It uses a combination of manual and random tests.
+            This class tests <see cref="T:Advanced_Software_Engineering.Verbs.ValueHelper"/> methods. It uses a combination of manual and random tests.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.ValueHelperTester.ConvertToInt_Random1">
             <summary>
-            Random <see cref="M:Advanced_Software_Engineering.Verbs.ValueHelper.ConvertToInt(System.String)" /> test.
+            Random <see cref="M:Advanced_Software_Engineering.Verbs.ValueHelper.ConvertToInt(System.String)"/> test.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.ValueHelperTester.ConvertToDouble_Random1">
             <summary>
-            Random <see cref="M:Advanced_Software_Engineering.Verbs.ValueHelper.ConvertToDouble(System.String)" /> test.
+            Random <see cref="M:Advanced_Software_Engineering.Verbs.ValueHelper.ConvertToDouble(System.String)"/> test.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.ValueHelperTester.ConvertToDouble_Random2">
             <summary>
-            Random <see cref="M:Advanced_Software_Engineering.Verbs.ValueHelper.ConvertToDouble(System.String)" /> test.
+            Random <see cref="M:Advanced_Software_Engineering.Verbs.ValueHelper.ConvertToDouble(System.String)"/> test.
             </summary>
         </member>
         <member name="M:Advanced_Software_Engineering_Tests.ValueHelperTester.ConvertToDouble_Random3">
             <summary>
-            Random <see cref="M:Advanced_Software_Engineering.Verbs.ValueHelper.ConvertToDouble(System.String)" /> test.
+            Random <see cref="M:Advanced_Software_Engineering.Verbs.ValueHelper.ConvertToDouble(System.String)"/> test.
             </summary>
         </member>
     </members>
-</doc>
\ No newline at end of file
+</doc>
diff --git a/Advanced Software Engineering/Advanced Software Engineering Tests/CommandTester.cs b/Advanced Software Engineering/Advanced Software Engineering Tests/CommandTester.cs
index b05f6b8..98f4862 100644
--- a/Advanced Software Engineering/Advanced Software Engineering Tests/CommandTester.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering Tests/CommandTester.cs	
@@ -8,7 +8,7 @@ using System.Drawing;
 namespace Advanced_Software_Engineering_Tests {
 
     /// <summary>
-    /// The CommandTester class tests the commands possible, mostly by getting a verb and checking it's description..
+    /// The CommandTester class tests the commands possible, mostly by getting a IVerb and checking it's description..
     /// </summary>
     [TestClass]
     public class CommandTester {
@@ -61,18 +61,18 @@ namespace Advanced_Software_Engineering_Tests {
                         input += inputParameter + (paramater - 1 != commandParameterNumbers ? ", " : "");
                     }
 
-                    Verb verb = VerbFactory.MakeVerb(null, input);
+                    IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
                     if (command == "moveto") {
-                        string verbDesc = verb.GetDescription();
+                        string verbDesc = IVerb.GetDescription();
                         string correctDesc = "Move origin to " + inputParameters[0] + ", " + inputParameters[1];
                         Assert.AreEqual(correctDesc, verbDesc);
                     } else if (command == "drawto" || command == "lineto" || command == "line") {
-                        string verbDesc = verb.GetDescription();
+                        string verbDesc = IVerb.GetDescription();
                         string correctDesc = "Draw line " + inputParameters[0] + ", " + inputParameters[1];
                         Assert.AreEqual(correctDesc, verbDesc);
                     } else if (command == "shape") {
-                        string verbDesc = verb.GetDescription();
+                        string verbDesc = IVerb.GetDescription();
                         string correctDesc;
                         if (commandParameterNumbers == 2)
                             correctDesc = "Draws a " + inputParameters[0] + " sided regular polygon, with rotation of 0 radians, with inner radius of " + (double)inputParameters[1];
@@ -92,9 +92,9 @@ namespace Advanced_Software_Engineering_Tests {
             string input = "move 200, 300";
             string[] inputParameters = { "200", "300" };
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
-            string verbDesc = verb.GetDescription();
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Move origin to " + inputParameters[0] + ", " + inputParameters[1];
             Assert.AreEqual(correctDesc, verbDesc);
         }
@@ -107,9 +107,9 @@ namespace Advanced_Software_Engineering_Tests {
             string input = "moveto 200, 300";
             string[] inputParameters = { "200", "300" };
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
-            string verbDesc = verb.GetDescription();
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Move origin to " + inputParameters[0] + ", " + inputParameters[1];
             Assert.AreEqual(correctDesc, verbDesc);
         }
@@ -121,8 +121,8 @@ namespace Advanced_Software_Engineering_Tests {
         public void DrawToTester_Manual1() {
             string input = "drawto 200, 300";
             string[] inputParameters = { "200", "300" };
-            Verb verb = VerbFactory.MakeVerb(null, input);
-            string verbDesc = verb.GetDescription();
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Draw line " + inputParameters[0] + ", " + inputParameters[1];
             Assert.AreEqual(correctDesc, verbDesc);
         }
@@ -134,8 +134,8 @@ namespace Advanced_Software_Engineering_Tests {
         public void DrawToTester_Manual2() {
             string input = "line 200, 300";
             string[] inputParameters = { "200", "300" };
-            Verb verb = VerbFactory.MakeVerb(null, input);
-            string verbDesc = verb.GetDescription();
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Draw line " + inputParameters[0] + ", " + inputParameters[1];
             Assert.AreEqual(correctDesc, verbDesc);
         }
@@ -147,8 +147,8 @@ namespace Advanced_Software_Engineering_Tests {
         public void DrawToTester_Manual3() {
             string input = "lineto 200, 300";
             string[] inputParameters = { "200", "300" };
-            Verb verb = VerbFactory.MakeVerb(null, input);
-            string verbDesc = verb.GetDescription();
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Draw line " + inputParameters[0] + ", " + inputParameters[1];
             Assert.AreEqual(correctDesc, verbDesc);
         }
@@ -160,9 +160,9 @@ namespace Advanced_Software_Engineering_Tests {
         public void RegularPolygonTester_Manual1() {
             string input = "regularpolygon 3, 50";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
-            string verbDesc = verb.GetDescription();
+            string verbDesc = IVerb.GetDescription();
 
             int sides = 3;
             double scale = 50;
@@ -179,9 +179,9 @@ namespace Advanced_Software_Engineering_Tests {
         public void RegularPolygonTester_Manual2() {
             string input = "rp 3, 50";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
-            string verbDesc = verb.GetDescription();
+            string verbDesc = IVerb.GetDescription();
 
             int sides = 3;
             double scale = 50;
@@ -198,9 +198,9 @@ namespace Advanced_Software_Engineering_Tests {
         public void RegularPolygonTester_Manual3() {
             string input = "regularpolygon 3, 50, 25";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
-            string verbDesc = verb.GetDescription();
+            string verbDesc = IVerb.GetDescription();
 
             int sides = 3;
             double scale = 50;
@@ -217,9 +217,9 @@ namespace Advanced_Software_Engineering_Tests {
         public void RegularPolygonTester_Manual4() {
             string input = "rp 3, 50, 25";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
-            string verbDesc = verb.GetDescription();
+            string verbDesc = IVerb.GetDescription();
 
             int sides = 3;
             double scale = 50;
@@ -236,9 +236,9 @@ namespace Advanced_Software_Engineering_Tests {
         public void SquareTester_Manual1() {
             string input = "square 500";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
-            string verbDesc = verb.GetDescription();
+            string verbDesc = IVerb.GetDescription();
 
             int sides = 4;
             double scale = 500;
@@ -255,9 +255,9 @@ namespace Advanced_Software_Engineering_Tests {
         public void SquareTester_Manual2() {
             string input = "square 500, 45";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
-            string verbDesc = verb.GetDescription();
+            string verbDesc = IVerb.GetDescription();
 
             int sides = 4;
             double scale = 500;
@@ -280,9 +280,9 @@ namespace Advanced_Software_Engineering_Tests {
                 new Point(7, 8)
             };
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
-            string verbDesc = verb.GetDescription();
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = new DrawLines(null, points).GetDescription();
 
             Assert.AreEqual(verbDesc, correctDesc);
@@ -295,9 +295,9 @@ namespace Advanced_Software_Engineering_Tests {
         public void CircleTester_Manual1() {
             string input = "circle 100";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
-            string verbDesc = verb.GetDescription();
+            string verbDesc = IVerb.GetDescription();
 
             string correctDesc = "Draws a circle radius " + 100d.ToString() + ", with origin of the pen";
 
@@ -311,9 +311,9 @@ namespace Advanced_Software_Engineering_Tests {
         public void TriangleTester_Manual1() {
             string input = "triangle 500";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
-            string verbDesc = verb.GetDescription();
+            string verbDesc = IVerb.GetDescription();
 
             int sides = 3;
             double scale = 500;
@@ -330,9 +330,9 @@ namespace Advanced_Software_Engineering_Tests {
         public void TriangleTester_Manual2() {
             string input = "triangle 500, 45";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
 
-            string verbDesc = verb.GetDescription();
+            string verbDesc = IVerb.GetDescription();
 
             int sides = 3;
             double scale = 500;
@@ -349,8 +349,8 @@ namespace Advanced_Software_Engineering_Tests {
         public void DotTester_Manual1() {
             string input = "dot";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
-            string verbDesc = verb.GetDescription();
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Places a dot where the pen currently is";
 
             Assert.AreEqual(correctDesc, verbDesc);
@@ -362,8 +362,8 @@ namespace Advanced_Software_Engineering_Tests {
         [TestMethod]
         public void ClearTester_Manual1() {
             string input = "clear";
-            Verb verb = VerbFactory.MakeVerb(null, input);
-            string verbDesc = verb.GetDescription();
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Clears the canvas";
 
             Assert.AreEqual(correctDesc, verbDesc);
@@ -375,8 +375,8 @@ namespace Advanced_Software_Engineering_Tests {
         [TestMethod]
         public void ResetPenTester_Manual1() {
             string input = "reset";
-            Verb verb = VerbFactory.MakeVerb(null, input);
-            string verbDesc = verb.GetDescription();
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Moves pen to the start (0, 0)";
 
             Assert.AreEqual(correctDesc, verbDesc);
@@ -388,8 +388,8 @@ namespace Advanced_Software_Engineering_Tests {
         [TestMethod]
         public void ResetPenTester_Manual2() {
             string input = "resetpen";
-            Verb verb = VerbFactory.MakeVerb(null, input);
-            string verbDesc = verb.GetDescription();
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Moves pen to the start (0, 0)";
 
             Assert.AreEqual(correctDesc, verbDesc);
@@ -401,8 +401,8 @@ namespace Advanced_Software_Engineering_Tests {
         [TestMethod]
         public void PenTester_Manual1() {
             string input = "pen red";
-            Verb verb = VerbFactory.MakeVerb(null, input);
-            string verbDesc = verb.GetDescription();
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Set pen color to: Color [Red]";
 
             Assert.AreEqual(correctDesc, verbDesc);
@@ -414,8 +414,8 @@ namespace Advanced_Software_Engineering_Tests {
         [TestMethod]
         public void FillTester_Manual1() {
             string input = "fill pink";
-            Verb verb = VerbFactory.MakeVerb(null, input);
-            string verbDesc = verb.GetDescription();
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Set fill color to: Color [Pink]";
 
             Assert.AreEqual(correctDesc, verbDesc);
@@ -428,8 +428,8 @@ namespace Advanced_Software_Engineering_Tests {
         public void IfTester_Manual1() {
             string input = "if i == 10";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
-            string verbDesc = verb.GetDescription();
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Tests if variable 'i' is equal to 10";
 
             Assert.AreEqual(correctDesc, verbDesc);
@@ -442,8 +442,8 @@ namespace Advanced_Software_Engineering_Tests {
         public void MethodTester_Manual1() {
             string input = "def duck, int i";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
-            string verbDesc = verb.GetDescription();
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Create a new method called 'duck' with input 'int i'. The method: ";
 
             Assert.AreEqual(correctDesc, verbDesc);
@@ -456,8 +456,8 @@ namespace Advanced_Software_Engineering_Tests {
         public void ValueTester_Manual1() {
             string input = "int i = 10";
 
-            Verb verb = VerbFactory.MakeVerb(null, input);
-            string verbDesc = verb.GetDescription();
+            IVerb IVerb = VerbFactory.MakeVerb(null, input);
+            string verbDesc = IVerb.GetDescription();
             string correctDesc = "Declares and sets integer 'i' to '10'";
 
             Assert.AreEqual(correctDesc, verbDesc);
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj
index 09515f7..b5318ee 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj	
@@ -89,8 +89,9 @@
     <Compile Include="Verbs\DrawingVerbs\ResetPen.cs" />
     <Compile Include="Verbs\DrawingVerbs\Square.cs" />
     <Compile Include="Verbs\DrawingVerbs\Triangle.cs" />
+    <Compile Include="Verbs\IValue.cs" />
     <Compile Include="Verbs\ValueHelper.cs" />
-    <Compile Include="Verbs\Verb.cs" />
+    <Compile Include="Verbs\IVerb.cs" />
     <Compile Include="Windows\AboutWindow.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Commander.cs b/Advanced Software Engineering/Advanced Software Engineering/Commander.cs
index 0be44c2..5f4ca56 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Commander.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Commander.cs	
@@ -9,7 +9,7 @@ namespace Advanced_Software_Engineering {
     /// </summary>
     public class Commander {
         private Graphics graphics;
-        private List<Verb> commands = new List<Verb>();
+        private List<IVerb> commands = new List<IVerb>();
         private Drawer drawer;
         private bool commands_ok = true;
 
@@ -22,8 +22,8 @@ namespace Advanced_Software_Engineering {
             drawer.ResetDrawer();
             drawer.SetGraphics(updateGraphicsElement);
 
-            foreach (Verb verb in this.commands) {
-                verb.ExecuteVerb();
+            foreach (IVerb IVerb in this.commands) {
+                IVerb.ExecuteVerb();
             }
         }
 
@@ -58,10 +58,10 @@ namespace Advanced_Software_Engineering {
         }
 
         /// <summary>
-        /// Adds a verb to the command list to be executed.
+        /// Adds a IVerb to the command list to be executed.
         /// </summary>
-        /// <param name="command">Verb to be added. <seealso cref="Verb"/></param>
-        public void AddCommand(Verb command) {
+        /// <param name="command">IVerb to be added. <seealso cref="IVerb"/></param>
+        public void AddCommand(IVerb command) {
             commands.Add(command);
         }
 
@@ -108,8 +108,8 @@ namespace Advanced_Software_Engineering {
 
             Console.WriteLine("\n\nHere is what the program is going to do:");
             Console.WriteLine("Set origin to 0, 0");
-            foreach (Verb verb in this.commands) {
-                Console.WriteLine(verb.GetDescription());
+            foreach (IVerb IVerb in this.commands) {
+                Console.WriteLine(IVerb.GetDescription());
             }
         }
 
@@ -131,7 +131,7 @@ namespace Advanced_Software_Engineering {
         /// Removes all commands from the Commander and resets the drawer.
         /// </summary>
         public void RemoveAllCommands() {
-            commands = new List<Verb>();
+            commands = new List<IVerb>();
             drawer.ResetDrawer();
         }
 
@@ -141,7 +141,7 @@ namespace Advanced_Software_Engineering {
         /// <returns>Explanation of all the commands</returns>
         public string ExplainCommands() {
             string desc = "";
-            foreach (Verb command in commands) {
+            foreach (IVerb command in commands) {
                 desc += command.GetDescription() + Environment.NewLine;
             }
             return desc;
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Circle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Circle.cs
index a0f1942..e9a1e33 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Circle.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Circle.cs	
@@ -1,14 +1,14 @@
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// Circle Verb class.
+    /// Circle IVerb class.
     /// </summary>
-    public class Circle : Verb {
+    public class Circle : IVerb {
         private Drawer drawer;
         private double scale;
 
         /// <summary>
-        /// Circle constructor creates the Circle verb.
+        /// Circle constructor creates the Circle IVerb.
         /// </summary>
         /// <param name="drawer">drawer</param>
         /// <param name="scale">scale of the circle</param>
@@ -18,7 +18,7 @@
         }
 
         /// <summary>
-        /// Execute the Circle verb, which is to draw a circle with the drawer.
+        /// Execute the Circle IVerb, which is to draw a circle with the drawer.
         /// </summary>
         public void ExecuteVerb() {
             drawer.DrawCircle(scale);
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Clear.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Clear.cs
index be90b9f..3371010 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Clear.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Clear.cs	
@@ -1,13 +1,13 @@
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// The Clear Verb class.
+    /// The Clear IVerb class.
     /// </summary>
-    public class Clear : Verb {
+    public class Clear : IVerb {
         private Drawer drawer;
 
         /// <summary>
-        /// Create the clear Verb
+        /// Create the clear IVerb
         /// </summary>
         /// <param name="drawer"></param>
         public Clear(Drawer drawer) {
@@ -15,7 +15,7 @@
         }
 
         /// <summary>
-        /// Execute the clear verb. It clears the drawer.
+        /// Execute the clear IVerb. It clears the drawer.
         /// </summary>
         public void ExecuteVerb() => drawer.ClearCanvas();
 
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs
index 87e923e..efe523e 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs	
@@ -1,13 +1,13 @@
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// The Dot Verb class
+    /// The Dot IVerb class
     /// </summary>
-    public class Dot : Verb {
+    public class Dot : IVerb {
         private Drawer drawer;
 
         /// <summary>
-        /// Creates the Dot Verb
+        /// Creates the Dot IVerb
         /// </summary>
         /// <param name="drawer"></param>
         public Dot(Drawer drawer) {
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawLines.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawLines.cs
index 7e0d543..b0ed41e 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawLines.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawLines.cs	
@@ -3,9 +3,9 @@
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// DrawLines Verb class
+    /// DrawLines IVerb class
     /// </summary>
-    public class DrawLines : Verb {
+    public class DrawLines : IVerb {
         private Drawer drawer;
         private Point[] points;
 
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawTo.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawTo.cs
index 2331f69..5510929 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawTo.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawTo.cs	
@@ -3,9 +3,9 @@
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// DrawTo Verb class
+    /// DrawTo IVerb class
     /// </summary>
-    public class DrawTo : Verb {
+    public class DrawTo : IVerb {
         private Drawer drawer;
         private Point moveToPoint;
 
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Fill.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Fill.cs
index e625fc4..969a588 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Fill.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Fill.cs	
@@ -1,9 +1,9 @@
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// Fill Verb class
+    /// Fill IVerb class
     /// </summary>
-    public class Fill : Verb {
+    public class Fill : IVerb {
         private Drawer drawer;
         private bool enable;
 
@@ -28,7 +28,7 @@
         /// <summary>
         /// Describes what the command will do
         /// </summary>
-        /// <returns>Description of what the verb will do</returns>
+        /// <returns>Description of what the IVerb will do</returns>
         public string GetDescription() {
             if (enable) return "Enable fill";
             else return "Disable fill";
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/FillColor.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/FillColor.cs
index 4bf7797..48d06ba 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/FillColor.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/FillColor.cs	
@@ -3,9 +3,9 @@
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// The FillColor Verb class
+    /// The FillColor IVerb class
     /// </summary>
-    public class FillColor : Verb {
+    public class FillColor : IVerb {
         private Drawer drawer;
         private Color color;
 
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/MoveTo.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/MoveTo.cs
index 3c688a3..6794d1a 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/MoveTo.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/MoveTo.cs	
@@ -3,9 +3,9 @@
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// MoveTo Verb class
+    /// MoveTo IVerb class
     /// </summary>
-    public class MoveTo : Verb {
+    public class MoveTo : IVerb {
         private Drawer drawer;
         private Point moveToPoint;
 
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/PenColor.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/PenColor.cs
index af172d1..bed68d3 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/PenColor.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/PenColor.cs	
@@ -3,9 +3,9 @@
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// The PenColor Verb class
+    /// The PenColor IVerb class
     /// </summary>
-    public class PenColor : Verb {
+    public class PenColor : IVerb {
         private Drawer drawer;
         private Color color;
 
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs
index 8b5b378..9a46414 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs	
@@ -3,10 +3,10 @@
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// The Quadrilateral Verb class
+    /// The Quadrilateral IVerb class
     /// </summary>
-    public class Quadrilateral : Verb {
-        private Verb verb;
+    public class Quadrilateral : IVerb {
+        private IVerb IVerb;
 
         /// <summary>
         /// Creates a Quadrilateral instances
@@ -17,18 +17,18 @@ namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
         /// <param name="point3">third point</param>
         /// <param name="point4">fourth point</param>
         public Quadrilateral(Drawer drawer, Point point1, Point point2, Point point3, Point point4) {
-            verb = new DrawLines(drawer, new Point[] { point1, point2, point3, point4 });
+            IVerb = new DrawLines(drawer, new Point[] { point1, point2, point3, point4 });
         }
 
         /// <summary>
         /// Draws a quadrilateral from the points
         /// </summary>
-        public void ExecuteVerb() => verb.ExecuteVerb();
+        public void ExecuteVerb() => IVerb.ExecuteVerb();
 
         /// <summary>
         /// Describes all of the points
         /// </summary>
         /// <returns>Description of the quadrilateral points</returns>
-        public string GetDescription() => verb.GetDescription();
+        public string GetDescription() => IVerb.GetDescription();
     }
 }
\ No newline at end of file
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs
index e3c8340..8b72420 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs	
@@ -5,12 +5,12 @@ using System.Drawing;
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// Rectangle Verb class
+    /// Rectangle IVerb class
     /// </summary>
     /// <todo>
     /// Correct
     /// </todo>
-    public class Rectangle : Verb {
+    public class Rectangle : IVerb {
         private Drawer drawer;
         private PointF[] points;
 
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/RegularPolygon.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/RegularPolygon.cs
index 98aca88..2c58028 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/RegularPolygon.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/RegularPolygon.cs	
@@ -5,9 +5,9 @@ using System.Drawing;
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// A class that generates a RegularPolygon verb.
+    /// A class that generates a RegularPolygon IVerb.
     /// </summary>
-    public class RegularPolygon : Verb {
+    public class RegularPolygon : IVerb {
         private Drawer drawer;
         private int sides;
         private double scale;
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/ResetPen.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/ResetPen.cs
index aa58355..e280878 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/ResetPen.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/ResetPen.cs	
@@ -3,11 +3,11 @@
     /// <summary>
     /// Setsets the pen to the initial position.
     /// </summary>
-    public class ResetPen : Verb {
+    public class ResetPen : IVerb {
         private Drawer drawer;
 
         /// <summary>
-        /// Creates the ResetPen verb
+        /// Creates the ResetPen IVerb
         /// </summary>
         /// <param name="drawer">drawer</param>
         public ResetPen(Drawer drawer) {
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Square.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Square.cs
index bb0b6e5..7feeeec 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Square.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Square.cs	
@@ -1,10 +1,10 @@
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// The Square Verb class
+    /// The Square IVerb class
     /// </summary>
-    public class Square : Verb {
-        private Verb verb;
+    public class Square : IVerb {
+        private IVerb IVerb;
 
         /// <summary>
         /// A new Squre instance. Draws squares using <see cref="RegularPolygon"/>
@@ -12,7 +12,7 @@
         /// <param name="drawer">drawer</param>
         /// <param name="scale">size of the square</param>
         public Square(Drawer drawer, double scale) {
-            verb = new RegularPolygon(drawer, 4, scale);
+            IVerb = new RegularPolygon(drawer, 4, scale);
         }
 
         /// <summary>
@@ -22,18 +22,18 @@
         /// <param name="scale">size of the square</param>
         /// <param name="offset">rotation offset in degrees</param>
         public Square(Drawer drawer, double scale, double offset) {
-            verb = new RegularPolygon(drawer, 4, scale, offset);
+            IVerb = new RegularPolygon(drawer, 4, scale, offset);
         }
 
         /// <summary>
         /// Draws the regular polygon (square)
         /// </summary>
-        public void ExecuteVerb() => verb.ExecuteVerb();
+        public void ExecuteVerb() => IVerb.ExecuteVerb();
 
         /// <summary>
         /// Gets description of how it will draw the regular polygon (square)
         /// </summary>
         /// <returns></returns>
-        public string GetDescription() => verb.GetDescription();
+        public string GetDescription() => IVerb.GetDescription();
     }
 }
\ No newline at end of file
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Triangle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Triangle.cs
index 36f2c7b..7fcc29d 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Triangle.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Triangle.cs	
@@ -3,10 +3,10 @@
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 
     /// <summary>
-    /// The Triangle Verb class
+    /// The Triangle IVerb class
     /// </summary>
-    public class Triangle : Verb {
-        private Verb verb;
+    public class Triangle : IVerb {
+        private IVerb IVerb;
 
         /// <summary>
         /// Creates a new Triangle instance using <see cref="RegularPolygon"/>.
@@ -14,7 +14,7 @@ namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
         /// <param name="drawer">drawer</param>
         /// <param name="scale">the scale of the triangle</param>
         public Triangle(Drawer drawer, double scale) {
-            verb = new RegularPolygon(drawer, 3, scale);
+            IVerb = new RegularPolygon(drawer, 3, scale);
         }
 
         /// <summary>
@@ -24,7 +24,7 @@ namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
         /// <param name="scale">the scale of the triangle</param>
         /// <param name="offset">the offset of the triangle in degrees</param>
         public Triangle(Drawer drawer, double scale, double offset) {
-            verb = new RegularPolygon(drawer, 3, scale, offset);
+            IVerb = new RegularPolygon(drawer, 3, scale, offset);
         }
 
         /// <summary>
@@ -35,18 +35,18 @@ namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
         /// <param name="point2">second point</param>
         /// <param name="point3">third point</param>
         public Triangle(Drawer drawer, Point point1, Point point2, Point point3) {
-            verb = new DrawLines(drawer, new Point[] { point1, point2, point3 });
+            IVerb = new DrawLines(drawer, new Point[] { point1, point2, point3 });
         }
 
         /// <summary>
-        /// Executes the created verb, either <see cref="RegularPolygon"/> or <see cref="DrawLines"/>.
+        /// Executes the created IVerb, either <see cref="RegularPolygon"/> or <see cref="DrawLines"/>.
         /// </summary>
-        public void ExecuteVerb() => verb.ExecuteVerb();
+        public void ExecuteVerb() => IVerb.ExecuteVerb();
 
         /// <summary>
         /// Describes how the triangle will be drawn
         /// </summary>
         /// <returns>Description of how the triangle will be drawn</returns>
-        public string GetDescription() => verb.GetDescription();
+        public string GetDescription() => IVerb.GetDescription();
     }
 }
\ No newline at end of file
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/IVerb.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/IVerb.cs
new file mode 100644
index 0000000..84aedce
--- /dev/null
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/IVerb.cs	
@@ -0,0 +1,19 @@
+namespace Advanced_Software_Engineering {
+
+    /// <summary>
+    /// IVerb is an interface for executing and getting the descriptions of Verbs. Some Verbs draw lines, some verbs will assign
+    /// </summary>
+    public interface IVerb {
+
+        /// <summary>
+        /// This executes the IVerb to the drawer inside it.
+        /// </summary>
+        void ExecuteVerb();
+
+        /// <summary>
+        /// The description of what the IVerb will do.
+        /// </summary>
+        /// <returns>A string description of what the IVerb will do</returns>
+        string GetDescription();
+    }
+}
\ No newline at end of file
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Verb.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Verb.cs
deleted file mode 100644
index 238fed8..0000000
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Verb.cs	
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Advanced_Software_Engineering {
-
-    /// <summary>
-    /// Verb is an interface for executing and getting the descriptions of Verbs. Some Verbs draw lines, some verbs will assign
-    /// </summary>
-    public interface Verb {
-
-        /// <summary>
-        /// This executes the verb to the drawer inside it.
-        /// </summary>
-        void ExecuteVerb();
-
-        /// <summary>
-        /// The description of what the Verb will do.
-        /// </summary>
-        /// <returns>A string description of what the Verb will do</returns>
-        string GetDescription();
-    }
-}
\ No newline at end of file
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs
index 7aeef60..116ec7d 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs	
@@ -12,15 +12,15 @@ namespace Advanced_Software_Engineering {
     public class VerbFactory {
 
         /// <summary>
-        /// This function returns a Verb from a command and drawer.
+        /// This function returns a IVerb from a command and drawer.
         /// </summary>
         /// <remarks>
         /// This factory is specifically useful since it automatically converts the parameters to what they should be.
         /// </remarks>
         /// <param name="drawer">The drawer to affect</param>
         /// <param name="fullCommand">The command as a string</param>
-        /// <returns>A verb that maches the command</returns>
-        public static Verb MakeVerb(Drawer drawer, string fullCommand) {
+        /// <returns>A IVerb that maches the command</returns>
+        public static IVerb MakeVerb(Drawer drawer, string fullCommand) {
             Dictionary<string, string[]> commandAndParameters = SettingsAndHelperFunctions.CommandAndParameterParser(fullCommand);
 
             if (!commandAndParameters.Keys.Contains("command")) throw new Exception("There is no command to process");