Index: src/com/medievaltech/advancewars/GameView.java
===================================================================
--- src/com/medievaltech/advancewars/GameView.java	(revision abe7b3dfb5b7b3fde546e631b3e04eabb38a0c6d)
+++ src/com/medievaltech/advancewars/GameView.java	(revision 1a1e8c7118625550a8bf352fe5c4abcdf8354b80)
@@ -1,4 +1,5 @@
 package com.medievaltech.advancewars;
 
+import com.medievaltech.game.*;
 import com.medievaltech.gui.*;
 
@@ -47,5 +48,6 @@
 
         /** Paint to draw the lines on screen. */
-        private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1, mTilePaint2;
+        private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1, mTilePaint2,
+        	mUnitPaint;
         
         private Map mMap;
@@ -88,4 +90,8 @@
             mTilePaint2.setAntiAlias(true);
             mTilePaint2.setARGB(255, 0, 0, 255);
+            
+            mUnitPaint = new Paint();
+            mUnitPaint.setAntiAlias(true);
+            mUnitPaint.setARGB(255, 255, 0, 0);
             
             wndMainMenu = new com.medievaltech.gui.Window(0, 0, 320, 450);;
@@ -106,11 +112,14 @@
     			for(int y=0; y<mMap.getHeight(); y++) {
     				if(land)
-    					mMap.setTile(x, y, grassTile);
+    					mMap.setTile(x, y, new Tile(grassTile));
     				else
-    					mMap.setTile(x, y, oceanTile);
+    					mMap.setTile(x, y, new Tile(oceanTile));
     				land = !land;
     			}
     			land = !land;
             }
+            
+            mMap.getTile(2, 3).addUnit(new Soldier(mUnitPaint));
+            mMap.getTile(5, 7).addUnit(new Soldier(mUnitPaint));
             
             mGameState = GameState.MAIN_MENU;
Index: src/com/medievaltech/advancewars/Map.java
===================================================================
--- src/com/medievaltech/advancewars/Map.java	(revision abe7b3dfb5b7b3fde546e631b3e04eabb38a0c6d)
+++ 	(revision )
@@ -1,43 +1,0 @@
-package com.medievaltech.advancewars;
-
-import android.graphics.Canvas;
-import android.graphics.Point;
-
-public class Map {
-	private Tile[][] grid;
-	
-	public Map(int width, int height) {
-		grid = new Tile[width][height];
-	}
-	
-	public Map(Tile t, int width, int height) {
-		grid = new Tile[width][height];
-		
-		for(int x=0; x<getWidth(); x++)
-			for(int y=0; y<getHeight(); y++)
-				grid[x][y] = t;
-	}
-	
-	public int getWidth() {
-		return grid.length;
-	}
-	
-	public int getHeight() {
-		return grid[0].length;
-	}
-	
-	public void setTile(int x, int y, Tile t) {
-		grid[x][y] = t;
-	}
-	
-	public void draw(Canvas c, int xStart, int yStart) {
-		for(int x=0; x<getWidth(); x++)
-			for(int y=0; y<getHeight(); y++)
-				grid[x][y].draw(c, xStart+50*x, yStart+50*y);
-	}
-	
-	public Tile getTile(Point point)
-	{
-		return grid[point.x][point.y];
-	}
-}
Index: src/com/medievaltech/advancewars/Tile.java
===================================================================
--- src/com/medievaltech/advancewars/Tile.java	(revision abe7b3dfb5b7b3fde546e631b3e04eabb38a0c6d)
+++ 	(revision )
@@ -1,42 +1,0 @@
-package com.medievaltech.advancewars;
-
-import com.medievaltech.game.Unit;
-
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Point;
-
-public class Tile {
-	public enum TerrainType
-	{
-		LAND, SEA
-	}
-	
-	TerrainType type;
-	public double moveCoefficent;
-	public Unit currentUnit;
-	public Point point;
-	
-	public void addUnit(Unit unit)
-	{
-		currentUnit = unit;	
-	}
-	
-	public void removeUnit(Unit unit)
-	{
-		if(currentUnit != null)
-		{
-			currentUnit = null;
-		}
-	
-	}
-	private Paint p;
-	
-	public Tile(Paint p) {
-		this.p = p;
-	}
-	
-	public void draw(Canvas c, int x, int y) {
-		c.drawRect(x, y, x+50, y+50, p);
-	}
-}