Superficially respond to @dreid's review.

  - Tests are still not working (assert_called_once doesn't error)
  - Some of the queries need to be tested.