tree updates to remove more details from the helpers - trying to move the click
handling internal, if I can