Work on new tree-based sample listing model, but still broken