diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs
index ed5eaee..cc21d4c 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs	
@@ -24,6 +24,14 @@ namespace Advanced_Software_Engineering {
         /// <param name="fullCommand">The command as a string</param>
         /// <returns>A IVerb that maches the command</returns>
         public static IVerb MakeVerb(Drawer drawer, string fullCommand) {
+            //Remove comments
+            string tmp = "";
+            foreach(char character in fullCommand) {
+                if (character == "@"[0]) break;
+                tmp += character;
+            }
+            fullCommand = tmp;
+
             ValueStorage rootValueStorage = drawer.GetValueStorage();
 
             List<VerbChunk> verbChunks = drawer.verbChunks;