More work on getting list view working - not quite there yet