             (dom/button
              #js {:id "add-item"
                   :className "button"
-                  :onClick (fn [e] (put! current-item :new))}
+                  :onClick (fn [e] (put! navigate :new))}
              "Add")
 
             (dom/button
              #js {:id "search-item"
                   :className "button"
-                  :onClick (fn [e] (put! current-item :search))}
+                  :onClick (fn [e] (put! navigate :search))}
              "Search"))
           
           (dom/div nil
             (case (first (:route app))
-                      ;; what need? XXX
               :add-item (om/build item-add-view (:current-item app) opts)
-              ;; why bring current-item here?
               :search-item (om/build search-view (:items app)  opts)
-              ;;:list-items (om/build items-view (:items app) opts)
               :view-item (om/build item-view (:current-item app) opts))))))))
 
 (util/edn-xhr

                                {:url (str "/search/" (:subs data))}))]
                  ;; XXX: what if there's no hit?
                  ;;(.setToken history (str "/items")) ;; XXX
                  (om/transact! app :items (fn [_] data)) ;; search results
                  )
                
                (recur))))))
    
    om/IRenderState
    (render-state [_ {:keys [current-item event]}]
      (let [route (:route app)
            opts {:opts {:current-item current-item
                         :event event}}]
        ;; menu bar
        (dom/div nil

               (dom/h2 nil (:item/title item))
               (dom/br nil "")
               (link (str "#/" (:item/id item)) (:item/id item))
               (dom/br nil "")
               (dom/br nil "")
               (apply dom/div nil
                      (prepare-item (:item/text item)))))))

(defn item-add-view [item owner {:keys [navigate event]}]
  (reify
    om/IRenderState
    (render-state [_ state] ;; keys chan as etc?
      (let [opts {:navigate navigate
                  :event event}]
        (dom/div #js {:id "item-add-view"}
        (dom/div #js {:id "item-info"}
