diff --git a/piano/synth/AudioPlayer.mjs b/piano/synth/AudioPlayer.mjs
new file mode 100644
index 0000000..2867b0c
--- /dev/null
+++ b/piano/synth/AudioPlayer.mjs
@@ -0,0 +1,59 @@
+import Timbre from "./Timbre.mjs";
+
+export default class AudioPlayer {
+    /** @type {Timbre} */
+    timbre = null;
+    frequency = null;
+    oscillatorNode = null;
+    gainNode = null;
+
+    constructor(timbre, frequency) {
+        this.timbre = timbre;
+        this.frequency = frequency;
+        
+        this.oscillatorNode = timbre.audioCtx.createOscillator();
+        if (this.timbre.type === 'custom') {
+            this.oscillatorNode.setPeriodicWave(timbre.wave);
+        } else {
+            this.oscillatorNode.type = timbre.type;
+        }
+        this.oscillatorNode.frequency.value = frequency;
+
+        this.gainNode = timbre.audioCtx.createGain();
+        this.gainNode.gain.value = 0;
+
+        this.oscillatorNode
+            .connect(this.gainNode)
+            .connect(timbre.audioCtx.destination);
+        this.oscillatorNode.start();
+    }
+
+    start() {
+        const adsr = this.timbre.adsr;
+        let time = this.timbre.audioCtx.currentTime;
+        this.gainNode.gain.cancelScheduledValues(time);
+
+        this.gainNode.gain.setValueAtTime(0, time);
+
+        time += adsr.attackDuration;
+        this.gainNode.gain.linearRampToValueAtTime(adsr.attackAmplitude, time);
+
+        time += adsr.decayDuration;
+        this.gainNode.gain.linearRampToValueAtTime(adsr.decayAmplitude, time);
+
+        if (adsr.sustainDuration) {
+            time += adsr.sustainDuration;
+            this.gainNode.gain.linearRampToValueAtTime(0, time);
+        }
+    }
+
+    stop() {
+        const adsr = this.timbre.adsr;
+        let time = this.timbre.audioCtx.currentTime;
+        this.gainNode.gain.cancelScheduledValues(time);
+
+        time += adsr.releaseDuration;
+        this.gainNode.gain.linearRampToValueAtTime(0, time);
+    }
+
+};
diff --git a/piano/synth/Timbre.mjs b/piano/synth/Timbre.mjs
new file mode 100644
index 0000000..0aab00f
--- /dev/null
+++ b/piano/synth/Timbre.mjs
@@ -0,0 +1,27 @@
+export default class Timbre {
+    audioCtx = null;
+    type = 'sine';
+    wave = null;
+    adsr = {
+        attackAmplitude: 1,
+        attackDuration: 0.1,
+        decayAmplitude: 0.5,
+        decayDuration: 0.2,
+        sustainDuration: 3,
+        releaseDuration: 1,
+    };
+
+    constructor() {
+        this.audioCtx = new (window.AudioContext || window.webkitAudioContext)();
+    }
+
+    setWithHarmonics(harmonics) {
+        this.harmonics = harmonics;
+
+        this.type = 'custom';
+        this.wave = new PeriodicWave(this.audioCtx, {
+            real: new Float32Array(harmonics),
+            imag: new Float32Array(harmonics.length),
+        });
+    }
+};
diff --git a/piano/synth/index.html b/piano/synth/index.html
index d24e62f..f3e2614 100644
--- a/piano/synth/index.html
+++ b/piano/synth/index.html
@@ -28,6 +28,8 @@
         </fieldset>
         <br />
         <fieldset>
+            <input id="config" type="button" value="Set Config" />
+            <br />
             <input id="play" type="button" value="Start" />
             <input id="stop" type="button" value="Stop" />
             <br />
@@ -35,44 +37,37 @@
         </fieldset>
 
         <script type="module">
-            import Synth from './synth.mjs';
+            import Timbre from './Timbre.mjs';
+            import AudioPlayer from './AudioPlayer.mjs';
 
-            const freq = 440;
+            const frequency = 440;
             let audioPlayer = null;
 
-            function start() {
+            document.getElementById("config").onclick = () => {
                 if (audioPlayer) {
                     audioPlayer.stop();
-                } else {
-                    Synth.start();
                 }
-                let harmonics = [
+                const timbre = new Timbre();
+                timbre.setWithHarmonics([
                     document.getElementById("h1").value/100,
                     document.getElementById("h2").value/100,
                     document.getElementById("h3").value/100,
                     document.getElementById("h4").value/100,
                     document.getElementById("h5").value/100,
-                ];
-                let adsr = {
-                    attackAmplitude: document.getElementById("aa").value/100,
-                    attackDuration: document.getElementById("ad").value/100,
-                    decayAmplitude: document.getElementById("da").value/100,
-                    decayDuration: document.getElementById("dd").value/100,
-                    sustainDuration: document.getElementById("sd").value/20,
-                    releaseDuration: document.getElementById("rd").value/20,
-                };
-                audioPlayer = Synth.createAudioPlayer(freq, harmonics, adsr);
-                audioPlayer.start();
+                ]);
+                timbre.adsr.attackAmplitude = document.getElementById("aa").value/100;
+                timbre.adsr.attackDuration = document.getElementById("ad").value/100;
+                timbre.adsr.decayAmplitude = document.getElementById("da").value/100;
+                timbre.adsr.decayDuration = document.getElementById("dd").value/100;
+                timbre.adsr.sustainDuration = document.getElementById("sd").value/20;
+                timbre.adsr.releaseDuration = document.getElementById("rd").value/20;
+                audioPlayer = new AudioPlayer(timbre, frequency);
             };
-            function stop() {
-                if (audioPlayer)
-                    audioPlayer.stop();
-            };
-            document.getElementById("play").onclick = start;
-            document.getElementById("stop").onclick = stop;
+            document.getElementById("play").onclick = () => audioPlayer.start();
+            document.getElementById("stop").onclick = () => audioPlayer.stop();
             document.getElementById("short").onclick = () => {
-                start();
-                setTimeout(() => stop(), 200);
+                audioPlayer.start();
+                setTimeout(() => audioPlayer.stop(), 200);
             };
         </script>
     </body>
diff --git a/piano/synth/synth.mjs b/piano/synth/synth.mjs
deleted file mode 100644
index d18fbf3..0000000
--- a/piano/synth/synth.mjs
+++ /dev/null
@@ -1,77 +0,0 @@
-export default {
-
-    audioCtx: null,
-
-    start: function() {
-        if (!this.audioCtx)
-            this.audioCtx = new (window.AudioContext || window.webkitAudioContext)();
-    },
-
-    makeHarmonicNode: function(frequency, harmonics) {
-
-        const wave = new PeriodicWave(this.audioCtx, {
-            real: new Float32Array(harmonics),
-            imag: new Float32Array(harmonics.length),
-        });
-        
-        const oscillator = new OscillatorNode(this.audioCtx, {
-            frequency,
-            type: "custom",
-            periodicWave: wave
-        });
-        return oscillator;
-    },
-
-    makeEnvelopeNode: function(adsr, time) {
-        if (!time) time = this.audioCtx.currentTime;
-
-        const env = new GainNode(this.audioCtx);
-        env.gain.cancelScheduledValues(time);
-        env.gain.setValueAtTime(0, time);
-        env.gain.linearRampToValueAtTime(adsr.attackAmplitude, time + adsr.attackDuration);
-        env.gain.linearRampToValueAtTime(
-            adsr.decayAmplitude,
-            time + adsr.attackDuration + adsr.decayDuration
-        );
-        if (adsr.sustainDuration) {
-            env.gain.linearRampToValueAtTime(
-                0,
-                time + adsr.attackDuration + adsr.decayDuration + adsr.sustainDuration
-            );
-        }
-        return env;
-    },
-
-    releaseEnvelope: function(env, adsr, time) {
-        if (!time) time = this.audioCtx.currentTime;
-
-        env.gain.linearRampToValueAtTime(
-            0,
-            time + adsr.releaseDuration
-        );
-    },
-
-    createAudioPlayer: function(freq, harmonics, adsr) {
-        const audioPlayer = {};
-        audioPlayer.start = () => {
-            if (audioPlayer.oscillator) {
-                audioPlayer.oscillator.stop();
-            }
-
-            audioPlayer.oscillator = this.makeHarmonicNode(freq, harmonics);
-            audioPlayer.envelope = this.makeEnvelopeNode(adsr);
-
-            audioPlayer.oscillator
-                .connect(audioPlayer.envelope)
-                .connect(this.audioCtx.destination);
-
-            audioPlayer.oscillator.start();
-        };
-        audioPlayer.stop = () => {
-            this.releaseEnvelope(audioPlayer.envelope, adsr);
-            audioPlayer.oscillator.stop(this.audioCtx.currentTime + adsr.releaseDuration);
-        };
-        return audioPlayer;
-    },
-
-}