80% done with Rspec tests, finish tomorrow morning