Structural

Running out of leaves now which is a bugger, on the plus side it's nice to see tree architecture again.