New tree structure! Also added code for changing to the old tree