Index: src/com/medievaltech/advancewars/GameView.java
===================================================================
--- src/com/medievaltech/advancewars/GameView.java	(revision 113d7cfbe433bf0f295c897fe301c6e7b1c3cf4e)
+++ src/com/medievaltech/advancewars/GameView.java	(revision bdd63ba42e11abecb0d2eebfe085ea638cd9a080)
@@ -464,5 +464,16 @@
     				int y = ((int)event.getY() - thread.mMap.offset.y) / 50;
     				
-    				thread.selectedUnit = thread.mMap.getTile(x, y).currentUnit;
+    				Unit target = thread.mMap.getTile(x, y).currentUnit;
+    				
+    				if(thread.selectedUnit != null && thread.selectedUnit.getMovementRange().contains(new Point(x, y))) {
+    					if(target == null || target == thread.selectedUnit) {
+	    						thread.mMap.getTile(thread.selectedUnit.location.x, thread.selectedUnit.location.y).removeUnit();
+	    						thread.mMap.getTile(x, y).addUnit(thread.selectedUnit);
+    					}else {
+    						// the target contains another unit. If the unit is enemy-controlled, attack it
+    					}
+    					thread.selectedUnit = null;
+    				}else
+    					thread.selectedUnit = target;
     			}
     			
Index: src/com/medievaltech/advancewars/Tile.java
===================================================================
--- src/com/medievaltech/advancewars/Tile.java	(revision 113d7cfbe433bf0f295c897fe301c6e7b1c3cf4e)
+++ src/com/medievaltech/advancewars/Tile.java	(revision bdd63ba42e11abecb0d2eebfe085ea638cd9a080)
@@ -37,5 +37,5 @@
 	}
 	
-	public void removeUnit(Unit unit) {
+	public void removeUnit() {
 		if(currentUnit != null) {
 			currentUnit = null;
Index: st.txt
===================================================================
--- test.txt	(revision 113d7cfbe433bf0f295c897fe301c6e7b1c3cf4e)
+++ 	(revision )
@@ -1,1 +1,0 @@
-Created to test commit/push permissions. Will be deleted eventually.