Almost done. Some RSpec left