working on trees. untested branch. v0 for branch.
git merge master in pain-in-ass.
single files added.
ifdef deleted from helpers.