second green with rspec
Starting to refactor, but it can be done better (next commit)