Yes, more refactoring to abstract a card and card matching game so it can deal with both a Playing card and a Set card matching game.