diff --git a/app/javascript/controllers/drag_and_strum_controller.js b/app/javascript/controllers/drag_and_strum_controller.js
index 2cdd73677..5e3a948f4 100644
--- a/app/javascript/controllers/drag_and_strum_controller.js
+++ b/app/javascript/controllers/drag_and_strum_controller.js
@@ -1,23 +1,50 @@
 import { Controller } from "@hotwired/stimulus"
 
-const MANDOLIN_NOTES = [
-  "/audio/mandolin/B3.mp3",
-  "/audio/mandolin/C3.mp3",
-  "/audio/mandolin/D4.mp3",
-  "/audio/mandolin/E3.mp3",
-  "/audio/mandolin/Fsharp4.mp3",
-  "/audio/mandolin/G3.mp3"
+const INSTRUMENTS = [
+  [
+    "/audio/mandolin/B3.mp3",
+    "/audio/mandolin/C3.mp3",
+    "/audio/mandolin/D4.mp3",
+    "/audio/mandolin/E3.mp3",
+    "/audio/mandolin/Fsharp4.mp3",
+    "/audio/mandolin/G3.mp3"
+  ],
+  [
+    "/audio/synth/B3.mp3",
+    "/audio/synth/C3.mp3",
+    "/audio/synth/D4.mp3",
+    "/audio/synth/E3.mp3",
+    "/audio/synth/Fsharp4.mp3",
+    "/audio/synth/G3.mp3"
+  ]
 ]
 
 export default class extends Controller {
   static targets = [ "container" ]
 
   connect() {
-    this.preloadedAudioFiles = MANDOLIN_NOTES.map(file => {
-      const audio = new Audio(file)
-      audio.load()
-      return audio
-    });
+    this.instrumentIndex = 0
+    this.preloadedAudioFiles = []
+
+    document.addEventListener("keydown", this.handleKeyDown.bind(this));
+    // this.preloadedAudioFiles = INSTRUMENTS[0].map(file => {
+    //   const audio = new Audio(file)
+    //   audio.load()
+    //   return audio
+    // });
+  }
+
+  disconnect() {
+    document.removeEventListener("keydown", this.handleKeyDown.bind(this));
+  }
+
+  handleKeyDown(event) {
+    this.#setInstrumentIndex(event)
+
+    if (this.instrumentIndex < INSTRUMENTS.length) {
+      this.#preloadAudioFiles(this.instrumentIndex)
+      console.log(this.preloadedAudioFiles)
+    }
   }
 
   dragEnter(event) {
@@ -31,14 +58,35 @@ export default class extends Controller {
     }
   }
 
+  #setInstrumentIndex(event) {
+    const number = Number(event.code.replace("Digit", ""))
+    this.instrumentIndex = isNaN(number) ? 0 : number
+  }
+
+  #preloadAudioFiles(instrumentIndex) {
+    this.preloadedAudioFiles = []
+    const audioFiles = INSTRUMENTS[instrumentIndex];
+
+    if (audioFiles) {
+      this.preloadedAudioFiles = audioFiles.map(file => {
+        const audio = new Audio(file)
+        audio.load()
+        return audio
+      })
+    }
+  }
+
   #containerContaining(element) {
     return this.containerTargets.find(container => container.contains(element) || container === element)
   }
 
   #playSound() {
-    const randomIndex = Math.floor(Math.random() * this.preloadedAudioFiles.length)
-    const audio = this.preloadedAudioFiles[randomIndex]
-    const audioInstance = new Audio(audio.src)
-    audioInstance.play()
+    // At this stage, the preloaded audio files should be ready
+
+    // const randomIndex = Math.floor(Math.random() * this.preloadedAudioFiles.length)
+    // const audio = this.preloadedAudioFiles[randomIndex]
+    // const audioInstance = new Audio(audio.src)
+    //
+    // audioInstance.play()
   }
 }
diff --git a/public/audio/synth/B3.mp3 b/public/audio/synth/B3.mp3
new file mode 100644
index 000000000..e4cd2026a
Binary files /dev/null and b/public/audio/synth/B3.mp3 differ
diff --git a/public/audio/synth/C3.mp3 b/public/audio/synth/C3.mp3
new file mode 100644
index 000000000..e4c061247
Binary files /dev/null and b/public/audio/synth/C3.mp3 differ
diff --git a/public/audio/synth/D4.mp3 b/public/audio/synth/D4.mp3
new file mode 100644
index 000000000..a4a40eaf0
Binary files /dev/null and b/public/audio/synth/D4.mp3 differ
diff --git a/public/audio/synth/E3.mp3 b/public/audio/synth/E3.mp3
new file mode 100644
index 000000000..f24c5f97e
Binary files /dev/null and b/public/audio/synth/E3.mp3 differ
diff --git a/public/audio/synth/Fsharp4.mp3 b/public/audio/synth/Fsharp4.mp3
new file mode 100644
index 000000000..7d2469c21
Binary files /dev/null and b/public/audio/synth/Fsharp4.mp3 differ
diff --git a/public/audio/synth/G3.mp3 b/public/audio/synth/G3.mp3
new file mode 100644
index 000000000..3342880a6
Binary files /dev/null and b/public/audio/synth/G3.mp3 differ