diff --git a/src/main/java/parser/Parser.java b/src/main/java/parser/Parser.java
index 28d6519f26..83718b1ee4 100644
--- a/src/main/java/parser/Parser.java
+++ b/src/main/java/parser/Parser.java
@@ -1,9 +1,19 @@
 package parser;
 
 import command.Command;
+import command.fight.FightingCommand;
 
 public class Parser {
+
     public Command parserCommand(String userCommand){
-        return null;
+        Command command;
+        switch (userCommand) {
+        case "fight":
+            command = new FightingCommand();
+            break;
+        default:
+            command = null;
+        }
+        return command;
     }
 }
diff --git a/src/test/java/parser/ParserTest.java b/src/test/java/parser/ParserTest.java
new file mode 100644
index 0000000000..5a6f33107f
--- /dev/null
+++ b/src/test/java/parser/ParserTest.java
@@ -0,0 +1,32 @@
+package parser;
+
+import java.util.Arrays;
+
+import command.Command;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class ParserTest {
+
+    private Parser parser;
+
+    @BeforeEach
+    public void setup() {
+        this.parser = new Parser();
+    }
+
+    @Test
+    public void parse_emptyInput_returnsIncorrect() {
+        final String[] emptyInputs = { "", "  ", "\n  \n" };
+        parseAndAssertEmpty(emptyInputs);
+    }
+
+    public void parseAndAssertEmpty(String[] inputs) {
+        for (String input : inputs) {
+            final Command result = parser.parserCommand(input);
+            assertNull(result);
+        }
+    }
+}