77 files changed, 3756 insertions, 548 deletions

diff --git a/.classpath b/.classpath
index 9697427..e0c30ac 100644
--- a/.classpath
+++ b/.classpath
@@ -6,5 +6,6 @@
         <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="lib" path="lib/lombok.jar"/>
         <classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>
diff --git a/lib/lombok.jar b/lib/lombok.jar
new file mode 100755
index 0000000..4141433
--- /dev/null
+++ b/lib/lombok.jar
diff --git a/src/com/wordpress/tipsforjava/swing/StretchIcon.java b/src/com/wordpress/tipsforjava/swing/StretchIcon.java
index d41bbfe..7c7181f 100644
--- a/src/com/wordpress/tipsforjava/swing/StretchIcon.java
+++ b/src/com/wordpress/tipsforjava/swing/StretchIcon.java
@@ -31,6 +31,11 @@ import javax.swing.ImageIcon;
 public class StretchIcon extends ImageIcon {
 
         /**
+         * 
+         */
+        private static final long serialVersionUID = 6948448082634127156L;
+
+        /**
          * Determines whether the aspect ratio of the image is maintained. Set to
          * <code>false</code> to distort the image to fill the component.
          */
diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index 4759a6e..f8b013f 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -6,8 +6,7 @@ import java.util.List;
 import javax.swing.JApplet;
 
 import esieequest.controller.GameEngine;
-import esieequest.model.Game;
-import esieequest.view.View;
+import esieequest.view.Viewable;
 import esieequest.view.app.Applet;
 import esieequest.view.app.Window;
 import esieequest.view.text.Console;
@@ -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,8 +45,7 @@ public class Main extends JApplet {
          */
         public static void main(final String[] args) {
                 final List<String> arguments = Arrays.asList(args);
-                Game game;
-                View view;
+                Viewable view;
 
                 if (arguments.contains("--file")) {
                         if (arguments.size() < 2) {
@@ -62,13 +59,7 @@ public class Main extends JApplet {
                         view = new Window();
                 }
 
-                if (arguments.contains("--challenge")) {
-                        game = new Game(50);
-                } 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 df3d34a..df83384 100644
--- a/src/esieequest/controller/GameEngine.java
+++ b/src/esieequest/controller/GameEngine.java
@@ -4,7 +4,7 @@ import esieequest.controller.commands.Command;
 import esieequest.model.Game;