Changing to DTree, done test cases + header file