More work on CollectionView.