Getting class hierarchies together
More updates.  Beginning to flesh out relationship.