Initial pass of more logical graph class structuring