added tree, moved stuff around