diff --git a/src/assets/sfx/Chiptone_Settings/settings_SpawnBuildup.cpt b/src/assets/sfx/Chiptone_Settings/settings_SpawnBuildup.cpt
new file mode 100755
index 0000000000000000000000000000000000000000..fb72bb1c0cdb868587f492a8862cc9f0d3cef85d
Binary files /dev/null and b/src/assets/sfx/Chiptone_Settings/settings_SpawnBuildup.cpt differ
diff --git a/src/assets/sfx/suspense.wav b/src/assets/sfx/suspense.wav
new file mode 100755
index 0000000000000000000000000000000000000000..3b9043984412fe96c8949a6927a051f66738e50b
Binary files /dev/null and b/src/assets/sfx/suspense.wav differ
diff --git a/src/components/scene-sound.js b/src/components/scene-sound.js
index 249da3ebf130cca91a0ca6a544a3c33e9a3fc4b7..3454fa9ba6b9f50bcfea53d4e983964d47f14a27 100644
--- a/src/components/scene-sound.js
+++ b/src/components/scene-sound.js
@@ -5,11 +5,17 @@ AFRAME.registerComponent("scene-sound", {
   multiple: true,
   schema: {
     sound: { type: "string" },
-    on: { type: "string" }
+    on: { type: "string" },
+    off: { type: "string" }
   },
 
   init() {
     const sound = this.el.components[`${this.attrName.replace("scene-", "")}`];
     this.el.sceneEl.addEventListener(this.data.on, sound.playSound);
+    sound.stopSound = sound.stopSound.bind(sound); // wat
+
+    if (this.data.off) {
+      this.el.sceneEl.addEventListener(this.data.off, sound.stopSound);
+    }
   }
 });
diff --git a/src/hub.html b/src/hub.html
index fee1a94ba9ec7b1568eed5a6795c77479f8c3c7e..6ad6e3b63ee16ce016ae2849c5850c7b542c5845 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -71,8 +71,8 @@
             <a-asset-item id="sound_asset-teleport_start"                 src="./assets/sfx/D_teleportStart.wav"     response-type="arraybuffer" preload="auto"></a-asset-item>
             <a-asset-item id="sound_asset-teleport_end"                   src="./assets/sfx/quickTurn.wav"     response-type="arraybuffer" preload="auto"></a-asset-item>
             <a-asset-item id="sound_asset-snap_rotate"                    src="./assets/sfx/quickTurn.wav"     response-type="arraybuffer" preload="auto"></a-asset-item>
-            <a-asset-item id="sound_asset-media_loaded"                   src="./assets/sfx/pop.wav"     response-type="arraybuffer" preload="auto"></a-asset-item>
-            <a-asset-item id="sound_asset-media_loading"                  src="./assets/sfx/A_bendUp.wav"     response-type="arraybuffer" preload="auto"></a-asset-item>
+            <a-asset-item id="sound_asset-media_loaded"                   src="./assets/sfx/A_bendUp.wav"     response-type="arraybuffer" preload="auto"></a-asset-item>
+            <a-asset-item id="sound_asset-media_loading"                  src="./assets/sfx/suspense.wav"     response-type="arraybuffer" preload="auto"></a-asset-item>
             <a-asset-item id="sound_asset-hud_hover_start"                src="./assets/sfx/tap_mellow.wav"  response-type="arraybuffer" preload="auto"></a-asset-item>
             <a-asset-item id="sound_asset-grab"                           src="./assets/sfx/tap_mellow.wav"     response-type="arraybuffer" preload="auto"></a-asset-item>
             <a-asset-item id="sound_asset-grab_off"                       src="./assets/sfx/tap_mellow.wav" response-type="arraybuffer" preload="auto"></a-asset-item>
@@ -452,8 +452,8 @@
                 scene-sound__snap_rotate_right="on: snap_rotate_right;"
                 sound__media_loaded="positional: false; src: #sound_asset-media_loaded; on: nothing; poolSize: 2;"
                 scene-sound__media_loaded="on: media-loaded;"
-                sound__media_loading="positional: false; src: #sound_asset-media_loading; on: nothing; poolSize: 2;"
-                scene-sound__media_loading="on: media-loading;"
+                sound__media_loading="positional: false; src: #sound_asset-media_loading; on: nothing; poolSize: 2; loop: true; "
+                scene-sound__media_loading="on: media-loading; off: media-loaded;"
                 sound__hud_action_mute="positional: false; src: #sound_asset-toggle_mute; on: nothing; poolSize: 2;"
                 scene-sound__hud_action_mute="on: action_mute;"
                 sound__hud_action_freeze="positional: false; src: #sound_asset-toggle_freeze; on: nothing; poolSize: 2;"