WIP: just need to finish rspec tests