Commit while implementing tree rendering

Work in progress