Added some classes, getting ready to merge Ian's changes
Fixing merge conflicts