diff --git a/index.css b/index.css
index e440658..4086188 100644
--- a/index.css
+++ b/index.css
@@ -20,4 +20,11 @@
 .timer.over {
     color: #f00;
     animation: blinker 0.5s ease infinite;
+}
+
+.timer.loading {
+    font-size: 2em;
+    margin: auto;
+    margin-bottom: 2.5em;
+    margin-top: 2.5em;
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index 10a9835..aa3c6fb 100644
--- a/index.html
+++ b/index.html
@@ -23,8 +23,13 @@
                 </hgroup>
 
                 <div x-data="Timer">
+                    <div x-show="!time">
+                        <div class="timer loading" href="#" aria-busy="true">please wait</div>
+                    </div>
+                    <div x-show="time">
                     <p :class="'timer' + ($store.remoteState.isMyTurn ? ' my-turn':'') + (time < 0 ? ' over':'')"
                         x-text="time + 's'"></p>
+                    </div>
                 </div>
 
                 <button @click="$store.remoteState.giveTurnToNextPlayer()"
diff --git a/index.js b/index.js
index 0bf2deb..65b8767 100644
--- a/index.js
+++ b/index.js
@@ -20,8 +20,15 @@ function Timer() {
         time: 0,
         init() {
             setInterval(() => {
-                this.time = parseInt((90000 - ((new Date()).getTime() - Alpine.store("remoteState").lastPlayerSwitch)) / 1000);
-            }, 1000);
+                const lastPlayerSwitch = Alpine.store("remoteState").lastPlayerSwitch
+                console.log(lastPlayerSwitch)
+                if(!lastPlayerSwitch) {
+                    this.time = null
+                }
+                else {
+                    this.time = parseInt((90000 - ((new Date()).getTime() - lastPlayerSwitch)) / 1000);
+                }
+            }, 100);
         },
     }
 }
@@ -77,7 +84,7 @@ document.addEventListener('alpine:init', () => {
     Alpine.store("remoteState", {
         players: [],
         currentPlayer: null,
-        lastPlayerSwitch: 0,
+        lastPlayerSwitch: null,
         connected: false,
         isMyTurn: false,
         _client: null,
@@ -93,7 +100,6 @@ document.addEventListener('alpine:init', () => {
             })
 
             Alpine.effect(() => {
-                this.lastPlayerSwitch = new Date().getTime();
                 if (this.currentPlayer == Alpine.store("localState").id) {
                     this.isMyTurn = true;
                 }
@@ -149,13 +155,18 @@ document.addEventListener('alpine:init', () => {
                     Alpine.store("remoteState").players = data;
                 }
                 else if (topic === "im.dorian.whos-turn-is-it.currentPlayer") {
-                    Alpine.store("remoteState").currentPlayer = message.toString();
+                    const data = JSON.parse(message.toString());
+                    Alpine.store("remoteState").currentPlayer = data.id;
+                    Alpine.store("remoteState").lastPlayerSwitch = data.since;
                 }
             })
         },
 
         giveTurnToNextPlayer() {
-            this._client.publish('im.dorian.whos-turn-is-it.currentPlayer', Alpine.store("localState").nextPlayer, { qos: 1, retain: true })
+            this._client.publish('im.dorian.whos-turn-is-it.currentPlayer', JSON.stringify({
+                id: Alpine.store("localState").nextPlayer,
+                since: new Date().getTime()
+            }), { qos: 1, retain: true })
         },
 
 
@@ -167,7 +178,10 @@ document.addEventListener('alpine:init', () => {
             this._client.publish('im.dorian.whos-turn-is-it.players', JSON.stringify({
                 [Alpine.store("localState").id]: Alpine.store("localState").name,
             }), { qos: 1, retain: true })
-            this._client.publish('im.dorian.whos-turn-is-it.currentPlayer', Alpine.store("localState").id, { qos: 1, retain: true })
+            this._client.publish('im.dorian.whos-turn-is-it.currentPlayer', JSON.stringify({
+                id: Alpine.store("localState").id,
+                since: new Date().getTime()
+            }), { qos: 1, retain: true })
         }
     })