         if e.keyCode is 32 # space
           @paused = !@paused
 
-  addObject: (object) ->
-    @objects.push object
-
-  removeObject: (object) ->
-    @objects = _without(@objects, object)
+  addBody: (body) ->
+    @bodies.push body
+
+  removeBody: (body) ->
+    @bodies = _without(@bodies, body)
 
   update: =>
     return if @paused
 
     dt = @ctx.dt / 1000
 
-    for object in @objects
-      object.reset()
-      object.resetDebug()
-      object.integrate dt for object in @objects
+    for body in @bodies
+      body.reset()
+      body.resetDebug()
+      body.integrate dt
 
     @contacts = @narrowPhaseCollisions @broadPhaseCollisions()
 

    @stats = Utils.drawStats()
    @display = new Display @ctx, [0, 0], 50

    @objects = []
    @paused = true

    _.extend @ctx,


      # @paused = true

  # Naive version: returns all unique pairs of bodies, nothing more. TODO: use
  # (memoized?) AABBs to build quadtree, then iterate and compare bounding boxes
  # for overlap.
  broadPhaseCollisions: ->
    pairs = []
    for i in [0..(@bodies.length-2)]
      for j in [(i+1)..(@bodies.length-1)]
        pairs.push [@bodies[i], @bodies[j]]
    pairs

  narrowPhaseCollisions: (pairs) ->
