Index: res/layout/main.xml
===================================================================
--- res/layout/main.xml	(revision 4666fae269693feb5cd590f9fa66afb09a922c18)
+++ res/layout/main.xml	(revision bb2fa26a9c1a32b7ef6280d825b638c058943586)
@@ -3,5 +3,5 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
-	<com.medievaltech.advancewars.GameView android:id="@+id/lunar"
+	<com.medievaltech.advancewars.GameView android:id="@+id/main_view"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent" /> 
Index: res/menu/map_menu.xml
===================================================================
--- res/menu/map_menu.xml	(revision bb2fa26a9c1a32b7ef6280d825b638c058943586)
+++ res/menu/map_menu.xml	(revision bb2fa26a9c1a32b7ef6280d825b638c058943586)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/attack"
+          android:title="@string/unit_menu_attack" />
+	<item android:id="@+id/move"
+          android:title="@string/unit_menu_move" />
+    <item android:id="@+id/cancel"
+          android:title="@string/unit_menu_cancel" />
+</menu>
Index: res/values/strings.xml
===================================================================
--- res/values/strings.xml	(revision 4666fae269693feb5cd590f9fa66afb09a922c18)
+++ res/values/strings.xml	(revision bb2fa26a9c1a32b7ef6280d825b638c058943586)
@@ -7,3 +7,6 @@
     <string name="menu_main">Main Menu</string>
     <string name="menu_exit">Exit</string>
+    <string name="unit_menu_attack">Attack</string>
+    <string name="unit_menu_move">Move</string>
+    <string name="unit_menu_cancel">Cancel</string>
 </resources>
Index: src/com/medievaltech/advancewars/Game.java
===================================================================
--- src/com/medievaltech/advancewars/Game.java	(revision 4666fae269693feb5cd590f9fa66afb09a922c18)
+++ src/com/medievaltech/advancewars/Game.java	(revision bb2fa26a9c1a32b7ef6280d825b638c058943586)
@@ -6,6 +6,10 @@
 import android.os.Bundle;
 import android.util.Log;
+import android.view.ContextMenu;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Window;
 
@@ -77,8 +81,11 @@
         // turn off the window's title bar
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-
+        
         // tell system to use the layout defined in our XML file
         setContentView(R.layout.main);
-
+        
+        /*View v = findViewById(R.id.main_view);
+        Log.i("AdvanceWars", "view is null?: " + (v==null));*/
+        
         Static.game = this;
 
@@ -90,4 +97,12 @@
             Static.gameState = (GameState)savedInstanceState.getSerializable("gameState");
         }
+    }
+    
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v,
+                                    ContextMenuInfo menuInfo) {
+      super.onCreateContextMenu(menu, v, menuInfo);
+      MenuInflater inflater = getMenuInflater();
+      inflater.inflate(R.menu.map_menu, menu);
     }
 
Index: src/com/medievaltech/advancewars/GameView.java
===================================================================
--- src/com/medievaltech/advancewars/GameView.java	(revision 4666fae269693feb5cd590f9fa66afb09a922c18)
+++ src/com/medievaltech/advancewars/GameView.java	(revision bb2fa26a9c1a32b7ef6280d825b638c058943586)
@@ -12,4 +12,5 @@
 import android.os.*;
 import android.view.*;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -209,8 +210,5 @@
         }
     }
-
-    /** Pointer to the text view to display "Paused.." etc. */
-    //private TextView mStatusText;
-
+    
     public GameView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -233,6 +231,6 @@
     		switch(Static.gameState) {
     		case MAIN_MENU:
-    			Log.i("AdvanceWars", "Switching to battle map");
     			if(Static.wndMainMenu.getGUIObject("btnNewGame").isClicked(event.getX(), event.getY())) {
+    				Log.i("AdvanceWars", "Switching to battle map");
     				Static.gameState = GameState.BATTLE_MAP;
     			}else if(Static.wndMainMenu.getGUIObject("btnLoadGame").isClicked(event.getX(), event.getY())) {
@@ -293,16 +291,25 @@
     				int y = ((int)event.getY() - Static.map.offset.y) / 50;
     				
+    				Log.i("AdvanceWars", "About to show context menu");
+    				showContextMenu();
+    				
+    				/*
+    				
     				Unit target = Static.map.getTile(x, y).currentUnit;
     				
     				if(Static.thread.selectedUnit != null && Static.thread.selectedUnit.getMovementRange().contains(new Point(x, y))) {
+    					//Display a menu allowing the player to move to the target or attack the target or
+    					//get more info on the target
+    					
     					if(target == null || target == Static.thread.selectedUnit) {
     							Static.map.getTile(Static.thread.selectedUnit.location.x, Static.thread.selectedUnit.location.y).removeUnit();
     							Static.map.getTile(x, y).addUnit(Static.thread.selectedUnit);
     					}else {
-    						// the target contains another unit. If the unit is enemy-controlled, attack it
+    						// Display a context menu that gives the option of attacking the target
     					}
     					Static.thread.selectedUnit = null;
     				}else
     					Static.thread.selectedUnit = target;
+    				*/
     			}