Partial work on tree view stuff