         (assoc :enemy-funstruct (:funstruct (f/get-player-state game-state opponent-uuid))))))
 
 (defn send-game-updates [game-id]
-  (let [initialized-game (get-game (current-global-state) game-id)
+  (let [initialized-game (gs/get-game (gs/current-global-state) game-id)
         [p1 p2 :as players] (f/get-game-players initialized-game)
-        [c1 c2] (map #(channel-for-uuid (current-global-state) %) players)]
+        [c1 c2] (map #(gs/channel-for-uuid (gs/current-global-state) %) players)]
     (u/log "Sending game-update's for game " game-id)
     (send-command {:type :game-update
                     :data (make-update-data initialized-game p1)

                               :enemy uuid1}}
                       channel2)

        (update-global-state add-game game-id (f/make-game uuid1 uuid2))
        (update-global-state #(apply remove-from-pending % pending-pair))))
    (recur)))

(defn make-update-data [game-state player-uuid]

(defn pending-checker []
  (go-loop []
    (<! (timeout 3000))
    (when-let [pending-pair (gs/get-pending-pair (gs/current-global-state))]
      (let [[uuid1 uuid2] pending-pair
            [channel1 channel2] (map #(gs/channel-for-uuid (gs/current-global-state) %) pending-pair)
            game-id (u/gen-uuid)]
        (u/log "Taking two players for game " game-id " with uuids: " pending-pair "\n\n")
        (send-command {:type :start-game
