More work on collection views.