                         (rx/filter (ptk/type? ::dp/files-fetched) stream))
                 (rx/take 1)
                 (rx/do #(reset! st/loader false))
-                (rx/mapcat #(rx/of (initialized file-id)
+                (rx/mapcat #(rx/of (initialize-state file-id)
+                                   (initialize-file file-id)
                                    (initialize-page page-id)
                                    #_(initialize-alignment page-id)))))
-          (rx/merge
-           (rx/of (initialize-page page-id))))))))
-
-(defn- initialized
+          (rx/of (initialize-file file-id)
+                 (initialize-page page-id)))))))
+
+(defn- initialize-state
   [file-id]
   (us/assert ::us/uuid file-id)
-  (ptk/reify ::initialized
-    ptk/UpdateEvent
-    (update [_ state]
-      (let [file (get-in state [:files file-id])
-            local (assoc workspace-default :file-id file-id)]
+  (ptk/reify ::initialize-state
+    ptk/UpdateEvent
+    (update [_ state]
+      (let [local (assoc workspace-default :file-id file-id)]
         (-> state
-            (assoc :workspace-file file)
             (assoc :workspace-layout default-layout)
             (assoc :workspace-local local))))))
 
-(defn finalize
-  [file-id page-id]
+(defn- initialize-file
+  [file-id]
   (us/assert ::us/uuid file-id)
-  (us/assert ::us/uuid page-id)
-  (ptk/reify ::finalize
-    ptk/UpdateEvent
-    (update [_ state]
-      (dissoc state
-              :workspace-page
-              :workspace-data))))
+  (ptk/reify ::initialize-file
+    ptk/UpdateEvent
+    (update [_ state]
+      (let [file (get-in state [:files file-id])]
+        (assoc state :workspace-file file)))))
 
 (defn initialize-page
   [page-id]

             (rx/filter #(satisfies? IBatchedChange %))
             (rx/debounce 500)
             (rx/map (constantly commit-batched-changes))
             (rx/finalize #(prn "FINALIZE" %))
             (rx/take-until stoper))))))

;; --- Fetch Workspace Users


   :drawing-tool nil
   :tooltip nil})

(declare initialize-state)
(declare initialize-page)
(declare initialize-file)

(defn initialize
  "Initialize the workspace state."
