Commit missing classes
Merge pull request #36 from zcmoore/master

Commit missing classes