Partial work on TreeView stuff