Updated the treeview code to be the best of both worlds. Due to this I now also know why one of our remaining exceptions exist