Adding children
Merge branch 'feature-add-children' into develop