Lots of changes, need to add rspec again. Removed money. See code