   of fixtures, with cue parameters to adjust the beat ratio and pulse
   width, 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))
-  (when-not (= (type (show/get-variable :starting-cycles)) Long)
-    ;; If the default beat ratio denominator has not yet been set, establish it as 1
-    (show/set-variable! :starting-cycles 1))
-  (when-not (= (type (show/get-variable :starting-width)) Double)
-    ;; If the default pulse width has not yet been set, establish it as 0.5
-    (show/set-variable! :starting-width 0.5))
-  (when-not (= (type (show/get-variable :starting-phase)) Double)
-    ;; If the default pulse phase has not yet been set, establish it as 0.0
-    (show/set-variable! :starting-phase 0.0))
-  
-  ;; TODO: Make width and phase adjustable params. Is blowing up in oscillators/square right now
   (let [[effect-key fixtures end-keys effect-name] (build-group-cue-elements group "dimmers" "square")]
     (ct/set-cue! (:cue-grid *show*) x y
                (cues/cue effect-key
                          (fn [var-map] (dimmer-effect
                                         (oscillators/build-oscillated-param
                                          (oscillators/square :interval-ratio (build-ratio-param var-map)
-                                                             :width (params/bind-keyword-param (:width var-map)
-                                                                                                   Number 0.5)))
+                                                             :width (:width var-map)
+                                                             :phase (:phase var-map)))
                                         fixtures
                                         :effect-name effect-name))
                          :color color
                          :variables [{:key "beats" :min 1 :max 32 :type :integer :start :starting-beats :name "Beats"}
                                      {:key "width" :min 0 :max 1 :start :starting-width :name "Width"}
                                      {:key "cycles" :min 1 :max 10 :type :integer :start :starting-cycles
-                                      :name "Cycles"}]
+                                      :name "Cycles"}
+                                     {:key "phase" :min 0 :max 1 :start :starting-phase :name "Phase"}]
                          :end-keys end-keys))))
 
 (defn x-phase

  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))
  (when-not (= (type (show/get-variable :starting-cycles)) Long)
    ;; 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" "triangle")]
    (ct/set-cue! (:cue-grid *show*) x y
               (cues/cue effect-key
                         (fn [var-map] (dimmer-effect
                                        (oscillators/build-oscillated-param
                                         (oscillators/triangle :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 "cycles" :min 1 :max 10 :type :integer :start :starting-cycles
                                      :name "Cycles"}]
                         :end-keys end-keys))))

(defn make-sine-cue

  group of fixtures, with cue parameters to adjust the beat ratio,
  starting with default values established by show parameters."
  [group x y color]
  (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? (:down var-map)
                                                                 :interval-ratio (build-ratio-param var-map)
                                                                 :phase (:phase 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"}
                                       {:key "phase" :min 0 :max 1 :start :starting-phase :name "Phase"}]
                           :end-keys end-keys))))

(defn make-triangle-cue
