wip listview refactoring