Initial cut
fix MAKE-CHILD-WRAPPER
Merge branch 'child-wrapper-removal'