WIP 2 migration to listviews