Still needs Inheritance
Merge pull request #8 from cathwaggoner/master

Chad and Catherine