Code refactoring
Woring, but need to add each child by hand