build out the class graph/model more