Index: .hgignore
===================================================================
--- .hgignore	(revision 2e798d95f569ccfa2996c5b196e0ea0ecad4f6fd)
+++ .hgignore	(revision 2e798d95f569ccfa2996c5b196e0ea0ecad4f6fd)
@@ -0,0 +1,5 @@
+
+syntax: regexp
+bin\*
+syntax: regexp
+bin/*
Index: src/com/example/advancewars/GameView.java
===================================================================
--- src/com/example/advancewars/GameView.java	(revision 5d9e7bb16ff8265f4388276fc3d0d3e4f9f78923)
+++ src/com/example/advancewars/GameView.java	(revision 2e798d95f569ccfa2996c5b196e0ea0ecad4f6fd)
@@ -47,5 +47,7 @@
 
         /** Paint to draw the lines on screen. */
-        private Paint mLinePaint, mTextPaint, mButtonPaint;
+        private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1, mTilePaint2;
+        
+        private Map mMap;
 
         /** Indicate whether the surface has been created & is ready to draw */
@@ -61,6 +63,5 @@
             mHandler = handler;
             mContext = context;
-
-            // Initialize paints for speedometer
+            
             mLinePaint = new Paint();
             mLinePaint.setAntiAlias(true);
@@ -77,4 +78,30 @@
             mButtonPaint.setTextSize(20);
             mButtonPaint.setTextAlign(Paint.Align.CENTER);
+            
+            mTilePaint1 = new Paint();
+            mTilePaint1.setAntiAlias(true);
+            mTilePaint1.setARGB(255, 0, 255, 0);
+            
+            mTilePaint2 = new Paint();
+            mTilePaint2.setAntiAlias(true);
+            mTilePaint2.setARGB(255, 0, 0, 255);
+            
+            Tile grassTile = new Tile(mTilePaint1);
+            Tile oceanTile = new Tile(mTilePaint2);
+            
+            mMap = new Map(grassTile, 6, 8);
+            
+            boolean land = true;
+            
+            for(int x=0; x<mMap.getWidth(); x++) {
+    			for(int y=0; y<mMap.getHeight(); y++) {
+    				if(land)
+    					mMap.setTile(x, y, grassTile);
+    				else
+    					mMap.setTile(x, y, oceanTile);
+    				land = !land;
+    			}
+    			land = !land;
+            }
             
             mGameState = GameState.YOUR_TURN;
@@ -290,12 +317,8 @@
         	Paint.FontMetrics metrics = mTextPaint.getFontMetrics();
         	
-        	String text = "Your Total: ";
-        	canvas.drawText(text, 40-mTextPaint.measureText(text)/2, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
+        	mMap.draw(canvas, 10, 25);
         	
-        	text = "Dealer Total: ";
-        	canvas.drawText(text, 125-mTextPaint.measureText(text)/2, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
-        	
-        	text = mPlayerWins+" wins - "+mPlayerLosses+" losses";
-        	canvas.drawText(text, 270-mTextPaint.measureText(text)/2, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
+        	String text = "Advance Wars grid test";
+        	canvas.drawText(text, 0, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
         }
 
Index: src/com/example/advancewars/Map.java
===================================================================
--- src/com/example/advancewars/Map.java	(revision 2e798d95f569ccfa2996c5b196e0ea0ecad4f6fd)
+++ src/com/example/advancewars/Map.java	(revision 2e798d95f569ccfa2996c5b196e0ea0ecad4f6fd)
@@ -0,0 +1,37 @@
+package com.example.advancewars;
+
+import android.graphics.Canvas;
+
+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);
+	}
+}
Index: src/com/example/advancewars/Tile.java
===================================================================
--- src/com/example/advancewars/Tile.java	(revision 2e798d95f569ccfa2996c5b196e0ea0ecad4f6fd)
+++ src/com/example/advancewars/Tile.java	(revision 2e798d95f569ccfa2996c5b196e0ea0ecad4f6fd)
@@ -0,0 +1,17 @@
+package com.example.advancewars;
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+
+public class Tile {
+	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);
+	}
+}