Upgrade rspec
Move to new rspec syntax
Barebones logic implemented