diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..a89a654
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>aatwi.dev</groupId>
+    <artifactId>mars-rover-refactoring-kata</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.platform</groupId>
+                        <artifactId>junit-platform-surefire-provider</artifactId>
+                        <version>1.0.0</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>5.0.0</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-surefire-provider</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/src/main/java/mars/rover/MarsRover.java b/src/main/java/mars/rover/MarsRover.java
new file mode 100644
index 0000000..7dbedc1
--- /dev/null
+++ b/src/main/java/mars/rover/MarsRover.java
@@ -0,0 +1,42 @@
+package mars.rover;
+
+public class MarsRover {
+
+    public static String move(int x, int y, char direction, String instructions) {
+        if (!instructions.isEmpty()) {
+            char instruction = instructions.charAt(0);
+            if (instruction == 'L') {
+                if (direction == 'N') {
+                    return move(x, y, 'W', instructions.substring(1, instructions.length()));
+                } else if (direction == 'W') {
+                    return move(x, y, 'S', instructions.substring(1, instructions.length()));
+                } else if (direction == 'S') {
+                    return move(x, y, 'E', instructions.substring(1, instructions.length()));
+                } else if (direction == 'E') {
+                    return move(x, y, 'N', instructions.substring(1, instructions.length()));
+                }
+            } else if (instruction == 'R') {
+                if (direction == 'N') {
+                    return move(x, y, 'E', instructions.substring(1, instructions.length()));
+                } else if (direction == 'W') {
+                    return move(x, y, 'N', instructions.substring(1, instructions.length()));
+                } else if (direction == 'S') {
+                    return move(x, y, 'W', instructions.substring(1, instructions.length()));
+                } else if (direction == 'E') {
+                    return move(x, y, 'S', instructions.substring(1, instructions.length()));
+                }
+            } else if (instruction == 'M') {
+                if (direction == 'N') {
+                    return move(x, y + 1, 'N', instructions.substring(1, instructions.length()));
+                } else if (direction == 'S') {
+                    return move(x, y - 1, 'S', instructions.substring(1, instructions.length()));
+                } else if (direction == 'W') {
+                    return move(x - 1, y, 'W', instructions.substring(1, instructions.length()));
+                } else if (direction == 'E') {
+                    return move(x + 1, y, 'E', instructions.substring(1, instructions.length()));
+                }
+            }
+        }
+        return x + " " + y + " " + direction;
+    }
+}
diff --git a/src/test/java/mars/rover/MarsRoverTest.java b/src/test/java/mars/rover/MarsRoverTest.java
new file mode 100644
index 0000000..7289c3c
--- /dev/null
+++ b/src/test/java/mars/rover/MarsRoverTest.java
@@ -0,0 +1,23 @@
+package mars.rover;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class MarsRoverTest {
+
+    @Test
+    public void
+    acceptance_test_1() {
+        String newPosition = MarsRover.move(1, 2, 'N', "LMLMLMLMM");
+        assertEquals("1 3 N", newPosition);
+    }
+
+    @Test
+    public void
+    acceptance_test_2() {
+        String newPosition = MarsRover.move(3, 3, 'E', "MMRMMRMRRM");
+        assertEquals("5 1 E", newPosition);
+    }
+
+}
\ No newline at end of file