diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 166f0ac23..06e808be4 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -430,6 +430,60 @@ export const { crush } = registerControl('crush');
  */
 export const { coarse } = registerControl('coarse');
 
+/**
+ * modulate the amplitude of a sound with a continuous waveform
+ *
+ * @name am
+ * @synonyms tremelo
+ * @param {number | Pattern} speed modulation speed in cycles
+ * @example
+ * s("triangle").am("2").amshape("<tri saw ramp square>").amdepth(.5)
+ *
+ */
+export const { am, tremolo } = registerControl(['am', 'amdepth', 'amskew', 'amphase'], 'tremolo');
+
+/**
+ * depth of amplitude modulation
+ *
+ * @name amdepth
+ * @param {number | Pattern} depth
+ * @example
+ * s("triangle").am(1).amdepth("1")
+ *
+ */
+export const { amdepth } = registerControl('amdepth');
+/**
+ * alter the shape of the modulation waveform
+ *
+ * @name amskew
+ * @param {number | Pattern} amount between 0 & 1, the shape of the waveform
+ * @example
+ * note("{f a c e}%16").am(4).amskew("<.5 0 1>")
+ *
+ */
+export const { amskew } = registerControl('amskew');
+
+/**
+ * alter the phase of the modulation waveform
+ *
+ * @name amphase
+ * @param {number | Pattern} offset the offset in cycles of the modulation
+ * @example
+ * note("{f a c e}%16").am(4).amphase("<0 .25 .66>")
+ *
+ */
+export const { amphase } = registerControl('amphase');
+
+/**
+ * shape of amplitude modulation
+ *
+ * @name amshape
+ * @param {number | Pattern} shape tri | square | sine | saw | ramp
+ * @example
+ * note("{f g c d}%16").am(4).amshape("ramp").s("sawtooth")
+ *
+ */
+export const { amshape } = registerControl('amshape');
 /**
  * Allows you to set the output channels on the interface
  *
@@ -1529,7 +1583,6 @@ export const { zmod } = registerControl('zmod');
 // like crush but scaled differently
 export const { zcrush } = registerControl('zcrush');
 export const { zdelay } = registerControl('zdelay');
-export const { tremolo } = registerControl('tremolo');
 export const { zzfx } = registerControl('zzfx');
 
 /**
diff --git a/packages/core/cyclist.mjs b/packages/core/cyclist.mjs
index 08b893752..a170ca3a5 100644
--- a/packages/core/cyclist.mjs
+++ b/packages/core/cyclist.mjs
@@ -8,61 +8,51 @@ import createClock from './zyklus.mjs';
 import { logger } from './logger.mjs';
 
 export class Cyclist {
-  constructor({ interval, onTrigger, onToggle, onError, getTime, latency = 0.1, setInterval, clearInterval }) {
+  constructor({ interval = 0.05, onTrigger, onToggle, onError, getTime, latency = 0.1, setInterval, clearInterval }) {
     this.started = false;
     this.cps = 0.5;
-    this.num_ticks_since_cps_change = 0;
-    this.lastTick = 0; // absolute time when last tick (clock callback) happened
-    this.lastBegin = 0; // query begin of last tick
-    this.lastEnd = 0; // query end of last tick
+    this.time_at_last_tick_message = 0;
+    this.cycle = 0;
     this.getTime = getTime; // get absolute time
     this.num_cycles_at_cps_change = 0;
     this.seconds_at_cps_change; // clock phase when cps was changed
+    this.num_ticks_since_cps_change = 0;
     this.onToggle = onToggle;
     this.latency = latency; // fixed trigger time offset
+
+    this.interval = interval;
+
     this.clock = createClock(
       getTime,
       // called slightly before each cycle
-      (phase, duration, _, t) => {
-        if (this.num_ticks_since_cps_change === 0) {
-          this.num_cycles_at_cps_change = this.lastEnd;
-          this.seconds_at_cps_change = phase;
+      (phase, duration, _, time) => {
+        if (this.started === false) {
+          return;
         }
-        this.num_ticks_since_cps_change++;
-        const seconds_since_cps_change = this.num_ticks_since_cps_change * duration;
-        const num_cycles_since_cps_change = seconds_since_cps_change * this.cps;
+        const num_seconds_since_cps_change = this.num_ticks_since_cps_change * duration;
+        const tickdeadline = phase - time;
+        const lastTick = time + tickdeadline;
+        const num_cycles_since_cps_change = num_seconds_since_cps_change * this.cps;
+        const begin = this.num_cycles_at_cps_change + num_cycles_since_cps_change;
+        const secondsSinceLastTick = time - lastTick - duration;
+        const eventLength = duration * this.cps;
+        const end = begin + eventLength;
+        this.cycle = begin + secondsSinceLastTick * this.cps;
 
-        try {
-          const begin = this.lastEnd;
-          this.lastBegin = begin;
-          const end = this.num_cycles_at_cps_change + num_cycles_since_cps_change;
-          this.lastEnd = end;
-          this.lastTick = phase;
+        //account for latency and tick duration when using cycle calculations for audio downstream
+        const cycle_gap = (this.latency - duration) * this.cps;
 
-          if (phase < t) {
-            // avoid querying haps that are in the past anyway
-            console.log(`skip query: too late`);
-            return;
+        const haps = this.pattern.queryArc(begin, end, { _cps: this.cps });
+        haps.forEach((hap) => {
+          if (hap.hasOnset()) {
+            let targetTime = (hap.whole.begin - this.num_cycles_at_cps_change) / this.cps;
+            targetTime = targetTime + this.latency + tickdeadline + time - num_seconds_since_cps_change;
+            const duration = hap.duration / this.cps;
+            onTrigger?.(hap, tickdeadline, duration, this.cps, targetTime, this.cycle - cycle_gap);
           }
-
-          // query the pattern for events
-          const haps = this.pattern.queryArc(begin, end, { _cps: this.cps });
-
-          haps.forEach((hap) => {
-            if (hap.hasOnset()) {
-              const targetTime =
-                (hap.whole.begin - this.num_cycles_at_cps_change) / this.cps + this.seconds_at_cps_change + latency;
-              const duration = hap.duration / this.cps;
-              // the following line is dumb and only here for backwards compatibility
-              // see https://github.com/tidalcycles/strudel/pull/1004
-              const deadline = targetTime - phase;
-              onTrigger?.(hap, deadline, duration, this.cps, targetTime);
-            }
-          });
-        } catch (e) {
-          logger(`[cyclist] error: ${e.message}`);
-          onError?.(e);
-        }
+        });
+        this.time_at_last_tick_message = time;
+        this.num_ticks_since_cps_change++;
       },
       interval, // duration of each cycle
       0.1,
@@ -75,16 +65,24 @@ export class Cyclist {
     if (!this.started) {
       return 0;
     }
-    const secondsSinceLastTick = this.getTime() - this.lastTick - this.clock.duration;
-    return this.lastBegin + secondsSinceLastTick * this.cps; // + this.clock.minLatency;
+    const gap = (this.getTime() - this.time_at_last_tick_message) * this.cps;
+    return this.cycle + gap;
   }
+
+  setCycle = (cycle) => {
+    this.num_ticks_since_cps_change = 0;
+    this.num_cycles_at_cps_change = cycle;
+  };
   setStarted(v) {
     this.started = v;
+
+    this.setCycle(0);
     this.onToggle?.(v);
   }
   start() {
     this.num_ticks_since_cps_change = 0;
     this.num_cycles_at_cps_change = 0;
+
     if (!this.pattern) {
       throw new Error('Scheduler: no pattern set! call .setPattern first.');
     }
@@ -113,6 +111,8 @@ export class Cyclist {
     if (this.cps === cps) {
       return;
     }
+    const num_seconds_since_cps_change = this.num_ticks_since_cps_change * this.interval;
+    this.num_cycles_at_cps_change = this.num_cycles_at_cps_change + num_seconds_since_cps_change * cps;
     this.cps = cps;
     this.num_ticks_since_cps_change = 0;
   }
diff --git a/packages/core/neocyclist.mjs b/packages/core/neocyclist.mjs
index 4600d0ef9..6a92050c5 100644
--- a/packages/core/neocyclist.mjs
+++ b/packages/core/neocyclist.mjs
@@ -10,11 +10,8 @@ export class NeoCyclist {
   constructor({ onTrigger, onToggle, getTime }) {
     this.started = false;
     this.cps = 0.5;
-    this.lastTick = 0; // absolute time when last tick (clock callback) happened
     this.getTime = getTime; // get absolute time
     this.time_at_last_tick_message = 0;
-
-    this.num_cycles_at_cps_change = 0;
     this.onToggle = onToggle;
     this.latency = 0.1; // fixed trigger time offset
     this.cycle = 0;
@@ -86,7 +83,7 @@ export class NeoCyclist {
             this.latency +
             this.worker_time_dif;
           const duration = hap.duration / this.cps;
-          onTrigger?.(hap, 0, duration, this.cps, targetTime);
+          onTrigger?.(hap, 0, duration, this.cps, targetTime, this.cycle);
         }
       });
     };
diff --git a/packages/core/repl.mjs b/packages/core/repl.mjs
index 5b7bcd71b..af5935787 100644
--- a/packages/core/repl.mjs
+++ b/packages/core/repl.mjs
@@ -178,15 +178,15 @@ export function repl({
 
 export const getTrigger =
   ({ getTime, defaultOutput }) =>
-  async (hap, deadline, duration, cps, t) => {
+  async (hap, deadline, duration, cps, t, cycle = 0) => {
     // TODO: get rid of deadline after https://github.com/tidalcycles/strudel/pull/1004
     try {
       if (!hap.context.onTrigger || !hap.context.dominantTrigger) {
-        await defaultOutput(hap, deadline, duration, cps, t);
+        await defaultOutput(hap, deadline, duration, cps, t, cycle);
       }
       if (hap.context.onTrigger) {
         // call signature of output / onTrigger is different...
-        await hap.context.onTrigger(getTime() + deadline, hap, getTime(), cps, t);
+        await hap.context.onTrigger(getTime() + deadline, hap, getTime(), cps, t, cycle);
       }
     } catch (err) {
       logger(`[cyclist] error: ${err.message}`, 'error');
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index c0ba96e06..25859278d 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -260,7 +260,7 @@ export function resetGlobalEffects() {
   analysersData = {};
 }
 
-export const superdough = async (value, t, hapDuration) => {
+export const superdough = async (value, t, hapDuration, cps, cycle) => {
   const ac = getAudioContext();
   if (typeof value !== 'object') {
     throw new Error(
@@ -281,6 +281,10 @@ export const superdough = async (value, t, hapDuration) => {
   }
   // destructure
   let {
+    am,
+    amdepth = 1,
+    amskew = 0.5,
+    amphase = 0,
     s = 'triangle',
     bank,
     source,
@@ -322,8 +326,10 @@ export const superdough = async (value, t, hapDuration) => {
     phasercenter,
     //
     coarse,
+
     crush,
     shape,
+
     shapevol = 1,
     distort,
     distortvol = 1,
@@ -470,6 +476,19 @@ export const superdough = async (value, t, hapDuration) => {
   crush !== undefined && chain.push(getWorklet(ac, 'crush-processor', { crush }));
   shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape, postgain: shapevol }));
   distort !== undefined && chain.push(getWorklet(ac, 'distort-processor', { distort, postgain: distortvol }));
+  am !== undefined &&
+    chain.push(
+      getWorklet(ac, 'am-processor', {
+        speed: am,
+        depth: amdepth,
+        skew: amskew,
+        phaseoffset: amphase,
+        // shape: amshape,
+
+        cps,
+        cycle,
+      }),
+    );
 
   compressorThreshold !== undefined &&
     chain.push(
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index a1f524ca5..81a9c9086 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -1,7 +1,134 @@
 // coarse, crush, and shape processors adapted from dktr0's webdirt: https://github.com/dktr0/WebDirt/blob/5ce3d698362c54d6e1b68acc47eb2955ac62c793/dist/AudioWorklets.js
 // LICENSE GNU General Public License v3.0 see https://github.com/dktr0/WebDirt/blob/main/LICENSE
-
+import { clamp, _mod } from './util.mjs';
+// const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
 const blockSize = 128;
+// adjust waveshape to remove frequencies above nyquist to prevent aliasing
+// referenced from https://www.kvraudio.com/forum/viewtopic.php?t=375517
+function polyBlep(phase, dt) {
+  // 0 <= phase < 1
+  if (phase < dt) {
+    phase /= dt;
+    // 2 * (phase - phase^2/2 - 0.5)
+    return phase + phase - phase * phase - 1;
+  }
+
+  // -1 < phase < 0
+  else if (phase > 1 - dt) {
+    phase = (phase - 1) / dt;
+    // 2 * (phase^2/2 + phase + 0.5)
+    return phase * phase + phase + phase + 1;
+  }
+
+  // 0 otherwise
+  else {
+    return 0;
+  }
+}
+
+const waveshapes = {
+  sine(phase) {
+    return Math.sin(Math.PI * 2 * phase);
+  },
+  custom(phase, values = [0, 1]) {
+    const numParts = values.length - 1;
+    const currPart = Math.floor(phase * numParts);
+
+    const partLength = 1 / numParts;
+    const startVal = clamp(values[currPart], 0, 1);
+    const endVal = clamp(values[currPart + 1], 0, 1);
+    const y2 = endVal;
+    const y1 = startVal;
+    const x1 = 0;
+    const x2 = partLength;
+    const slope = (y2 - y1) / (x2 - x1);
+    return slope * (phase - partLength * currPart) + startVal;
+  },
+  sawblep(phase, dt) {
+    const v = 2 * phase - 1;
+    return v - polyBlep(phase, dt);
+  },
+  ramp(phase) {
+    return phase;
+  },
+  saw(phase) {
+    return 1 - phase;
+  },
+  tri(phase, skew = 0.5) {
+    const x = 1 - skew;
+    if (phase >= skew) {
+      return 1 / x - phase / x;
+    }
+    return phase / skew;
+  },
+  square(phase, skew = 0.5) {
+    if (phase >= skew) {
+      return 0;
+    }
+    return 1;
+  },
+};
+
+class AMProcessor extends AudioWorkletProcessor {
+  static get parameterDescriptors() {
+    return [
+      { name: 'cps', defaultValue: 0.5 },
+      { name: 'speed', defaultValue: 0.5 },
+      { name: 'cycle', defaultValue: 0 },
+      { name: 'skew', defaultValue: 0.5 },
+      { name: 'depth', defaultValue: 1 },
+      { name: 'phaseoffset', defaultValue: 0 },
+    ];
+  }
+
+  constructor() {
+    super();
+    this.phase;
+    this.started = false;
+  }
+
+  incrementPhase(dt) {
+    this.phase += dt;
+    if (this.phase > 1.0) {
+      this.phase = this.phase - 1;
+    }
+  }
+
+  process(inputs, outputs, parameters) {
+    const input = inputs[0];
+    const output = outputs[0];
+    const hasInput = !(input[0] === undefined);
+    if (this.started && !hasInput) {
+      return false;
+    }
+    this.started = hasInput;
+
+    const speed = parameters['speed'][0];
+    const cps = parameters['cps'][0];
+    const cycle = parameters['cycle'][0];
+    const depth = parameters['depth'][0];
+    const skew = parameters['skew'][0];
+    const phaseoffset = parameters['phaseoffset'][0];
+
+    const frequency = speed * cps;
+    if (this.phase == null) {
+      const secondsPassed = cycle / cps;
+      this.phase = _mod(secondsPassed * frequency + phaseoffset, 1);
+    }
+    // eslint-disable-next-line no-undef
+    const dt = frequency / sampleRate;
+    for (let n = 0; n < blockSize; n++) {
+      for (let i = 0; i < input.length; i++) {
+        const modval = clamp(waveshapes.tri(this.phase, skew) * depth + (1 - depth), 0, 1);
+        output[i][n] = input[i][n] * modval;
+      }
+      this.incrementPhase(dt);
+    }
+    return true;
+  }
+}
+registerProcessor('am-processor', AMProcessor);
+
 class CoarseProcessor extends AudioWorkletProcessor {
   static get parameterDescriptors() {
     return [{ name: 'coarse', defaultValue: 1 }];
@@ -142,34 +269,7 @@ class DistortProcessor extends AudioWorkletProcessor {
 }
 registerProcessor('distort-processor', DistortProcessor);
 
-// adjust waveshape to remove frequencies above nyquist to prevent aliasing
-// referenced from https://www.kvraudio.com/forum/viewtopic.php?t=375517
-const polyBlep = (phase, dt) => {
-  // 0 <= phase < 1
-  if (phase < dt) {
-    phase /= dt;
-    // 2 * (phase - phase^2/2 - 0.5)
-    return phase + phase - phase * phase - 1;
-  }
-
-  // -1 < phase < 0
-  else if (phase > 1 - dt) {
-    phase = (phase - 1) / dt;
-    // 2 * (phase^2/2 + phase + 0.5)
-    return phase * phase + phase + phase + 1;
-  }
-
-  // 0 otherwise
-  else {
-    return 0;
-  }
-};
-
-const saw = (phase, dt) => {
-  const v = 2 * phase - 1;
-  return v - polyBlep(phase, dt);
-};
-
+// SUPERSAW
 function lerp(a, b, n) {
   return n * (b - a) + a;
 }
@@ -269,7 +369,7 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
 
       for (let i = 0; i < output[0].length; i++) {
         this.phase[n] = this.phase[n] ?? Math.random();
-        const v = saw(this.phase[n], dt);
+        const v = waveshapes.sawblep(this.phase[n], dt);
 
         output[0][i] = output[0][i] + v * gainL;
         output[1][i] = output[1][i] + v * gainR;
diff --git a/packages/webaudio/webaudio.mjs b/packages/webaudio/webaudio.mjs
index f82a436a9..36d11b096 100644
--- a/packages/webaudio/webaudio.mjs
+++ b/packages/webaudio/webaudio.mjs
@@ -17,9 +17,9 @@ const hap2value = (hap) => {
 
 export const webaudioOutputTrigger = (t, hap, ct, cps) => superdough(hap2value(hap), t - ct, hap.duration / cps, cps);
 // uses more precise, absolute t if available, see https://github.com/tidalcycles/strudel/pull/1004
-export const webaudioOutput = (hap, deadline, hapDuration, cps, t) =>
-  superdough(hap2value(hap), t ? `=${t}` : deadline, hapDuration);
-
+export const webaudioOutput = (hap, deadline, hapDuration, cps, t, cycle) => {
+  return superdough(hap2value(hap), t ? `=${t}` : deadline, hapDuration, cps, cycle);
+};
 Pattern.prototype.webaudio = function () {
   return this.onTrigger(webaudioOutputTrigger);
 };
@@ -30,6 +30,7 @@ export function webaudioScheduler(options = {}) {
     defaultOutput: webaudioOutput,
     ...options,
   };
+
   const { defaultOutput, getTime } = options;
   return new strudel.Cyclist({
     ...options,
diff --git a/test/__snapshots__/examples.test.mjs.snap b/test/__snapshots__/examples.test.mjs.snap
index 30db05a20..4c98231e5 100644
--- a/test/__snapshots__/examples.test.mjs.snap
+++ b/test/__snapshots__/examples.test.mjs.snap
@@ -779,6 +779,24 @@ exports[`runs examples > example "always" example index 0 1`] = `
 ]
 `;
 
+exports[`runs examples > example "am" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | s:triangle am:2 amshape:tri amdepth:0.5 ]",
+  "[ 1/1 → 2/1 | s:triangle am:2 amshape:saw amdepth:0.5 ]",
+  "[ 2/1 → 3/1 | s:triangle am:2 amshape:ramp amdepth:0.5 ]",
+  "[ 3/1 → 4/1 | s:triangle am:2 amshape:square amdepth:0.5 ]",
+]
+`;
+
+exports[`runs examples > example "amdepth" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | s:triangle am:1 amdepth:1 ]",
+  "[ 1/1 → 2/1 | s:triangle am:1 amdepth:1 ]",
+  "[ 2/1 → 3/1 | s:triangle am:1 amdepth:1 ]",
+  "[ 3/1 → 4/1 | s:triangle am:1 amdepth:1 ]",
+]
+`;
+
 exports[`runs examples > example "amp" example index 0 1`] = `
 [
   "[ (0/1 → 1/12) ⇝ 1/8 | s:bd amp:0.1 ]",
@@ -840,6 +858,213 @@ exports[`runs examples > example "amp" example index 0 1`] = `
 ]
 `;
 
+exports[`runs examples > example "amphase" example index 0 1`] = `
+[
+  "[ 0/1 → 1/16 | note:f am:4 amphase:0 ]",
+  "[ 1/16 → 1/8 | note:a am:4 amphase:0 ]",
+  "[ 1/8 → 3/16 | note:c am:4 amphase:0 ]",
+  "[ 3/16 → 1/4 | note:e am:4 amphase:0 ]",
+  "[ 1/4 → 5/16 | note:f am:4 amphase:0 ]",
+  "[ 5/16 → 3/8 | note:a am:4 amphase:0 ]",
+  "[ 3/8 → 7/16 | note:c am:4 amphase:0 ]",
+  "[ 7/16 → 1/2 | note:e am:4 amphase:0 ]",
+  "[ 1/2 → 9/16 | note:f am:4 amphase:0 ]",
+  "[ 9/16 → 5/8 | note:a am:4 amphase:0 ]",
+  "[ 5/8 → 11/16 | note:c am:4 amphase:0 ]",
+  "[ 11/16 → 3/4 | note:e am:4 amphase:0 ]",
+  "[ 3/4 → 13/16 | note:f am:4 amphase:0 ]",
+  "[ 13/16 → 7/8 | note:a am:4 amphase:0 ]",
+  "[ 7/8 → 15/16 | note:c am:4 amphase:0 ]",
+  "[ 15/16 → 1/1 | note:e am:4 amphase:0 ]",
+  "[ 1/1 → 17/16 | note:f am:4 amphase:0.25 ]",
+  "[ 17/16 → 9/8 | note:a am:4 amphase:0.25 ]",
+  "[ 9/8 → 19/16 | note:c am:4 amphase:0.25 ]",
+  "[ 19/16 → 5/4 | note:e am:4 amphase:0.25 ]",
+  "[ 5/4 → 21/16 | note:f am:4 amphase:0.25 ]",
+  "[ 21/16 → 11/8 | note:a am:4 amphase:0.25 ]",
+  "[ 11/8 → 23/16 | note:c am:4 amphase:0.25 ]",
+  "[ 23/16 → 3/2 | note:e am:4 amphase:0.25 ]",
+  "[ 3/2 → 25/16 | note:f am:4 amphase:0.25 ]",
+  "[ 25/16 → 13/8 | note:a am:4 amphase:0.25 ]",
+  "[ 13/8 → 27/16 | note:c am:4 amphase:0.25 ]",
+  "[ 27/16 → 7/4 | note:e am:4 amphase:0.25 ]",
+  "[ 7/4 → 29/16 | note:f am:4 amphase:0.25 ]",
+  "[ 29/16 → 15/8 | note:a am:4 amphase:0.25 ]",
+  "[ 15/8 → 31/16 | note:c am:4 amphase:0.25 ]",
+  "[ 31/16 → 2/1 | note:e am:4 amphase:0.25 ]",
+  "[ 2/1 → 33/16 | note:f am:4 amphase:0.66 ]",
+  "[ 33/16 → 17/8 | note:a am:4 amphase:0.66 ]",
+  "[ 17/8 → 35/16 | note:c am:4 amphase:0.66 ]",
+  "[ 35/16 → 9/4 | note:e am:4 amphase:0.66 ]",
+  "[ 9/4 → 37/16 | note:f am:4 amphase:0.66 ]",
+  "[ 37/16 → 19/8 | note:a am:4 amphase:0.66 ]",
+  "[ 19/8 → 39/16 | note:c am:4 amphase:0.66 ]",
+  "[ 39/16 → 5/2 | note:e am:4 amphase:0.66 ]",
+  "[ 5/2 → 41/16 | note:f am:4 amphase:0.66 ]",
+  "[ 41/16 → 21/8 | note:a am:4 amphase:0.66 ]",
+  "[ 21/8 → 43/16 | note:c am:4 amphase:0.66 ]",
+  "[ 43/16 → 11/4 | note:e am:4 amphase:0.66 ]",
+  "[ 11/4 → 45/16 | note:f am:4 amphase:0.66 ]",
+  "[ 45/16 → 23/8 | note:a am:4 amphase:0.66 ]",
+  "[ 23/8 → 47/16 | note:c am:4 amphase:0.66 ]",
+  "[ 47/16 → 3/1 | note:e am:4 amphase:0.66 ]",
+  "[ 3/1 → 49/16 | note:f am:4 amphase:0 ]",
+  "[ 49/16 → 25/8 | note:a am:4 amphase:0 ]",
+  "[ 25/8 → 51/16 | note:c am:4 amphase:0 ]",
+  "[ 51/16 → 13/4 | note:e am:4 amphase:0 ]",
+  "[ 13/4 → 53/16 | note:f am:4 amphase:0 ]",
+  "[ 53/16 → 27/8 | note:a am:4 amphase:0 ]",
+  "[ 27/8 → 55/16 | note:c am:4 amphase:0 ]",
+  "[ 55/16 → 7/2 | note:e am:4 amphase:0 ]",
+  "[ 7/2 → 57/16 | note:f am:4 amphase:0 ]",
+  "[ 57/16 → 29/8 | note:a am:4 amphase:0 ]",
+  "[ 29/8 → 59/16 | note:c am:4 amphase:0 ]",
+  "[ 59/16 → 15/4 | note:e am:4 amphase:0 ]",
+  "[ 15/4 → 61/16 | note:f am:4 amphase:0 ]",
+  "[ 61/16 → 31/8 | note:a am:4 amphase:0 ]",
+  "[ 31/8 → 63/16 | note:c am:4 amphase:0 ]",
+  "[ 63/16 → 4/1 | note:e am:4 amphase:0 ]",
+]
+`;
+
+exports[`runs examples > example "amshape" example index 0 1`] = `
+[
+  "[ 0/1 → 1/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 1/16 → 1/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 1/8 → 3/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 3/16 → 1/4 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 1/4 → 5/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 5/16 → 3/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 3/8 → 7/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 7/16 → 1/2 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 1/2 → 9/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 9/16 → 5/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 5/8 → 11/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 11/16 → 3/4 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 3/4 → 13/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 13/16 → 7/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 7/8 → 15/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 15/16 → 1/1 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 1/1 → 17/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 17/16 → 9/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 9/8 → 19/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 19/16 → 5/4 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 5/4 → 21/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 21/16 → 11/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 11/8 → 23/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 23/16 → 3/2 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 3/2 → 25/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 25/16 → 13/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 13/8 → 27/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 27/16 → 7/4 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 7/4 → 29/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 29/16 → 15/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 15/8 → 31/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 31/16 → 2/1 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 2/1 → 33/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 33/16 → 17/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 17/8 → 35/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 35/16 → 9/4 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 9/4 → 37/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 37/16 → 19/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 19/8 → 39/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 39/16 → 5/2 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 5/2 → 41/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 41/16 → 21/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 21/8 → 43/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 43/16 → 11/4 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 11/4 → 45/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 45/16 → 23/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 23/8 → 47/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 47/16 → 3/1 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 3/1 → 49/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 49/16 → 25/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 25/8 → 51/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 51/16 → 13/4 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 13/4 → 53/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 53/16 → 27/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 27/8 → 55/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 55/16 → 7/2 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 7/2 → 57/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 57/16 → 29/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 29/8 → 59/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 59/16 → 15/4 | note:d am:4 amshape:ramp s:sawtooth ]",
+  "[ 15/4 → 61/16 | note:f am:4 amshape:ramp s:sawtooth ]",
+  "[ 61/16 → 31/8 | note:g am:4 amshape:ramp s:sawtooth ]",
+  "[ 31/8 → 63/16 | note:c am:4 amshape:ramp s:sawtooth ]",
+  "[ 63/16 → 4/1 | note:d am:4 amshape:ramp s:sawtooth ]",
+]
+`;
+
+exports[`runs examples > example "amskew" example index 0 1`] = `
+[
+  "[ 0/1 → 1/16 | note:f am:4 amskew:0.5 ]",
+  "[ 1/16 → 1/8 | note:a am:4 amskew:0.5 ]",
+  "[ 1/8 → 3/16 | note:c am:4 amskew:0.5 ]",
+  "[ 3/16 → 1/4 | note:e am:4 amskew:0.5 ]",
+  "[ 1/4 → 5/16 | note:f am:4 amskew:0.5 ]",
+  "[ 5/16 → 3/8 | note:a am:4 amskew:0.5 ]",
+  "[ 3/8 → 7/16 | note:c am:4 amskew:0.5 ]",
+  "[ 7/16 → 1/2 | note:e am:4 amskew:0.5 ]",
+  "[ 1/2 → 9/16 | note:f am:4 amskew:0.5 ]",
+  "[ 9/16 → 5/8 | note:a am:4 amskew:0.5 ]",
+  "[ 5/8 → 11/16 | note:c am:4 amskew:0.5 ]",
+  "[ 11/16 → 3/4 | note:e am:4 amskew:0.5 ]",
+  "[ 3/4 → 13/16 | note:f am:4 amskew:0.5 ]",
+  "[ 13/16 → 7/8 | note:a am:4 amskew:0.5 ]",
+  "[ 7/8 → 15/16 | note:c am:4 amskew:0.5 ]",
+  "[ 15/16 → 1/1 | note:e am:4 amskew:0.5 ]",
+  "[ 1/1 → 17/16 | note:f am:4 amskew:0 ]",
+  "[ 17/16 → 9/8 | note:a am:4 amskew:0 ]",
+  "[ 9/8 → 19/16 | note:c am:4 amskew:0 ]",
+  "[ 19/16 → 5/4 | note:e am:4 amskew:0 ]",
+  "[ 5/4 → 21/16 | note:f am:4 amskew:0 ]",
+  "[ 21/16 → 11/8 | note:a am:4 amskew:0 ]",
+  "[ 11/8 → 23/16 | note:c am:4 amskew:0 ]",
+  "[ 23/16 → 3/2 | note:e am:4 amskew:0 ]",
+  "[ 3/2 → 25/16 | note:f am:4 amskew:0 ]",
+  "[ 25/16 → 13/8 | note:a am:4 amskew:0 ]",
+  "[ 13/8 → 27/16 | note:c am:4 amskew:0 ]",
+  "[ 27/16 → 7/4 | note:e am:4 amskew:0 ]",
+  "[ 7/4 → 29/16 | note:f am:4 amskew:0 ]",
+  "[ 29/16 → 15/8 | note:a am:4 amskew:0 ]",
+  "[ 15/8 → 31/16 | note:c am:4 amskew:0 ]",
+  "[ 31/16 → 2/1 | note:e am:4 amskew:0 ]",
+  "[ 2/1 → 33/16 | note:f am:4 amskew:1 ]",
+  "[ 33/16 → 17/8 | note:a am:4 amskew:1 ]",
+  "[ 17/8 → 35/16 | note:c am:4 amskew:1 ]",
+  "[ 35/16 → 9/4 | note:e am:4 amskew:1 ]",
+  "[ 9/4 → 37/16 | note:f am:4 amskew:1 ]",
+  "[ 37/16 → 19/8 | note:a am:4 amskew:1 ]",
+  "[ 19/8 → 39/16 | note:c am:4 amskew:1 ]",
+  "[ 39/16 → 5/2 | note:e am:4 amskew:1 ]",
+  "[ 5/2 → 41/16 | note:f am:4 amskew:1 ]",
+  "[ 41/16 → 21/8 | note:a am:4 amskew:1 ]",
+  "[ 21/8 → 43/16 | note:c am:4 amskew:1 ]",
+  "[ 43/16 → 11/4 | note:e am:4 amskew:1 ]",
+  "[ 11/4 → 45/16 | note:f am:4 amskew:1 ]",
+  "[ 45/16 → 23/8 | note:a am:4 amskew:1 ]",
+  "[ 23/8 → 47/16 | note:c am:4 amskew:1 ]",
+  "[ 47/16 → 3/1 | note:e am:4 amskew:1 ]",
+  "[ 3/1 → 49/16 | note:f am:4 amskew:0.5 ]",
+  "[ 49/16 → 25/8 | note:a am:4 amskew:0.5 ]",
+  "[ 25/8 → 51/16 | note:c am:4 amskew:0.5 ]",
+  "[ 51/16 → 13/4 | note:e am:4 amskew:0.5 ]",
+  "[ 13/4 → 53/16 | note:f am:4 amskew:0.5 ]",
+  "[ 53/16 → 27/8 | note:a am:4 amskew:0.5 ]",
+  "[ 27/8 → 55/16 | note:c am:4 amskew:0.5 ]",
+  "[ 55/16 → 7/2 | note:e am:4 amskew:0.5 ]",
+  "[ 7/2 → 57/16 | note:f am:4 amskew:0.5 ]",
+  "[ 57/16 → 29/8 | note:a am:4 amskew:0.5 ]",
+  "[ 29/8 → 59/16 | note:c am:4 amskew:0.5 ]",
+  "[ 59/16 → 15/4 | note:e am:4 amskew:0.5 ]",
+  "[ 15/4 → 61/16 | note:f am:4 amskew:0.5 ]",
+  "[ 61/16 → 31/8 | note:a am:4 amskew:0.5 ]",
+  "[ 31/8 → 63/16 | note:c am:4 amskew:0.5 ]",
+  "[ 63/16 → 4/1 | note:e am:4 amskew:0.5 ]",
+]
+`;
+
 exports[`runs examples > example "apply" example index 0 1`] = `
 [
   "[ 0/1 → 1/1 | note:C3 ]",
@@ -5035,72 +5260,6 @@ exports[`runs examples > example "ply" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "polymeter" example index 0 1`] = `
-[
-  "[ 0/1 → 1/3 | c ]",
-  "[ 0/1 → 1/3 | c2 ]",
-  "[ 1/3 → 2/3 | eb ]",
-  "[ 1/3 → 2/3 | g2 ]",
-  "[ 2/3 → 1/1 | g ]",
-  "[ 2/3 → 1/1 | c2 ]",
-  "[ 1/1 → 4/3 | c ]",
-  "[ 1/1 → 4/3 | g2 ]",
-  "[ 4/3 → 5/3 | eb ]",
-  "[ 4/3 → 5/3 | c2 ]",
-  "[ 5/3 → 2/1 | g ]",
-  "[ 5/3 → 2/1 | g2 ]",
-  "[ 2/1 → 7/3 | c ]",
-  "[ 2/1 → 7/3 | c2 ]",
-  "[ 7/3 → 8/3 | eb ]",
-  "[ 7/3 → 8/3 | g2 ]",
-  "[ 8/3 → 3/1 | g ]",
-  "[ 8/3 → 3/1 | c2 ]",
-  "[ 3/1 → 10/3 | c ]",
-  "[ 3/1 → 10/3 | g2 ]",
-  "[ 10/3 → 11/3 | eb ]",
-  "[ 10/3 → 11/3 | c2 ]",
-  "[ 11/3 → 4/1 | g ]",
-  "[ 11/3 → 4/1 | g2 ]",
-]
-`;
-
-exports[`runs examples > example "polymeterSteps" example index 0 1`] = `
-[
-  "[ 0/1 → 1/4 | c ]",
-  "[ 0/1 → 1/4 | e ]",
-  "[ 1/4 → 1/2 | d ]",
-  "[ 1/4 → 1/2 | f ]",
-  "[ 1/2 → 3/4 | c ]",
-  "[ 1/2 → 3/4 | g ]",
-  "[ 3/4 → 1/1 | d ]",
-  "[ 3/4 → 1/1 | e ]",
-  "[ 1/1 → 5/4 | c ]",
-  "[ 1/1 → 5/4 | f ]",
-  "[ 5/4 → 3/2 | d ]",
-  "[ 5/4 → 3/2 | g ]",
-  "[ 3/2 → 7/4 | c ]",
-  "[ 3/2 → 7/4 | e ]",
-  "[ 7/4 → 2/1 | d ]",
-  "[ 7/4 → 2/1 | f ]",
-  "[ 2/1 → 9/4 | c ]",
-  "[ 2/1 → 9/4 | g ]",
-  "[ 9/4 → 5/2 | d ]",
-  "[ 9/4 → 5/2 | e ]",
-  "[ 5/2 → 11/4 | c ]",
-  "[ 5/2 → 11/4 | f ]",
-  "[ 11/4 → 3/1 | d ]",
-  "[ 11/4 → 3/1 | g ]",
-  "[ 3/1 → 13/4 | c ]",
-  "[ 3/1 → 13/4 | e ]",
-  "[ 13/4 → 7/2 | d ]",
-  "[ 13/4 → 7/2 | f ]",
-  "[ 7/2 → 15/4 | c ]",
-  "[ 7/2 → 15/4 | g ]",
-  "[ 15/4 → 4/1 | d ]",
-  "[ 15/4 → 4/1 | e ]",
-]
-`;
-
 exports[`runs examples > example "postgain" example index 0 1`] = `
 [
   "[ 0/1 → 1/8 | s:hh compressor:-20 compressorRatio:20 compressorKnee:10 compressorAttack:0.002 compressorRelease:0.02 postgain:1.5 ]",
@@ -7216,31 +7375,6 @@ exports[`runs examples > example "stack" example index 0 2`] = `
 ]
 `;
 
-exports[`runs examples > example "stepcat" example index 0 1`] = `
-[
-  "[ 0/1 → 1/5 | s:bd ]",
-  "[ 1/5 → 2/5 | s:cp ]",
-  "[ 2/5 → 3/5 | s:bd ]",
-  "[ 3/5 → 4/5 | s:mt ]",
-  "[ 4/5 → 1/1 | s:bd ]",
-  "[ 1/1 → 6/5 | s:bd ]",
-  "[ 6/5 → 7/5 | s:cp ]",
-  "[ 7/5 → 8/5 | s:bd ]",
-  "[ 8/5 → 9/5 | s:mt ]",
-  "[ 9/5 → 2/1 | s:bd ]",
-  "[ 2/1 → 11/5 | s:bd ]",
-  "[ 11/5 → 12/5 | s:cp ]",
-  "[ 12/5 → 13/5 | s:bd ]",
-  "[ 13/5 → 14/5 | s:mt ]",
-  "[ 14/5 → 3/1 | s:bd ]",
-  "[ 3/1 → 16/5 | s:bd ]",
-  "[ 16/5 → 17/5 | s:cp ]",
-  "[ 17/5 → 18/5 | s:bd ]",
-  "[ 18/5 → 19/5 | s:mt ]",
-  "[ 19/5 → 4/1 | s:bd ]",
-]
-`;
-
 exports[`runs examples > example "steps" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | s:bd ]",
@@ -7554,65 +7688,6 @@ exports[`runs examples > example "swingBy" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "timecat" example index 0 1`] = `
-[
-  "[ 0/1 → 3/4 | note:e3 ]",
-  "[ 3/4 → 1/1 | note:g3 ]",
-  "[ 1/1 → 7/4 | note:e3 ]",
-  "[ 7/4 → 2/1 | note:g3 ]",
-  "[ 2/1 → 11/4 | note:e3 ]",
-  "[ 11/4 → 3/1 | note:g3 ]",
-  "[ 3/1 → 15/4 | note:e3 ]",
-  "[ 15/4 → 4/1 | note:g3 ]",
-]
-`;
-
-exports[`runs examples > example "timecat" example index 1 1`] = `
-[
-  "[ 0/1 → 1/5 | s:bd ]",
-  "[ 1/5 → 2/5 | s:sd ]",
-  "[ 2/5 → 3/5 | s:cp ]",
-  "[ 3/5 → 4/5 | s:hh ]",
-  "[ 4/5 → 1/1 | s:hh ]",
-  "[ 1/1 → 6/5 | s:bd ]",
-  "[ 6/5 → 7/5 | s:sd ]",
-  "[ 7/5 → 8/5 | s:cp ]",
-  "[ 8/5 → 9/5 | s:hh ]",
-  "[ 9/5 → 2/1 | s:hh ]",
-  "[ 2/1 → 11/5 | s:bd ]",
-  "[ 11/5 → 12/5 | s:sd ]",
-  "[ 12/5 → 13/5 | s:cp ]",
-  "[ 13/5 → 14/5 | s:hh ]",
-  "[ 14/5 → 3/1 | s:hh ]",
-  "[ 3/1 → 16/5 | s:bd ]",
-  "[ 16/5 → 17/5 | s:sd ]",
-  "[ 17/5 → 18/5 | s:cp ]",
-  "[ 18/5 → 19/5 | s:hh ]",
-  "[ 19/5 → 4/1 | s:hh ]",
-]
-`;
-
-exports[`runs examples > example "toTactus" example index 0 1`] = `
-[
-  "[ 0/1 → 1/4 | s:bd ]",
-  "[ 1/4 → 1/2 | s:sd ]",
-  "[ 1/2 → 3/4 | s:cp ]",
-  "[ 3/4 → 1/1 | s:bd ]",
-  "[ 1/1 → 5/4 | s:sd ]",
-  "[ 5/4 → 3/2 | s:cp ]",
-  "[ 3/2 → 7/4 | s:bd ]",
-  "[ 7/4 → 2/1 | s:sd ]",
-  "[ 2/1 → 9/4 | s:cp ]",
-  "[ 9/4 → 5/2 | s:bd ]",
-  "[ 5/2 → 11/4 | s:sd ]",
-  "[ 11/4 → 3/1 | s:cp ]",
-  "[ 3/1 → 13/4 | s:bd ]",
-  "[ 13/4 → 7/2 | s:sd ]",
-  "[ 7/2 → 15/4 | s:cp ]",
-  "[ 15/4 → 4/1 | s:bd ]",
-]
-`;
-
 exports[`runs examples > example "transpose" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:C2 ]",