diff --git a/index.html b/index.html
index 9386faaf4..b4a2749f5 100644
--- a/index.html
+++ b/index.html
@@ -17,6 +17,7 @@ <h2>Score</h2>
       <p>Pairs guessed: <span id="pairs-guessed">0</span></p>
     </div>
     <div id="memory-board"></div>
+    <script src="src/memory.js"></script>
 
     <!-- LINK THE JAVASCRIPT FILES HERE (keep in mind that the order in which you link them MATTERS) -->
   </body>
diff --git a/src/memory.js b/src/memory.js
index f6644827e..7cb949070 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
+  } 
 }