Did some refactoring moving the 'next_card' stuff into the CollectionHandler.