Added a bunch of stuff, styling, etc. Too much to name. Needs more rspec work.
A bunch of stuff.....