diff --git a/src/cljs/grub/core.cljs b/src/cljs/grub/core.cljs
index 7850910..14489d2 100644
--- a/src/cljs/grub/core.cljs
+++ b/src/cljs/grub/core.cljs
@@ -12,7 +12,7 @@
     (state/sync-state! from-remote to-remote reset? state-changes)))
 
 (defn init-app []
-  (let [state-changes (view/render-app state/state state-changes)]
+  (let [state-changes (view/render-app state/state)]
     (connect-to-server true state-changes)))
 
 (init-app)
diff --git a/src/cljs/grub/state.cljs b/src/cljs/grub/state.cljs
index 7e8410e..34f5c6c 100644
--- a/src/cljs/grub/state.cljs
+++ b/src/cljs/grub/state.cljs
@@ -16,14 +16,16 @@
     @server-state
     (get @unacked-states hash)))
 
-(defn sync-state! [to from reset? state-changes]
+(defn send-state-changes-to-server! [state-changes from]
   (go-loop []
            (when-let [current-state (<! state-changes)]
              (when-not (= @server-state current-state)
                (let [msg (cs/diff-states @server-state current-state)]
                  (swap! unacked-states assoc (:hash msg) current-state)
                  (a/put! from msg)))
-             (recur)))
+             (recur))))
+
+(defn handle-received-changes! [to from]
   (go-loop [] 
            (if-let [{:keys [type diff hash shadow-hash] :as msg} (<! to)]
              (do (condp = type
@@ -45,7 +47,9 @@
                                (reset! state (:state msg)))
                    (logs "Invalid msg:" msg))
                  (recur))
-             (remove-watch state :state)))
-  (if reset? 
-    (a/put! from cs/complete-sync-request)
-    (a/put! from (cs/diff-states @server-state @state))))
+             (remove-watch state :state))))
+
+(defn sync-state! [to from reset? state-changes]
+  (send-state-changes-to-server! state-changes from)
+  (handle-received-changes! to from)
+  (a/put! from (if reset? cs/complete-sync-request (cs/diff-states @server-state @state))))