Record-tree: done. refactor make-up