big changes

Updates to a number of classes.
First of the rspec tests and what not
Merge pull request #16 from skunath/initial_rspec_testing

big changes