Building out base classes.
Merge branch 'HEAD' of https://github.com/somecallmechief/oj.git