all done except rspec tests