Improved Rspec functionality, begun model system