TODO finished and all rspec tests passing