Working on cleaning up the hierarchy