Index: src/com/example/advancewars/Game.java
===================================================================
--- src/com/example/advancewars/Game.java	(revision 681c37d5392f37cfe728d6a706512a48ed03f29b)
+++ src/com/example/advancewars/Game.java	(revision dd3e793077b60bee70554a3de51a129d8b8be9de)
@@ -53,6 +53,4 @@
             	break;
             case MENU_NEW:
-            	if(mThread.mGameState == GameState.COMP_TURN)
-            		mGameView.newRound();
             	break;
         }
Index: src/com/example/advancewars/GameState.java
===================================================================
--- src/com/example/advancewars/GameState.java	(revision 681c37d5392f37cfe728d6a706512a48ed03f29b)
+++ src/com/example/advancewars/GameState.java	(revision dd3e793077b60bee70554a3de51a129d8b8be9de)
@@ -2,5 +2,5 @@
 
 public enum GameState {
-	YOUR_TURN,
-	COMP_TURN
+	MAIN_MENU,
+	BATTLE_MAP
 }
Index: src/com/example/advancewars/GameView.java
===================================================================
--- src/com/example/advancewars/GameView.java	(revision 681c37d5392f37cfe728d6a706512a48ed03f29b)
+++ src/com/example/advancewars/GameView.java	(revision dd3e793077b60bee70554a3de51a129d8b8be9de)
@@ -105,5 +105,5 @@
             }
             
-            mGameState = GameState.YOUR_TURN;
+            mGameState = GameState.MAIN_MENU;
         }
         
@@ -117,5 +117,5 @@
                 setState(AppState.RUNNING);
                 Log.i("Blackjack", "Player's turn starting now");
-                mGameState = GameState.YOUR_TURN;
+                mGameState = GameState.MAIN_MENU;
             }
         }
@@ -314,11 +314,21 @@
         	canvas.drawColor(Color.BLACK);
         	
-        	mTextPaint.setTextSize(12);
+        	String text;
         	Paint.FontMetrics metrics = mTextPaint.getFontMetrics();
         	
-        	mMap.draw(canvas, 10, 25);
-        	
-        	String text = "Advance Wars grid test";
-        	canvas.drawText(text, 0, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
+        	switch(mGameState) {
+        	case MAIN_MENU:
+        		text = "Main Menu";
+            	canvas.drawText(text, 0, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
+        		break;
+        	case BATTLE_MAP:
+        		mTextPaint.setTextSize(12);
+            	
+            	mMap.draw(canvas, 10, 25);
+            	
+            	text = "Advance Wars grid test";
+            	canvas.drawText(text, 0, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
+        		break;
+        	}
         }
 
@@ -369,8 +379,4 @@
         setFocusable(true); // make sure we get key events
     }
-    
-    public void newRound() {        
-        thread.mGameState = GameState.YOUR_TURN;        
-    }
 
     @Override public boolean onTouchEvent(MotionEvent event) {
@@ -380,9 +386,10 @@
     		Log.i("Blackjack", "Detected UP touch action");
     		switch(thread.mGameState) {
-    		case YOUR_TURN:
-    			Log.i("Blackjack", "Player's turn");
+    		case MAIN_MENU:
+    			Log.i("Blackjack", "Switching to battle map");
+    			thread.mGameState = GameState.BATTLE_MAP;
     			break;
-    		case COMP_TURN:
-    			Log.i("Blackjack", "Computer's turn");
+    		case BATTLE_MAP:
+    			Log.i("Blackjack", "Touch event detected on battle map");
     			break;
     		}