Some refactoring and starting to make a Card Matching game