considering taking out the search for hierarchy stuff