Added basic tree functionality
Resolved merge conflicts