Working on a more streamlined hierarchy.