add TODO of required functions
Add and/or tree support, not complete
 merge skeleton with master
fix one small bug about parameters passed to mergeToParent