diff --git a/bin/cards/maumau/gui/GameTableModel.class b/bin/cards/maumau/gui/GameTableModel.class
index eafd47f..961bf9c 100644
Binary files a/bin/cards/maumau/gui/GameTableModel.class and b/bin/cards/maumau/gui/GameTableModel.class differ
diff --git a/bin/cards/maumau/gui/PlayerFrame.class b/bin/cards/maumau/gui/PlayerFrame.class
index 98f538d..af19f5d 100644
Binary files a/bin/cards/maumau/gui/PlayerFrame.class and b/bin/cards/maumau/gui/PlayerFrame.class differ
diff --git a/bin/cards/maumau/model/ActionHandler.class b/bin/cards/maumau/model/ActionHandler.class
index f329904..f288d9a 100644
Binary files a/bin/cards/maumau/model/ActionHandler.class and b/bin/cards/maumau/model/ActionHandler.class differ
diff --git a/bin/cards/maumau/model/GameState.class b/bin/cards/maumau/model/GameState.class
index 808c0e9..bde6402 100644
Binary files a/bin/cards/maumau/model/GameState.class and b/bin/cards/maumau/model/GameState.class differ
diff --git a/bin/cards/maumau/model/gamestate/GamePlay.class b/bin/cards/maumau/model/gamestate/GamePlay.class
new file mode 100644
index 0000000..95c92cd
Binary files /dev/null and b/bin/cards/maumau/model/gamestate/GamePlay.class differ
diff --git a/bin/cards/maumau/model/gamestate/Initialized.class b/bin/cards/maumau/model/gamestate/Initialized.class
new file mode 100644
index 0000000..ac5170d
Binary files /dev/null and b/bin/cards/maumau/model/gamestate/Initialized.class differ
diff --git a/src/cards/maumau/model/ActionHandler.java b/src/cards/maumau/model/ActionHandler.java
index e4cbbdb..cf99291 100644
--- a/src/cards/maumau/model/ActionHandler.java
+++ b/src/cards/maumau/model/ActionHandler.java
@@ -2,6 +2,7 @@ package cards.maumau.model;
 
 import cards.Card;
 import cards.Suit;
+import cards.maumau.model.gamestate.*;
 
 /**
  * Manages the actions and state transitions within a MauMau game.
@@ -11,6 +12,10 @@ class ActionHandler {
     private Suit chosenSuit;
     private int ctr7 = 0;
 
+    private GameState gameState;
+
+    private GamePlay gameplay;
+
     /**
      * Constructs an ActionHandler for the specified MauMau game.
      *
@@ -18,6 +23,8 @@ class ActionHandler {
      */
     ActionHandler(MauMau game) {
         this.game = game;
+        gameState = GameState.GAME_PLAY;
+        gameplay = new Initialized();
     }
 
     /**
diff --git a/src/cards/maumau/model/GameState.java b/src/cards/maumau/model/GameState.java
index b85a2c7..a87cebb 100644
--- a/src/cards/maumau/model/GameState.java
+++ b/src/cards/maumau/model/GameState.java
@@ -7,23 +7,14 @@ public enum GameState {
     /**
      * The game has been initialized, but has not yet started.
      */
-    GAME_INITIALIZED,
+    GAME_PLAY,
     /**
      * The game is over. The final ranking of players can be
      * obtained using {@link MauMau#getRanking()}.
      */
-    GAME_OVER,
+    GAME_FINISHED,
     /**
      * The game has been canceled due to insufficient cards.
      */
     GAME_CANCELED,
-    /**
-     * The game is currently in progress with players taking turns.
-     */
-    PLAY,
-    /**
-     * The game is in progress and the current player has played
-     * a Jack, and is required to choose a suit.
-     */
-    CHOOSE_SUIT
 }
diff --git a/src/cards/maumau/model/gamestate/GamePlay.java b/src/cards/maumau/model/gamestate/GamePlay.java
new file mode 100644
index 0000000..d054e15
--- /dev/null
+++ b/src/cards/maumau/model/gamestate/GamePlay.java
@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public interface GamePlay<T> {
+
+}
diff --git a/src/cards/maumau/model/gamestate/Initialized.java b/src/cards/maumau/model/gamestate/Initialized.java
new file mode 100644
index 0000000..7dc949b
--- /dev/null
+++ b/src/cards/maumau/model/gamestate/Initialized.java
@@ -0,0 +1,7 @@
+package cards.maumau.model.gamestate;
+
+import cards.maumau.model.GameState;
+
+public class Initialized implements GamePlay <GameState> {
+    
+}