Recoded entire collection to include a collection and collectionItem model