Index: src/com/medievaltech/unit/Artillery.java
===================================================================
--- src/com/medievaltech/unit/Artillery.java	(revision fea4b77b2fa3d94e79f364cfc993ab5a000df017)
+++ src/com/medievaltech/unit/Artillery.java	(revision c3ad11c0e1288802860309672b03e1255f430b6d)
@@ -3,5 +3,4 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9,5 +8,5 @@
 
 public class Artillery extends Unit{
-	public Artillery(Paint p) 
+	public Artillery(Player p) 
 	{
 		super(p);
Index: src/com/medievaltech/unit/Mech.java
===================================================================
--- src/com/medievaltech/unit/Mech.java	(revision fea4b77b2fa3d94e79f364cfc993ab5a000df017)
+++ src/com/medievaltech/unit/Mech.java	(revision c3ad11c0e1288802860309672b03e1255f430b6d)
@@ -3,5 +3,4 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9,5 +8,5 @@
 
 public class Mech extends Unit{
-	public Mech(Paint p) 
+	public Mech(Player p) 
 	{
 		super(p);
Index: src/com/medievaltech/unit/Recon.java
===================================================================
--- src/com/medievaltech/unit/Recon.java	(revision fea4b77b2fa3d94e79f364cfc993ab5a000df017)
+++ src/com/medievaltech/unit/Recon.java	(revision c3ad11c0e1288802860309672b03e1255f430b6d)
@@ -3,5 +3,4 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9,5 +8,5 @@
 
 public class Recon extends Unit{
-	public Recon(Paint p) 
+	public Recon(Player p) 
 	{
 		super(p);
Index: src/com/medievaltech/unit/SmTank.java
===================================================================
--- src/com/medievaltech/unit/SmTank.java	(revision fea4b77b2fa3d94e79f364cfc993ab5a000df017)
+++ src/com/medievaltech/unit/SmTank.java	(revision c3ad11c0e1288802860309672b03e1255f430b6d)
@@ -3,5 +3,4 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9,5 +8,5 @@
 
 public class SmTank extends Unit{
-	public SmTank(Paint p) 
+	public SmTank(Player p) 
 	{
 		super(p);
Index: src/com/medievaltech/unit/Soldier.java
===================================================================
--- src/com/medievaltech/unit/Soldier.java	(revision fea4b77b2fa3d94e79f364cfc993ab5a000df017)
+++ src/com/medievaltech/unit/Soldier.java	(revision c3ad11c0e1288802860309672b03e1255f430b6d)
@@ -3,5 +3,4 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9,5 +8,5 @@
 
 public class Soldier extends Unit{
-	public Soldier(Paint p) 
+	public Soldier(Player p) 
 	{
 		super(p);
Index: src/com/medievaltech/unit/Transport.java
===================================================================
--- src/com/medievaltech/unit/Transport.java	(revision fea4b77b2fa3d94e79f364cfc993ab5a000df017)
+++ src/com/medievaltech/unit/Transport.java	(revision c3ad11c0e1288802860309672b03e1255f430b6d)
@@ -1,10 +1,8 @@
 package com.medievaltech.unit;
-
-import android.graphics.Paint;
 
 public abstract class Transport extends Unit {
 	public Unit storedUnit;
 	
-	public Transport(Paint p) {
+	public Transport(Player p) {
 		super(p);
 	}
Index: src/com/medievaltech/unit/Unit.java
===================================================================
--- src/com/medievaltech/unit/Unit.java	(revision fea4b77b2fa3d94e79f364cfc993ab5a000df017)
+++ src/com/medievaltech/unit/Unit.java	(revision c3ad11c0e1288802860309672b03e1255f430b6d)
@@ -8,8 +8,6 @@
 
 public abstract class Unit {
-	private Paint p;
-	
 	public UnitType type;
-	//public Player owner;
+	public Player owner;
 	
 	public int maxHealth;
@@ -26,10 +24,11 @@
 	public Point location;
 	
-	public Unit(Paint p) 
+	public Unit(Player p) 
 	{
-		this.p = p;
+		p.addUnit(this);
+		
+		owner = p;
 		maxHealth = 10;
 		currentHealth = 10;
-		
 	}
 	
@@ -87,5 +86,5 @@
 	
 	public void draw(Canvas c, int x, int y) {
-		c.drawCircle(x, y, 20, p);
+		c.drawCircle(x, y, 20, owner.getColor());
 	}
 }