Index: src/com/example/helloandroid/Fleet.java
===================================================================
--- src/com/example/helloandroid/Fleet.java	(revision 96857ee1b3d0cbc876fc9952862cd862c7d1de27)
+++ src/com/example/helloandroid/Fleet.java	(revision 1a91f0dcdf2b97c5a72bf534516f7a8af58cbdb2)
@@ -15,5 +15,5 @@
 	public Fleet(Planet source, Planet destination, int numShips, int faction) {
 		//Calculate initial coordinates and direction 
-		
+		if(destination.x - source.x != 0){
 		//line formula 
 		slope = ((source.y - destination.y)/(source.x - destination.x));
@@ -24,14 +24,21 @@
 		
 		//coordinates for all 4 coordinates
-		if ((direction >= 0) && (direction < Math.PI/2)){
-			x = (int)(Math.cos(direction)*(source.radius + 10) + source.x );
-			y = (int)(Math.sin(direction)*(source.radius + 10) + source.y );
-		} else if((direction >= Math.PI/2) && (direction < Math.PI)){
-			
-		} else if((direction >= Math.PI) && (direction < 3*Math.PI/2)){
+		if(destination.x - source.x < 0 )
+			direction += Math.PI;
 		
+		x = (int)((Math.cos(direction)*(source.radius + 10) + source.x));
+		y = (int)((Math.sin(direction)*(source.radius + 10) + source.y));
 		} else {
+			if((destination.y - source.y) > 0 ){
+				direction = Math.PI/2;
+				x = destination.x;
+				y = source.y + source.radius + 10;
+			} else {
+				direction = 3*Math.PI/2;
+				x = destination.x;
+				y = source.y - source.radius - 10;
+			}
+		}
 		
-		}
 		this.numShips = numShips;
 		this.faction = faction;
@@ -113,11 +120,12 @@
 
 	public void update() {
-		//update coordinates
-	
+		
 	}
 	
 	// attack the destination planet
 	public void attack() {
-		//planet attack
+		if(numShips <= destination.numShips ){
+		
+		}
 	}
 }