Remove use of subclasses
Merge pull request #14 from ghoneycutt/refactor_subclasses

Remove use of subclasses