diff --git a/src/memory.js b/src/memory.js
index f6644827e..3225d8eb5 100644
--- a/src/memory.js
+++ b/src/memory.js
@@ -1,18 +1,31 @@
 class MemoryGame {
   constructor(cards) {
     this.cards = cards;
-    // add the rest of the class properties here
+    this.pickedCards = [];
+    this.pairsClicked = 0;
+    this.pairsGuessed = 0;
   }
 
   shuffleCards() {
-    // ... write your code here
+    if (!this.cards)
+     return undefined;
+     const newCards = [...this.cards];
+     this.cards.sort(() => Math.random() - 0.7);
+     return this.cards;
   }
 
   checkIfPair(card1, card2) {
-    // ... write your code here
+    this.pairsClicked++;
+    if (card1 === card2) {
+      this.pairsGuessed++;
+      return true;
+    } else {
+      return false;
+    }
   }
 
   checkIfFinished() {
-    // ... write your code here
+    return this.pairsGuessed === this.cards.length / 2
   }
-}
+  }
+