Small refactor. Beginning of card search.