Finished updating Dimension & Tree stuff to 1.8