adding a map for the new tree structure
removing outdated TODO, adding an export/alias per Ryan