Beginning on tree/node plus some class updates