Added class functionality
Merge https://github.com/shank8/CPTS-323