Heather- created Superclass and subclasses
Merge origin/master