Add containment checking
Begin adding component hierarchy dump