TODO's
Rspec cleanup
Meta tag rspec
README updates