TODO completed in Hierarchy.js