diff --git a/src/routes/chromatic.svelte b/src/routes/chromatic.svelte
index 10273dd..912411d 100644
--- a/src/routes/chromatic.svelte
+++ b/src/routes/chromatic.svelte
@@ -1,6 +1,7 @@
 <script>
   import { keyMapChromatic } from '../data.js'
   import { layout, layoutB, buttonIdMap, buttonIdMapB, rows } from '../chromatic-data.js'
+  import { createOscillator } from "../synth.js"
 
   // Audio
   const audio = new (window.AudioContext || window.webkitAudioContext)()
@@ -21,20 +22,18 @@
 
     if (Array.isArray(frequency)) {
       oscillator = frequency.map((hz) => {
-        const oscillator = audio.createOscillator()
-        oscillator.type = 'sawtooth'
-        oscillator.connect(gainNode)
-        oscillator.frequency.value = hz
-        oscillator.start()
+        const oscillator = createOscillator({context: audio,
+          frequency: hz,
+          destination: gainNode
+        })
 
         return oscillator
       })
     } else {
-      oscillator = audio.createOscillator()
-      oscillator.type = 'sawtooth'
-      oscillator.connect(gainNode)
-      oscillator.frequency.value = frequency
-      oscillator.start()
+      oscillator = createOscillator({context: audio,
+        frequency,
+        destination: gainNode
+      })
     }
 
     return { oscillator }
diff --git a/src/routes/diatonic.svelte b/src/routes/diatonic.svelte
index 0b576a1..fbd2f32 100644
--- a/src/routes/diatonic.svelte
+++ b/src/routes/diatonic.svelte
@@ -12,6 +12,7 @@
     toggleBellows,
     scales,
   } from '../diatonic-data.js'
+  import { createOscillator } from "../synth.js"
 
   // Audio
   const audio = new (window.AudioContext || window.webkitAudioContext)()
@@ -35,22 +36,19 @@
 
     if (Array.isArray(frequency)) {
       oscillator = frequency.map((hz) => {
-        const oscillator = audio.createOscillator()
-        oscillator.type = 'sawtooth'
-        oscillator.connect(gainNode)
-        oscillator.frequency.value = hz
-        oscillator.start()
+        const oscillator = createOscillator({context: audio,
+          frequency: hz,
+          destination: gainNode
+        })
 
         return oscillator
       })
     } else {
-      oscillator = audio.createOscillator()
-      oscillator.type = 'sawtooth'
-      oscillator.connect(gainNode)
-      oscillator.frequency.value = frequency
-      oscillator.start()
+      oscillator = createOscillator({context: audio,
+        frequency,
+        destination: gainNode
+      })
     }
-
     return { oscillator }
   }
 
diff --git a/src/synth.js b/src/synth.js
new file mode 100644
index 0000000..0435d14
--- /dev/null
+++ b/src/synth.js
@@ -0,0 +1,61 @@
+/**
+ * @param {Object} options
+ * @param {AudioContext} options.context
+ * @param {number} options.frequency
+ * @param {AudioNode} options.destination
+ */
+export function createOscillator({ context, frequency, destination }) {
+  const sawOsc = context.createOscillator();
+  const squareOsc = context.createOscillator();
+  const squareOctOsc = context.createOscillator();
+  const sawGain = context.createGain();
+  const squareGain = context.createGain();
+  const squareOctGain = context.createGain();
+  const filter = context.createBiquadFilter();
+  const envelope = context.createGain();
+
+  sawOsc.connect(sawGain);
+  sawGain.connect(filter);
+
+  squareOsc.connect(squareGain);
+  squareGain.connect(filter);
+
+  squareOctOsc.connect(squareOctGain);
+  squareOctGain.connect(filter);
+
+  filter.connect(envelope);
+  envelope.connect(destination);
+
+  squareOsc.type = "square";
+  squareOsc.frequency.value = frequency;
+  squareOsc.start();
+
+  sawOsc.type = "sawtooth";
+  sawOsc.frequency.value = frequency + 0.7; // detune for a more fuzzy sound
+  sawOsc.start();
+
+  squareOctOsc.type = "square";
+  squareOctOsc.frequency.value = frequency * 2 - 1.3;
+  squareOctOsc.start();
+
+  squareGain.gain.value = 0.8;
+
+  sawGain.gain.value = 0.5;
+
+  squareOctGain.gain.value = 0.3;
+
+  filter.type = "lowpass";
+  filter.frequency.value = 4000;
+
+  envelope.gain.value = 0;
+  envelope.gain.setTargetAtTime(1, context.currentTime, 0.05);
+
+  return {
+    stop: () => {
+      envelope.gain.setTargetAtTime(0, context.currentTime, 0.05);
+      sawOsc.stop(context.currentTime + 0.2);
+      squareOsc.stop(context.currentTime + 0.2);
+      squareOctOsc.stop(context.currentTime + 0.2);
+    },
+  };
+}