diff --git a/backend/uno-game-engine/deck.ts b/backend/uno-game-engine/deck.ts
index 9e113f5..0567ba5 100644
--- a/backend/uno-game-engine/deck.ts
+++ b/backend/uno-game-engine/deck.ts
@@ -1,5 +1,5 @@
 const colors: Array<CardColor> = ['red', 'yellow', 'green', 'blue'];
-const values = [
+const numValues: Array<CardNumbers> = [
     '0',
     '1',
     '2',
@@ -10,12 +10,10 @@ const values = [
     '7',
     '8',
     '9',
-    'skip',
-    'reverse',
-    'draw2',
 ];
-const specialCards = ['wild', 'draw4'];
-const deck = [];
+const specialValues: Array<SpecialCardNames> = ['skip', 'reverse', 'draw2'];
+const wildCardValue: Array<SpecialCardNames> = ['colchange', 'draw4'];
+const deck: Array<UNOCard> = [];
 
 /**    
  * In a standard UNO deck, there are 108 cards. Here's the breakdown:
@@ -41,11 +39,27 @@ const deck = [];
  @returns {Array} deck - An array of 108 UNO cards.
  */
 export function getShuffledCardDeck(): Array<UNOCard> {
-    const deck = [];
-    // todo: Implement the card generation logic
-    // dummy code:
-    // deck.push(makeCard('special', 'wild', 'wild'))
-    // deck.push(makeCard('number', 'red', '0'))
+    const deck: Array<UNOCard> = [];
+
+    colors.forEach((color) => {
+        numValues.forEach((value) => {
+            deck.push(makeCard('number', color, value));
+            if (value !== '0') {
+                deck.push(makeCard('number', color, value));
+            }
+        });
+        specialValues.forEach((value) => {
+            deck.push(makeCard('special', color, value));
+            deck.push(makeCard('special', color, value));
+        });
+        if (color === 'black') {
+            wildCardValue.forEach((value) => {
+                for (let i = 0; i < 4; i++) {
+                    deck.push(makeCard('wild', color, value));
+                }
+            });
+        }
+    });
 
     shuffle(deck);
     return deck;
@@ -55,7 +69,11 @@ export function getShuffledCardDeck(): Array<UNOCard> {
  * Helper function to make a card object.
  * @returns {UNOCard} The composed UNO card.
  */
-export function makeCard(type: CardType, color: CardColor, value: CardValue): UNOCard {
+export function makeCard(
+    type: CardType,
+    color: CardColor,
+    value: CardValue
+): UNOCard {
     //todo: Implement unique identification of cards by assigning an id to each card
     return { type, color, value, id: undefined };
 }
@@ -64,7 +82,10 @@ export function makeCard(type: CardType, color: CardColor, value: CardValue): UN
  * This function shuffles the elements of the given array *in place* . The function behaves in a type-agnostic way.
  * Time complexity: O(n)
  */
-export function shuffle(deck: Array<any>) {
-    //todo: Implement a generic shuffling algorithm
-    [deck[0], deck[1]] = [deck[1], deck[0]];
+function shuffle(deck: Array<UNOCard>) {
+    // Fisher-Yates shuffle algorithm to shuffle card deck
+    for (let i = deck.length - 1; i > 0; i--) {
+        const j = Math.floor(Math.random() * i);
+        [deck[i], deck[j]] = [deck[j], deck[i]];
+    }
 }
diff --git a/backend/uno-game-engine/types.d.ts b/backend/uno-game-engine/types.d.ts
index 7c281f2..30fc8c0 100644
--- a/backend/uno-game-engine/types.d.ts
+++ b/backend/uno-game-engine/types.d.ts
@@ -1,6 +1,6 @@
 type CardType = 'number' | 'special' | 'wild';
 
-type CardColor = 'red' | 'blue' | 'green' | 'yellow';
+type CardColor = 'red' | 'blue' | 'green' | 'yellow' | 'black';
 
 type SpecialCardNames = 'skip' | 'reverse' | 'draw2' | 'draw4' | 'colchange';
 type CardNumbers = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9';