Added rspec.
Cleanup
WIP