so my subtree got a bit messy... back to the when things made sense