                          :variables [{:key "beats" :min 1 :max 32 :type :integer :start :starting-beats :name "Beats"}
                                      {:key "cycles" :min 1 :max 10 :type :integer :start :starting-cycles
                                       :name "Cycles"}]
-                         :end-keys end-keys)))
+                         :end-keys end-keys))))
 
 (defn make-sine-cue
   "Create a cue which applies a sine oscillator to the specified
   set of fixtures, with cue parameters to adjust the beat ratio,
   starting with default values established by show parameters."
-  [effect-name x y effect-key fixtures & {:keys [color end-keys]}]
+  [group x y color]
   (when-not (= (type (show/get-variable :starting-beats)) Long)
     ;; If the default beat ratio numerator has not yet been set, establish it as 2
     (show/set-variable! :starting-beats 2))

                                       {:key :starting-cycles :min 1 :max 10 :type :integer :name "Cycles"}]))

    ;; Dimmer oscillator cues: Square
    (make-square-cue "All Square" 0 6 :dimmers (show/all-fixtures) :color :cyan
                   :end-keys [:torrent-dimmers :blade-dimmers :ws-dimmers :puck-dimmers :hex-dimmers
                              :snowball-dimmers])

    (make-square-cue "Torrent Square" 1 6 :torrent-dimmers (show/fixtures-named "torrent") :color :green
                       :end-keys [:dimmers])

    (make-square-cue "Blade Square" 2 6 :blade-dimmers (show/fixtures-named "blade") :color :green
                       :end-keys [:dimmers])

    (make-square-cue "WS Square" 3 6 :ws-dimmers (show/fixtures-named "ws") :color :green
                       :end-keys [:dimmers])

    (make-square-cue "Hex Square" 4 6 :hex-dimmers (show/fixtures-named "hex") :color :green
                       :end-keys [:dimmers])

    (make-square-cue "Puck Square" 5 6 :puck-dimmers (show/fixtures-named "puck") :color :green
                       :end-keys [:dimmers])

    (make-square-cue "Snowball Square" 6 6 :snowball-dimmers (show/fixtures-named "snowball") :color :green
                       :end-keys [:dimmers])

    (ct/set-cue! (:cue-grid *show*) 7 6
                 (cues/cue :beat-ratio

    ;; If the default beat ratio denominator has not yet been set, establish it as 1
    (show/set-variable! :starting-cycles 1))
  
  (let [[effect-key fixtures end-keys effect-name] (build-group-cue-elements group "dimmers" "saw")]
    (ct/set-cue! (:cue-grid *show*) x y
                 (cues/cue effect-key
                           (fn [var-map] (dimmer-effect
                                          (oscillators/build-oscillated-param
                                           (oscillators/sawtooth :down? (params/bind-keyword-param (:down var-map)
                                                                                                   Boolean true)
                                                                 :interval-ratio (build-ratio-param var-map)))
                                          fixtures
                                          :effect-name effect-name))
                           :color color
                           :variables [{:key "beats" :min 1 :max 32 :type :integer :start :starting-beats :name "Beats"}
                                       {:key "down" :type :boolean :start :sawtooth-down? :name "Down?"}
                                       {:key "cycles" :min 1 :max 10 :type :integer :start :starting-cycles
                                        :name "Cycles"}]
                           :end-keys end-keys))))

(defn make-triangle-cue
  "Create a cue which applies a triangle oscillator to the specified
  set of fixtures, with cue parameters to adjust the beat ratio,
  starting with default values established by show parameters."
  [group x y color]
  (when-not (= (type (show/get-variable :starting-beats)) Long)
    ;; If the default beat ratio numerator has not yet been set, establish it as 2
    (show/set-variable! :starting-beats 2))
