                                           fixtures
                                           :effect-name effect-name))
                            :color color
-                           :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"}
-                                       {:key "phase" :min 0 :max 1 :start :starting-phase :name "Phase"}]
-                         :end-keys end-keys))))
-
-(defn make-square-cue
+                           :variables [{:key "beats" :min 1 :max 32 :type :integer :start 2 :name "Beats"}
+                                       {:key "cycles" :min 1 :max 10 :type :integer :start 1 :name "Cycles"}
+                                       {:key "phase" :min 0 :max 1 :start 0 :name "Phase"}]
+                           :end-keys end-keys))))
+
+(defn make-square-dimmer-cue
   "Create a cue which applies a square oscillator to the dimmers of
-  the specified set of fixtures, with cue parameters to adjust the
-  beat ratio and pulse width, starting with default values established
-  by show parameters."
+  the specified set of fixtures, with cue variables to adjust the
+  oscillator parameters."
   [group x y color]
   (let [[effect-key fixtures end-keys effect-name] (build-group-cue-elements group "dimmers" "square")]
     (ct/set-cue! (:cue-grid *show*) x y

  (atom nil))

(defn- build-focus-oscillator
  "Creates a cue which oscillates a fixture's focus between a minimum
  and minimum value using a sine oscillator with cue variables to
  adjust the range and the oscillator's parameters."
  [effect-key effect-name fixtures]

                                        fixtures
                                        :effect-name effect-name))
                         :color color
                         :variables [{:key "beats" :min 1 :max 32 :type :integer :start 2 :name "Beats"}
                                     {:key "cycles" :min 1 :max 10 :type :integer :start 1 :name "Cycles"}
                                     {:key "phase" :min 0 :max 1 :start 0 :name "Phase"}]
                         :end-keys end-keys))))

(defn make-sine-dimmer-cue
  "Create a cue which applies a sine oscillator to the dimmers of the
  specified set of fixtures, with cue variables to adjust the
  oscillator parameters."
  [group x y color]
  (let [[effect-key fixtures end-keys effect-name] (build-group-cue-elements group "dimmers" "sine")]
    (ct/set-cue! (:cue-grid *show*) x y
