Initial class file
Merge branch 'kaishley'