        (if (empty? numbered-biz)
          (dommy/append! (sel1 :#map-text-container) (no-biz-template))
          (do
-           (draw-yelp-markers m numbered-biz)
-           (create-biz-sidebar start-point end-point numbered-biz)
+           (draw-yelp-markers m numbered-biz layer layer-items)
+           (create-biz-sidebar start-point end-point numbered-biz layer layer-items)
            (expand-biz-sidebar)) ;; reduce map size to allow for biz sidebar
          (reset-map m map-bounds))))))
 
 ;; Full page rendering after button submit
 
-(defn setup-button-click [lat lng]
-  (let [clicks (u/listen (dom/getElement "btn-go") "click")]
+(defn setup-button-click [lat lng map]
+  (let [clicks (u/listen (dom/getElement "btn-go") "click")
+        directions-layer (-> L (.layerGroup []))
+        biz-layer (-> L (.layerGroup []))
+        biz-layer-items (atom {})]
     (go (while true
           ;; wait for a click
           (<! clicks)

            [ontheway.mapquest :as mapquest]
            [ontheway.yelp :as yelp]))

;; Bootstrap to setup leaflet/clojurescript lib, blade
(blade/bootstrap)

;; Declare constants

;; (def tile-url "https://{s}.tiles.mapbox.com/v3/{id}/{z}/{x}/{y}.png")
(def tile-url "http://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}")
(def mappy (-> L (.map "mappy")))
(def directions-layer (-> L (.layerGroup [])))
(def biz-layer (-> L (.layerGroup [])))
(def biz-layer-items (atom {}))
(def autocompleteFrom (google.maps.places.Autocomplete.
                       (dom/getElement "directions-from")))
(def autocompleteTo (google.maps.places.Autocomplete.
                     (dom/getElement "directions-to")))

(def my-lat)
(def my-lng)

;; set the more options collapser to not toggle
(.collapse (js/$ ".collapse") {:toggle false})

;; Allows handling Nodelist like a seq
(extend-type js/NodeList
  ISeqable
  (-seq [array] (array-seq array 0)))

;; Form fields

(defn from-query [lat lng]
  (if-let [node (.getPlace autocompleteFrom)]

(go 
 (let [coords    (.-coords (<! (u/get-position)))
       latitude  (.-latitude coords)
       longitude (.-longitude coords)
       map (-> L (.map "mappy"))]
   (setup-map map latitude longitude)
   (setup-button-click latitude longitude map)))
