diff --git a/include/dawn/dawn.h b/include/dawn/dawn.h
index 9fe8499c..903dd8eb 100644
--- a/include/dawn/dawn.h
+++ b/include/dawn/dawn.h
@@ -34,6 +34,7 @@
 // Poker Game Logic
 #include "poker/action.h"
 #include "poker/card.h"
+#include "poker/chip.h"
 #include "poker/player.h"
 #include "poker/render.h"
 
diff --git a/include/dawn/poker/chip.h b/include/dawn/poker/chip.h
new file mode 100644
index 00000000..78bf621e
--- /dev/null
+++ b/include/dawn/poker/chip.h
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
\ No newline at end of file
diff --git a/include/dawn/poker/render.h b/include/dawn/poker/render.h
index 7d0804dd..79a1df47 100644
--- a/include/dawn/poker/render.h
+++ b/include/dawn/poker/render.h
@@ -32,6 +32,11 @@
 #define HOLDEM_GAME_CARD_SLOT_FLOP3 0x05
 #define HOLDEM_GAME_CARD_SLOT_FLOP4 0x06
 
+#define HOLDEM_GAME_CHIP_STACK0 0x00
+#define HOLDEM_GAME_CHIP_STACK1 0x01
+#define HOLDEM_GAME_CHIP_STACK2 0x03
+#define HOLDEM_GAME_CHIP_STACK3 0x04
+
 typedef struct {
   float x, z;
   float yaw;
diff --git a/src/poker/action/flop.c b/src/poker/action/flop.c
index f735ab7a..e9728669 100644
--- a/src/poker/action/flop.c
+++ b/src/poker/action/flop.c
@@ -20,7 +20,6 @@ void actionFlopInit(int32_t index, void *data) {
   logText("Flop");
   
   // Look at the dealer
-  holdemRenderLookHand(&GAME_STATE.cameraLeft, HOLDEM_GAME_SEAT_DEALER);
 
   // Do the flop
   // if(match->cardsFacing >= HOLDEM_DEALER_HAND) return;
diff --git a/src/poker/action/round.c b/src/poker/action/round.c
index d721f2f7..aa3098bb 100644
--- a/src/poker/action/round.c
+++ b/src/poker/action/round.c
@@ -22,7 +22,7 @@ void actionRoundInit(int32_t index, void *data) {
   logText("Round Start");
 
   // Look at the dealer.
-  holdemRenderLookHand(&GAME_STATE.cameraLeft, HOLDEM_GAME_SEAT_DEALER);
+  holdemRenderLookHand(&GAME_STATE.cameraLeft, HOLDEM_GAME_SEAT_PLAYER0);
 
   // Init the round and shuffle the deck
   cardDeckFill(GAME_STATE.deck);
diff --git a/src/poker/render/card.c b/src/poker/render/card.c
index 866a0181..961a342d 100644
--- a/src/poker/render/card.c
+++ b/src/poker/render/card.c
@@ -48,6 +48,7 @@ pokerposition_t holdemRenderCardGetPosition(uint8_t seat, uint8_t slot) {
     case HOLDEM_GAME_CARD_SLOT_HAND1:
       t2 = HOLDEM_GAME_CARD_WIDTH+HOLDEM_GAME_CARD_PADDING;
       if(slot == HOLDEM_GAME_CARD_SLOT_HAND0) t2 = -t2;
+      t2 += 0.1;
       break;
       
     case HOLDEM_GAME_CARD_SLOT_FLOP0:
diff --git a/src/poker/render/chip.c b/src/poker/render/chip.c
index aba2c77a..420d7056 100644
--- a/src/poker/render/chip.c
+++ b/src/poker/render/chip.c
@@ -7,17 +7,40 @@
 
 #include "chip.h"
 
+void holdemRenderChipSet(int32_t count,float x,float y,float z,float yaw) {
+  shaderUsePositionAndScale(GAME_STATE.shaderWorld,
+    x, y, z,
+    0, yaw, 0,
+    0.2, 0.2, 0.2
+  );
+  shaderUseTexture(GAME_STATE.shaderWorld, GAME_STATE.chipTexture);
+  primitiveDraw(GAME_STATE.chipPrimitive, 0, -1);
+}
+
+pokerposition_t holdemRenderChipGetPosition(uint8_t seat) {
+  pokerposition_t position;
+  float t, t2;
+
+  position.yaw = HOLDEM_GAME_SEAT_ANGLE(seat);
+  position.x = sin(position.yaw) * -0.675;
+  position.z = cos(position.yaw) * -0.675;
+
+  t = position.yaw + mathDeg2Rad(90);
+
+  t2 = -0.175;
+  position.x += t2 * sin(t);
+  position.z += t2 * cos(t);
+  return position;
+}
+
 void holdemRenderChipInit() {
   GAME_STATE.chipPrimitive = pokerChipCreate();
   GAME_STATE.chipTexture = assetTextureLoad("pokerchip.png");
 }
 
 void holdemRenderChip() {
-  shaderUsePositionAndScale(GAME_STATE.shaderWorld,
-    0, 0.05, -0.6,
-    0, 0, 0,
-    0.2, 0.2, 0.2
-  );
-  shaderUseTexture(GAME_STATE.shaderWorld, GAME_STATE.chipTexture);
-  primitiveDraw(GAME_STATE.chipPrimitive, 0, -1);
+  for(uint8_t seat = 0; seat < 0x08; seat++) {
+    pokerposition_t position = holdemRenderChipGetPosition(HOLDEM_GAME_SEAT_PLAYER0);
+    holdemRenderChipSet(0, position.x, 0.05, position.z, position.yaw);
+  }
 }
\ No newline at end of file
diff --git a/src/poker/render/chip.h b/src/poker/render/chip.h
index bc69526f..709c4321 100644
--- a/src/poker/render/chip.h
+++ b/src/poker/render/chip.h
@@ -12,6 +12,10 @@
 #include "../../display/shader.h"
 #include "../../display/texture.h"
 
+void holdemRenderChipSet(int32_t count,float x,float y,float z,float yaw);
+
+pokerposition_t holdemRenderChipGetPosition(uint8_t seat);
+
 /**
  * Init the poker chips renderer for each player.
  */
diff --git a/src/poker/render/frame.c b/src/poker/render/frame.c
index 208588b6..e489fcc0 100644
--- a/src/poker/render/frame.c
+++ b/src/poker/render/frame.c
@@ -61,23 +61,22 @@ void holdemRenderFrameUseLeft() {
 void holdemRenderFrameUseRight() {
   glClearColor(0.3, 0.3, 0, 1);
   frameBufferUse(GAME_STATE.frameRight, true);
-  // cameraPerspective(&GAME_STATE.cameraRight, 45,
-  //   (
-  //     (float)GAME_STATE.frameRight->texture->width /
-  //     (float)GAME_STATE.frameRight->texture->height
-  //   ), 0.2f, 1000.0f
-  // );
-  // cameraLookAt(&GAME_STATE.cameraRight, 0, 3, 3, 0, 0, 0);
 
-
-
-  cameraPerspective(&GAME_STATE.cameraRight, 15,
+  cameraPerspective(&GAME_STATE.cameraRight, 45,
     (
       (float)GAME_STATE.frameRight->texture->width /
       (float)GAME_STATE.frameRight->texture->height
     ), 0.2f, 1000.0f
   );
-  cameraLookAt(&GAME_STATE.cameraRight, 0, 1, -8, 0, 0, 0);
+  cameraLookAt(&GAME_STATE.cameraRight, 0, 3, 3, 0, 0, 0);
+
+  // cameraPerspective(&GAME_STATE.cameraRight, 15,
+  //   (
+  //     (float)GAME_STATE.frameRight->texture->width /
+  //     (float)GAME_STATE.frameRight->texture->height
+  //   ), 0.2f, 1000.0f
+  // );
+  // cameraLookAt(&GAME_STATE.cameraRight, 0, 1, -8, 0, 0, 0);
 
   shaderUseCamera(GAME_STATE.shaderWorld, &GAME_STATE.cameraRight);
 }