I think the tree is a bit messed up, but progress is made