Adding reservation functionality, etc., moving tests to rspec