finished first run at the tagtrees refactor