More hierarchy

Signed-off-by: Dan Scott <dan@coffeecode.net>