Done for the night... all the rspec tests broke