Changed the whole container system to parent-children