Refactored to now use a collectionview