diff --git a/PlayCardsLibrary/PlayingCards.cs b/PlayCardsLibrary/PlayingCards.cs
index 5b44a3f..08bea54 100644
--- a/PlayCardsLibrary/PlayingCards.cs
+++ b/PlayCardsLibrary/PlayingCards.cs
@@ -17,8 +17,8 @@
 
     public class Deck
     {
-        public static List<Card> Cards = new();
-        public static void Enumerate()
+        public List<Card> Cards = new();
+        public Deck()
         {
             foreach (Suit suit in Enum.GetValues(typeof(Suit)))
             {
@@ -42,10 +42,11 @@
                     });
                 }
             }
+            Shuffle();
         }
 
         private static Random rng = new();
-        public static void Shuffle()
+        public void Shuffle()
         {
             Cards = Cards.OrderBy(a => rng.Next()).ToList();
         }
diff --git a/StripJackNaked/Program.cs b/StripJackNaked/Program.cs
index b105494..f8ace52 100644
--- a/StripJackNaked/Program.cs
+++ b/StripJackNaked/Program.cs
@@ -21,6 +21,8 @@ namespace StripJackNaked
     {
         private static void Main()
         {
+            Deck deck = new();
+
             // Init players
             List<Player> Players = new();
             for (int i = 0; i < Constants.PlayerCount; i++)
@@ -29,15 +31,15 @@ namespace StripJackNaked
             }
 
             // Init deck
-            Deck.Enumerate();
-            Deck.Shuffle();
+            //Deck.Enumerate();
+            // Deck.Shuffle();
 
             // Deal cards
-            while (Deck.Cards.Count > 0)
+            while (deck.Cards.Count > 0)
             {
-                Card card = Deck.Cards.Last();
-                int player = Deck.Cards.Count() % Constants.PlayerCount; // Alternate dealing cards between players 0 and 1
-                _ = Actions.MoveCard(Deck.Cards, Players[player].Hand, card);
+                Card card = deck.Cards.Last();
+                int player = deck.Cards.Count() % Constants.PlayerCount; // Alternate dealing cards between players 0 and 1
+                _ = Actions.MoveCard(deck.Cards, Players[player].Hand, card);
             }
 
             // Init first round