diff --git a/game.json b/game.json
index a3886b2..0f970f8 100644
--- a/game.json
+++ b/game.json
@@ -1,7 +1,9 @@
 {
 	"name": "LibreUNO",
 	"version": "0.1.0",
-	"authors": ["ThePerkinrex"],
+	"authors": [
+		"ThePerkinrex"
+	],
 	"script": "game.rhai",
 	"default_back": "cards/back.png",
 	"available_cards": {
@@ -11,6 +13,48 @@
 		"R0": {
 			"image": "cards/r0.png"
 		},
+		"G0": {
+			"image": "cards/b0.png"
+		},
+		"Y0": {
+			"image": "cards/y0.png"
+		},
+		"B1": {
+			"image": "cards/b1.png"
+		},
+		"R1": {
+			"image": "cards/r1.png"
+		},
+		"G1": {
+			"image": "cards/b1.png"
+		},
+		"Y1": {
+			"image": "cards/y1.png"
+		},
+		"B2": {
+			"image": "cards/b2.png"
+		},
+		"R2": {
+			"image": "cards/r2.png"
+		},
+		"G2": {
+			"image": "cards/b2.png"
+		},
+		"Y2": {
+			"image": "cards/y2.png"
+		},
+		"B3": {
+			"image": "cards/b3.png"
+		},
+		"R3": {
+			"image": "cards/r3.png"
+		},
+		"G3": {
+			"image": "cards/b3.png"
+		},
+		"Y3": {
+			"image": "cards/y3.png"
+		},
 		"+4": {
 			"image": "cards/+4.png"
 		}
@@ -18,7 +62,24 @@
 	"piles": {
 		"deck": {
 			"cards": [
-				"B0", "R0", "+4"
+				"B0",
+				"R0",
+				"G0",
+				"Y0",
+				"B1",
+				"R1",
+				"G1",
+				"Y1",
+				"B2",
+				"R2",
+				"G2",
+				"Y2",
+				"+4",
+				"B3",
+				"R3",
+				"G3",
+				"Y3",
+				"+4"
 			]
 		},
 		"placed": {}
diff --git a/game.rhai b/game.rhai
index 1408796..f1311b6 100644
--- a/game.rhai
+++ b/game.rhai
@@ -47,12 +47,14 @@ fn on_click(data, card, action_author, current_player) {
 				// Get a card from the deck
 
 				let c = data.pop_card(card);
-				data.player_piles[player.val].deck.cards.push(c);
+				
+				data.player_piles[current_player.val].deck.cards.push(c);
 				
 			}
 		}else{
 			if card.pile_name == "deck" {
 				let c = data.pop_card(card);
+				print(c[0]);
 				data.piles.placed.cards.push(c);
 			}
 		}