Index: src/com/example/helloandroid/Fleet.java
===================================================================
--- src/com/example/helloandroid/Fleet.java	(revision 3e9f39e1d72da6ea6f30f83ad48dc9636cd7964a)
+++ src/com/example/helloandroid/Fleet.java	(revision 1291908f011a59b65fbdd22e76056eaafdddddd2)
@@ -15,8 +15,8 @@
 	public Fleet(Planet source, Planet destination, int numShips, int faction) {
 		//Calculate initial coordinates and direction 
-		if(destination.x - source.x != 0){
+		if(destination.getX() - source.getX() != 0){
 		//line formula 
-		slope = ((source.y - destination.y)/(source.x - destination.x));
-		xIntercept = destination.y - (slope*destination.x);
+		slope = ((source.getY() - destination.getY())/(source.getX() - destination.getX()));
+		xIntercept = destination.getY() - (slope*destination.getX());
 		
 		//direction
@@ -24,18 +24,18 @@
 		
 		//coordinates for all 4 coordinates
-		if(destination.x - source.x < 0 )
+		if(destination.getX() - source.getX() < 0 )
 			direction += Math.PI;
 		
-		x = (int)((Math.cos(direction)*(source.radius + 10) + source.x));
-		y = (int)((Math.sin(direction)*(source.radius + 10) + source.y));
+		x = (int)((Math.cos(direction)*(source.radius + 10) + source.getX()));
+		y = (int)((Math.sin(direction)*(source.radius + 10) + source.getY()));
 		} else {
-			if((destination.y - source.y) > 0 ){
+			if((destination.getY() - source.getY()) > 0 ){
 				direction = Math.PI/2;
-				x = destination.x;
-				y = source.y + source.radius + 10;
+				x = destination.getX();
+				y = source.getY() + source.radius + 10;
 			} else {
 				direction = 3*Math.PI/2;
-				x = destination.x;
-				y = source.y - source.radius - 10;
+				x = destination.getX();
+				y = source.getY() - source.radius - 10;
 			}
 		}
@@ -125,6 +125,9 @@
 	// attack the destination planet
 	public void attack() {
-		if(numShips <= destination.numShips ){
-		
+		if(numShips <= destination.getNumShips()){
+			destination.setNumShips(destination.getNumShips() - numShips);
+		} else {
+			destination.setNumShips(numShips - destination.getNumShips());
+			destination.setFaction(this.faction);
 		}
 	}
Index: src/com/example/helloandroid/Planet.java
===================================================================
--- src/com/example/helloandroid/Planet.java	(revision 3e9f39e1d72da6ea6f30f83ad48dc9636cd7964a)
+++ src/com/example/helloandroid/Planet.java	(revision 1291908f011a59b65fbdd22e76056eaafdddddd2)
@@ -41,4 +41,8 @@
 	}
 	
+	public void setFaction(int faction) {
+		this.faction = faction;
+	}
+	
 	public void update() {
 		//regen ships if not owned by faction 0