65 files changed, 2128 insertions, 1345 deletions

diff --git a/.classpath b/.classpath
index 8836eed..9697427 100644
--- a/.classpath
+++ b/.classpath
@@ -4,5 +4,7 @@
         <classpathentry kind="src" path="res"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
+        <classpathentry kind="lib" path="lib/guava-16.0.1.jar"/>
+        <classpathentry kind="lib" path="lib/guava-gwt-16.0.1.jar"/>
         <classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>
diff --git a/lib/guava-16.0.1.jar b/lib/guava-16.0.1.jar
new file mode 100644
index 0000000..2c8127d
--- /dev/null
+++ b/lib/guava-16.0.1.jar
diff --git a/lib/guava-gwt-16.0.1.jar b/lib/guava-gwt-16.0.1.jar
new file mode 100644
index 0000000..d49ada7
--- /dev/null
+++ b/lib/guava-gwt-16.0.1.jar
diff --git a/report/progression.tex b/report/progression.tex
index 1a74d8d..0108d2d 100644
--- a/report/progression.tex
+++ b/report/progression.tex
@@ -382,12 +382,21 @@ Moving characters that can move to adjacent rooms once permitted were added.
 
 \section{Zuul even better}
 
+86d6f56dd - A code refactoring was done.
+
 \subsection{Inheritance}
 
+Inheritance (and interfaces) was already used for Character-s, Door-s, Item-s,
+and View-s since the beginning.
+
 \subsection{Abstract Command}
 
+The Performer class was replaced by multiple Command sub-types.
+
 \subsection{Packages}
 
+The code was already organised in packages.
+
 
 \section{Zuul without BlueJ}
 
diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index 362af9c..4759a6e 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -47,7 +47,7 @@ public class Main extends JApplet {
          */
         public static void main(final String[] args) {
                 final List<String> arguments = Arrays.asList(args);
-                final Game game = new Game();
+                Game game;
                 View view;
 
                 if (arguments.contains("--file")) {
@@ -63,7 +63,9 @@ public class Main extends JApplet {
                 }
 
                 if (arguments.contains("--challenge")) {
-                        game.getPlayer().setMaxNbSteps(50);
+                        game = new Game(50);
+                } else {
+                        game = new Game();
                 }
 
                 new GameEngine(game, view);
diff --git a/src/esieequest/controller/GameEngine.java b/src/esieequest/controller/GameEngine.java
index c09967b..df3d34a 100644
--- a/src/esieequest/controller/GameEngine.java
+++ b/src/esieequest/controller/GameEngine.java
@@ -1,6 +1,9 @@
 package esieequest.controller;
 
+import esieequest.controller.commands.Command;
 import esieequest.model.Game;
+import esieequest.model.Text;
+import esieequest.model.characters.MovingCharacter;
 import esieequest.view.View;
 
 /**
@@ -14,8 +17,6 @@ public class GameEngine {
         private final Game game;
         private final View view;
 
-        private final Interpreter interpreter;
-
         /**
          * Instantiates a game engine with the given model and view.
          * 
@@ -30,19 +31,35 @@ public class GameEngine {
 
                 this.view.setController(this);
 
-                this.interpreter = new Interpreter(this.game, this.view);
-
                 this.view.show();
         }
 
         /**
-         * Interprets a command (forward it to the interpreter).
+         * Interprets a command.
          * 
          * @param commandString
-         *            the command string
+