Refactor child/parent relationships so parent is in control