Add child feature almost done
fix merge conflicts