big changes

Updates to a number of classes.
First of the rspec tests and what not