set up a few classes
Merge origin/master