New Hierarchy

Matches what I've done so far to code the classes.