--- a/src/proto2/Physics.cc	Sat Nov 29 17:37:51 2008 +0000
+++ b/src/proto2/Physics.cc	Sat Nov 29 17:59:49 2008 +0000
@@ -9,7 +9,10 @@
 #include <assert.h>
 
 PhysicsWorld::PhysicsWorld (Vector gravity, Vector dimensions)
-    : tick_timer(PHYSICS_TICK_MS), tick_counter(0), gravity(gravity), dimensions(dimensions), terrain(dimensions.x, std::vector<TerrainType>(dimensions.y, DIRT)) {
+    : tick_timer(PHYSICS_TICK_MS), tick_counter(0), dimensions(dimensions),
+      gravity(gravity), 
+      terrain(dimensions.x, 
+              std::vector<TerrainType>(dimensions.y, DIRT)) {
 
     generateTerrain(1337);
 
@@ -37,9 +40,9 @@
 
 PhysicsObject::PhysicsObject (PhysicsWorld &world, float mass, 
                               Vector position, Vector velocity)
-    : world(world), mass(mass), position(position), 
-      velocity(velocity), facingRight(true), inAir(true) {
-
+    : world(world), position(position), velocity(velocity),
+      mass(mass), inAir(true), aim(0), facingRight(true) {
+    // TODO: Is thir the right way to do this?
     world.addObject(this);
 }