diff --git a/solutions/java/wizards-and-warriors-2/1/src/main/java/GameMaster.java b/solutions/java/wizards-and-warriors-2/1/src/main/java/GameMaster.java
new file mode 100644
index 00000000..d0e7d08f
--- /dev/null
+++ b/solutions/java/wizards-and-warriors-2/1/src/main/java/GameMaster.java
@@ -0,0 +1,26 @@
+public class GameMaster {
+
+    public String describe(Character character) {
+        return "You're a level " + character.getLevel() + " " + character.getCharacterClass() + " with " + character.getHitPoints() + " hit points.";
+    }
+
+    public String describe(Destination destination) {
+        return "You've arrived at " + destination.getName() + ", which has " + destination.getInhabitants() + " inhabitants.";
+    }
+
+    public String describe(TravelMethod travelMethod) {
+        if (travelMethod == TravelMethod.WALKING) {
+            return "You're traveling to your destination by walking.";
+        } else {
+            return "You're traveling to your destination on horseback.";
+        }
+    }
+
+    public String describe(Character character, Destination destination, TravelMethod travelMethod) {
+        return describe(character) + " " + describe(travelMethod) + " " + describe(destination);
+    }
+
+    public String describe(Character character, Destination destination) {
+        return describe(character) + " " + describe(TravelMethod.WALKING) + " " + describe(destination);
+    }
+}
diff --git a/solutions/java/wizards-and-warriors-2/1/src/main/java/TravelMethod.java b/solutions/java/wizards-and-warriors-2/1/src/main/java/TravelMethod.java
new file mode 100644
index 00000000..59d258ca
--- /dev/null
+++ b/solutions/java/wizards-and-warriors-2/1/src/main/java/TravelMethod.java
@@ -0,0 +1,4 @@
+public enum TravelMethod {
+    WALKING,
+    HORSEBACK
+}