52 files changed, 3396 insertions, 101 deletions

diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index 6e7c0f2..f8b013f 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -6,7 +6,6 @@ import java.util.List;
 import javax.swing.JApplet;
 
 import esieequest.controller.GameEngine;
-import esieequest.model.Game;
 import esieequest.view.Viewable;
 import esieequest.view.app.Applet;
 import esieequest.view.app.Window;
@@ -32,9 +31,8 @@ public class Main extends JApplet {
          */
         @Override
         public void init() {
-                final Game game = new Game();
                 final Applet applet = new Applet(this);
-                new GameEngine(game, applet);
+                new GameEngine(applet);
         }
 
         /**
@@ -47,7 +45,6 @@ public class Main extends JApplet {
          */
         public static void main(final String[] args) {
                 final List<String> arguments = Arrays.asList(args);
-                Game game;
                 Viewable view;
 
                 if (arguments.contains("--file")) {
@@ -62,13 +59,7 @@ public class Main extends JApplet {
                         view = new Window();
                 }
 
-                if (arguments.contains("--challenge")) {
-                        game = new Game(true);
-                } else {
-                        game = new Game();
-                }
-
-                new GameEngine(game, view);
+                new GameEngine(view);
         }
 
 }
diff --git a/src/esieequest/controller/GameEngine.java b/src/esieequest/controller/GameEngine.java
index c3a8725..df83384 100644
--- a/src/esieequest/controller/GameEngine.java
+++ b/src/esieequest/controller/GameEngine.java
@@ -25,7 +25,7 @@ public class GameEngine {
          * @param view
          *            the view
          */
-        public GameEngine(final Game game, final Viewable view) {
+        public GameEngine(final Viewable view, final Game game) {
                 this.game = game;
                 this.view = view;
 
@@ -35,13 +35,35 @@ public class GameEngine {
         }
 
         /**
+         * Instantiates a game with the given view and mode.
+         * 
+         * @param view
+         *            the view
+         * @param challengeMode
+         *            the mode
+         */
+        public GameEngine(final Viewable view, final boolean challengeMode) {
+                this(view, new Game(challengeMode));
+        }
+
+        /**
+         * Instantiates a game with the given view.
+         * 
+         * @param view
+         *            the view
+         */
+        public GameEngine(final Viewable view) {
+                this(view, false);
+        }
+
+        /**
          * Interprets a command.
          * 
          * @param commandString
          *            the command String
          */
         public void interpret(final String inputString) {
-                final Input input = new Input(inputString.toLowerCase());
+                final Input input = new Input(inputString/* .toLowerCase() */);
 
                 final Command command = input.getCommand();
                 if (command == null) {
@@ -56,7 +78,7 @@ public class GameEngine {
         }
 
         /**
-         * Actions executed every time a Command is entered.
+         * Performs routine actions executed every time a Command is entered.
          */
         private void executeRoutines() {
                 MovingCharacter.moveAll();
diff --git a/src/esieequest/controller/commands/Command.java b/src/esieequest/controller/commands/Command.java
index 7ab6961..094b0cf 100644
--- a/src/esieequest/controller/commands/Command.java
+++ b/src/esieequest/controller/commands/Command.java
@@ -3,7 +3,7 @@ package esieequest.controller.commands;
 import java.util.ArrayList;
 import java.util.List;
 
-import esieequest.controller.Utils;
+import esieequest.controller.utils.ListUtils;
 import esieequest.model.Game;
 import esieequest.model.Text;
 import esieequest.view.Viewable;
@@ -94,7 +94,7 @@ public enum Command {
          * @return a String listing all the names of the Command-s
          */
         public static String listCommandsNamesString() {
-                return Utils.listToString(Command.listCommandsNames(), Text.HELP_PREFIX.getText(), null, Text.HELP_SUFFIX.getText());
+                return ListUtils.listToString(Command.listCommandsNames(), Text.HELP_PREFIX.getText(), null, Text.HELP_SUFFIX.getText());
         }
 
 }
diff --git a/src/esieequest/controller/commands/GoCommand.java b/src/esieequest/controller/commands/GoCommand.java
index 9ebdf49..1c528fa 100644
--- a/src/esieequest/controller/commands/GoCommand.java
+++ b/src/esieequest/controller/commands/GoCommand.java