Trees

Resolving conflicts now..