class changes and cara
Merge pull request #4 from Jansbury/master

stuff