   (reset! game-mode mode)
 
   ; Update the game count to uniquely identify current game.
-  (swap! game-count inc)
+  (swap! current-round-id inc)
 
   ; Log the game start.
-  (util/tlog "Starting the game: " (name mode) " " @game-count)
+  (util/tlog "Starting the game: " (name mode) " " @current-round-id)
 
   ; Make lobby players navigate to a countdown screen.
   (.. io (to "lobby") (emit "start-game"))

              (recur (dec s)))))))

    ; Calculate final ranks.
    (let [ranks (rank-players @game-count @game-mode)]

      ; Show ranks on server console.
      (util/tlog "Game Results:")


    ; Merge in the updated data into the player structure.
    ; Also update the game id, so we know which players are in the current game.
    (swap! players update-in [pid] merge player-data
      {:game @current-round-id :pid pid})

    ; Call score update events.
    (if (contains? player-data :score)
