--- a/melee/melee.d	Thu Mar 26 07:02:56 2009 -0400
+++ b/melee/melee.d	Thu Mar 26 16:56:30 2009 -0400
@@ -48,11 +48,12 @@
 import openmelee.melee.boundaryListener;
 import openmelee.melee.contactListener;
 import openmelee.render.render;
-import openmelee.ai.ai;
-import openmelee.ai.human;
-import openmelee.ships.urQuan;
-import openmelee.ships.orz;
-import openmelee.ships.planet;
+import openmelee.ai.ai : AI;
+import openmelee.ai.human : Human;
+import openmelee.ships.urQuan : UrQuan;
+import openmelee.ships.orz : Orz;
+import openmelee.ships.planet : Planet;
+import openmelee.ships.asteroids : Asteroid;
 
 const ITERS_PER_SECOND = 100;
 const k_maxContactPoints = 100;
@@ -101,6 +102,7 @@
     Human human;
     Ship ship1;
 	Ship ship2;
+    Planet planet;
     
     bool running;
     
@@ -129,7 +131,7 @@
         
         draw = new Render(world, ship1, ship2, settings);
         human = new Human(ship1);
-        ai = new AI(ship2, world);
+        ai = new AI(ship1, world);
     
         gui.begin(cfg).retained;
         gui.push(`main`);
@@ -151,7 +153,7 @@
 
         jobHub.addPreFrameJob( {
             // Update AI
-            ai.move(ship1);
+            ai.move(ship2);
         });
 
         jobHub.addPostFrameJob( {
@@ -188,15 +190,16 @@
 
     void initWorld() {
 	    // Define world boundaries
-		worldAABB.lowerBound.set(-400.0f, -250.0f);
-		worldAABB.upperBound.set(400.0f, 250.0f);
+		worldAABB.lowerBound.set(-100.0f, -150.0f);
+		worldAABB.upperBound.set(100.0f, 150.0f);
 		world = new bzWorld(worldAABB, gravity, allowSleep);
 		world.boundaryListener = m_boundaryListener;
 		world.contactListener = m_contactListener;
 		ship1 = new UrQuan(world);
 		ship2 = new Orz(world);
         ship2.rBody.angle = 3.14159265/4;
-        auto planet = new Planet(world);
+        planet = new Planet(world);
+        //auto asteroids = new Asteroid(world);
 	}
     
     void boundaryViolated(bzBody rBody)