Hierarchy children

https://www.pivotaltracker.com/s/projects/684825/stories/71611298
woods: Nice "git cherry-pick"! Thanks.