Start refactoring ChildrenCaster
Updated TODO