       (go
        (while true
          (<! mouseover)
-         (remove-marker biz-layer id)
-         (add-numbered-marker-active biz-layer latitude longitude id)))
+         (remove-marker layer layer-items id)
+         (add-numbered-marker-active layer layer-items latitude longitude id)))
       (go
        (while true
          (<! mouseout)
-         (remove-marker biz-layer id)
-         (add-numbered-marker biz-layer latitude longitude id))))))
+         (remove-marker layer layer-items id)
+         (add-numbered-marker layer layer-items latitude longitude id))))))
 
 ;; Yelp/Directions setup
 
-(defn fetch-draw-directions [m to from transport-type category]
+(defn fetch-draw-directions [m to from transport-type directions-layer]
   (go
    (let [{:keys [lat-lngs start-point end-point map-bounds] :as directions}
          (<! (mapquest/directions to from transport-type))]
-     (draw-directions m directions)
+     (draw-directions m directions directions-layer)
      (reset-map m map-bounds)
      directions)))
 
-(defn draw-yelp-info [m directions category]
+(defn draw-yelp-info [m directions category layer layer-items]
   (go
    (let [{:keys [lat-lngs start-point end-point map-bounds]} directions]
      (let [numbered-biz (<! (yelp/find-and-rank-businesses


;; Map configuration/alteration

(defn setup-map [m lat lng]
  (-> m (.setView [lat lng] 12))
  (-> L (.tileLayer tile-url {:maxZoom 16 ;; this is the limitation of the tile

      (.addLayer directions-layer l))
    (.addTo directions-layer m)))

(defn draw-yelp-markers [m numbered-biz layer layer-items]
  (doseq [biz numbered-biz]
    (let [{:keys [id name url]} biz
          {:keys [latitude longitude]} (-> biz :location :coordinate)]
      (add-numbered-marker layer layer-items latitude longitude id)))
  (.addTo layer m))

;; Yelp sidebar

(defn create-biz-sidebar [start-point end-point numbered-biz layer layer-items]
  (dommy/append! (sel1 :#biz-container)
                 (biz-template start-point end-point numbered-biz))
  (doseq [biz numbered-biz]
