       mapTypeId: google.maps.MapTypeId.ROADMAP
     @map = new google.maps.Map(document.getElementById('map'), mapOptions)
 
-    #@map.addLayer @create_marker('from', new L.LatLng(0,0), Transit.Markers.Start)
-    #@map.addLayer @create_marker('to', new L.LatLng(0,0), Transit.Markers.End)
+    Transit.Markers = {}
+
+    @create_marker('from', new google.maps.LatLng(0, 0), Transit.Markers.Start)
+    @create_marker('to', new google.maps.LatLng(0, 0), Transit.Markers.End)
 
     #@on 'change:south_west change:north_east', @set_max_bounds
-    #@on 'change', @update_markers
+    @on 'change', @update_markers
     @fetch()
 
   parse: (data) =>


  update_marker: (attribute) =>
    marker_name = "#{attribute}_marker"
    point = new L.LatLng(@get(attribute).lat, @get(attribute).lon)
    if not @has(marker_name)
      # marker hasn't been added to the map yet, create it
      @create_marker(attribute, point, Transit.Markers.Start)
    else
      # marker is already on the map, update its location
      @get(marker_name).setLatLng(point)

  update_markers: =>
    # create or update markers from given coordinates

    new L.MultiPolyline(latlngs, color: color, opacity: 0.6, clickable: false)

  create_marker: (name, position, icon, draggable=true, clickable=false) ->
    marker = new google.maps.Marker
      position: position
      #icon: new icon()
      draggable: draggable
      clickable: clickable
      map: @map

    # update location after the drag, trigger a drag event on a drag
    google.maps.event.addListener marker, 'dragstart', =>
      @trigger "drag drag:start drag:start:#{name}"
    google.maps.event.addListener marker, 'dragend', (event) =>
      @set(name, lat: event.latLng.lat(), lon: event.latLng.lng())
      @trigger "drag drag:end drag:end:#{name}"
    # add marker to map and model
    @set "#{name}_marker", marker, silent: true
    return marker
