Added a few more classes
Merge pull request #2 from mchizews/master

Added a few more classes