diff --git a/_datafiles/config.yaml b/_datafiles/config.yaml
index 6a838178..c3be12b6 100755
--- a/_datafiles/config.yaml
+++ b/_datafiles/config.yaml
@@ -281,6 +281,9 @@ LocalPort: 9999
 # - WebPort -
 #   The port the server listens on for web requests
 WebPort: 80
+# - MspFileUrl -
+#   The base URL sound files are played from
+MspFileUrl: http://localhost/static/public/audio/
 ################################################################################
 #
 #   LOOT GOBLIN CONFIGURATIONS
diff --git a/_datafiles/html/public/webclient.html b/_datafiles/html/public/webclient.html
index 9f0d723c..0a9cc8d2 100644
--- a/_datafiles/html/public/webclient.html
+++ b/_datafiles/html/public/webclient.html
@@ -85,6 +85,7 @@
     <link rel="stylesheet" href="/static/public/css/xterm.css" />
     <script src="/static/public/js/xterm.4.19.0.js"></script>
     <script src="/static/public/js/xterm-addon-fit.js"></script>
+    <script src="/static/public/js/mp3.js"></script>
 </head>
 <body onLoad="init(); return false;">
     <div id="main-container">
@@ -97,6 +98,11 @@
 
     <script>
 
+        // Music/Sound players:
+        let baseMp3Url = "";
+        const MusicPlayer = new MP3Player(false);
+        const SoundPlayer = new MP3Player(true);
+        
         /////////////////////////////////////////////
         //
         // Terminal emulation setup
@@ -239,6 +245,79 @@
                     }
                 }
 
+                // Is it an MSP command?
+                if ( event.data.length > 9 && event.data.slice(0, 2) == "!!" ) {
+
+                    if ( event.data.slice(0, 8) == "!!MUSIC(" ) {
+                    
+                        parts = event.data.slice(8, event.data.length-1).split(" ");
+                        fileName = parts[0];
+                        obj = {};
+                        for ( i=1; i<parts.length; i++) {
+                            prop = parts[i].split("=");
+                            if ( prop.length == 2 ) {
+                                obj[prop[0]] = prop[1];
+                            }
+                        }
+
+                        if ( fileName == "Off" ) {
+                            if ( obj.U ) {
+                                baseMp3Url = obj.U;
+                                if ( baseMp3Url[baseMp3Url.length-1] != "/" ) {
+                                    baseMp3Url += "/";
+                                }
+                            } else {
+                                MusicPlayer.stop();
+                            }
+                            
+                        } else {
+
+                            soundLevel = 1.0;
+                            loopMusic = true;
+
+                            if ( obj.L && obj.L != "-1" ) {
+                                Loop = false;
+                            }
+                            if ( obj.V ) {
+                                soundLevel = Number(obj.V)/100;
+                            }
+
+                            if ( !MusicPlayer.isPlaying(baseMp3Url+fileName) ) {
+                                MusicPlayer.play(baseMp3Url+fileName, loopMusic, soundLevel);
+                            }
+                        }
+                        
+                    } else if ( event.data.slice(0, 8) == "!!SOUND(" ) {
+                    
+                        parts = event.data.slice(8, event.data.length-1).split(" ");
+                        fileName = parts[0];
+                        obj = {};
+                        for ( i=1; i<parts.length; i++) {
+                            prop = parts[i].split("=");
+                            if ( prop.length == 2 ) {
+                                obj[prop[0]] = prop[1];
+                            }
+                        }
+
+                        if ( fileName == "Off" ) {
+                            if ( obj.U ) {
+                                baseMp3Url = obj.U;
+                                if ( baseMp3Url[baseMp3Url.length-1] != "/" ) {
+                                    baseMp3Url += "/";
+                                }
+                            } else {
+                                SoundPlayer.stop();
+                            }
+                            
+                        } else {
+                            SoundPlayer.play(baseMp3Url+fileName, true, 1.0);
+                        }
+                    
+                    }
+                    return
+                }
+                
+
                 term.write(event.data);
                 
             };
diff --git a/_datafiles/html/static/public/audio/music/.DS_Store b/_datafiles/html/static/public/audio/music/.DS_Store
new file mode 100644
index 00000000..b155c5a2
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/.DS_Store differ
diff --git a/_datafiles/html/static/public/audio/music/_TODO1.mp3 b/_datafiles/html/static/public/audio/music/_TODO1.mp3
new file mode 100644
index 00000000..b2da3bdb
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/_TODO1.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/_TODO10.mp3 b/_datafiles/html/static/public/audio/music/_TODO10.mp3
new file mode 100644
index 00000000..50e02019
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/_TODO10.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/_TODO11.mp3 b/_datafiles/html/static/public/audio/music/_TODO11.mp3
new file mode 100644
index 00000000..4ec2b494
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/_TODO11.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/_TODO12.mp3 b/_datafiles/html/static/public/audio/music/_TODO12.mp3
new file mode 100644
index 00000000..5cd06c44
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/_TODO12.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/_TODO13.mp3 b/_datafiles/html/static/public/audio/music/_TODO13.mp3
new file mode 100644
index 00000000..11ce6b52
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/_TODO13.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/_TODO3.mp3 b/_datafiles/html/static/public/audio/music/_TODO3.mp3
new file mode 100644
index 00000000..a50428d0
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/_TODO3.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/_TODO4.mp3 b/_datafiles/html/static/public/audio/music/_TODO4.mp3
new file mode 100644
index 00000000..b0c843d1
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/_TODO4.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/_TODO5.mp3 b/_datafiles/html/static/public/audio/music/_TODO5.mp3
new file mode 100644
index 00000000..50753adc
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/_TODO5.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/_TODO6.mp3 b/_datafiles/html/static/public/audio/music/_TODO6.mp3
new file mode 100644
index 00000000..5d7da128
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/_TODO6.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/_TODO7.mp3 b/_datafiles/html/static/public/audio/music/_TODO7.mp3
new file mode 100644
index 00000000..d212e6d1
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/_TODO7.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/_TODO8.mp3 b/_datafiles/html/static/public/audio/music/_TODO8.mp3
new file mode 100644
index 00000000..b66948d2
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/_TODO8.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/_TODO9.mp3 b/_datafiles/html/static/public/audio/music/_TODO9.mp3
new file mode 100644
index 00000000..59e364c1
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/_TODO9.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/catacombs.mp3 b/_datafiles/html/static/public/audio/music/catacombs.mp3
new file mode 100644
index 00000000..5f56c37c
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/catacombs.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/dark-forest.mp3 b/_datafiles/html/static/public/audio/music/dark-forest.mp3
new file mode 100644
index 00000000..6238405a
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/dark-forest.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/frost-lake.mp3 b/_datafiles/html/static/public/audio/music/frost-lake.mp3
new file mode 100644
index 00000000..72b8de04
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/frost-lake.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/frostfang-slums.mp3 b/_datafiles/html/static/public/audio/music/frostfang-slums.mp3
new file mode 100644
index 00000000..d09532c8
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/frostfang-slums.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/frostfang.mp3 b/_datafiles/html/static/public/audio/music/frostfang.mp3
new file mode 100644
index 00000000..81993ef5
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/frostfang.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/intro.mp3 b/_datafiles/html/static/public/audio/music/intro.mp3
new file mode 100644
index 00000000..df04b5bf
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/intro.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/mirror-caves.mp3 b/_datafiles/html/static/public/audio/music/mirror-caves.mp3
new file mode 100644
index 00000000..fbab0b4d
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/mirror-caves.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/mystarion.mp3 b/_datafiles/html/static/public/audio/music/mystarion.mp3
new file mode 100644
index 00000000..b9faaa6f
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/mystarion.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/stormshards.mp3 b/_datafiles/html/static/public/audio/music/stormshards.mp3
new file mode 100644
index 00000000..2d3e2b19
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/stormshards.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/sun-anvil.mp3 b/_datafiles/html/static/public/audio/music/sun-anvil.mp3
new file mode 100644
index 00000000..03e4e0e9
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/sun-anvil.mp3 differ
diff --git a/_datafiles/html/static/public/audio/music/whispering-wastes.mp3 b/_datafiles/html/static/public/audio/music/whispering-wastes.mp3
new file mode 100644
index 00000000..621aa6b8
Binary files /dev/null and b/_datafiles/html/static/public/audio/music/whispering-wastes.mp3 differ
diff --git a/_datafiles/html/static/public/audio/sound/sleep.mp3 b/_datafiles/html/static/public/audio/sound/sleep.mp3
new file mode 100644
index 00000000..ebea271d
Binary files /dev/null and b/_datafiles/html/static/public/audio/sound/sleep.mp3 differ
diff --git a/_datafiles/html/static/public/js/mp3.js b/_datafiles/html/static/public/js/mp3.js
new file mode 100644
index 00000000..46eeb068
--- /dev/null
+++ b/_datafiles/html/static/public/js/mp3.js
@@ -0,0 +1,82 @@
+class MP3Player {
+  constructor(allowMultiple = false) {
+    this.audioCache = new Map();
+    this.currentUrl = null;
+    this.loop = true;
+    this.allowMultiple = allowMultiple;
+    this.activeAudios = new Set();
+  }
+
+  play(url, loop = true, volume = 1.0) {
+    if (!this.allowMultiple) {
+      this.stopAll();
+    }
+
+    let audio;
+    if (this.audioCache.has(url)) {
+      audio = this.audioCache.get(url);
+    } else {
+      audio = new Audio();
+      audio.src = url;
+      audio.preload = "auto";
+      this.audioCache.set(url, audio);
+    }
+
+    audio.loop = loop;
+    audio.volume = volume;
+    audio.play().catch((e) => console.error("Playback failed:", e));
+    this.activeAudios.add(audio);
+    this.currentUrl = url;
+  }
+
+  pause(url) {
+    if (this.audioCache.has(url)) {
+      this.audioCache.get(url).pause();
+    }
+  }
+
+  stop(url) {
+    if (this.audioCache.has(url)) {
+      let audio = this.audioCache.get(url);
+      audio.pause();
+      audio.currentTime = 0;
+      this.activeAudios.delete(audio);
+    }
+  }
+
+  stopAll() {
+    this.activeAudios.forEach(audio => {
+      audio.pause();
+      audio.currentTime = 0;
+    });
+    this.activeAudios.clear();
+  }
+
+  setVolume(url, level) {
+    if (level < 0 || level > 1) {
+      console.error("Volume must be between 0 and 1");
+      return;
+    }
+    if (this.audioCache.has(url)) {
+      this.audioCache.get(url).volume = level;
+    }
+  }
+
+  setLoop(url, loop) {
+    if (this.audioCache.has(url)) {
+      this.audioCache.get(url).loop = loop;
+    }
+  }
+
+  isPlaying(url) {
+    return this.audioCache.has(url) && !this.audioCache.get(url).paused;
+  }
+
+  getCurrentTime(url) {
+    return this.audioCache.has(url) ? this.audioCache.get(url).currentTime : 0;
+  }
+
+  getDuration(url) {
+    return this.audioCache.has(url) ? this.audioCache.get(url).duration : 0;
+  }
+}
diff --git a/_datafiles/world/default/rooms/catacombs/32.yaml b/_datafiles/world/default/rooms/catacombs/32.yaml
index 37a288c1..4259fc0b 100755
--- a/_datafiles/world/default/rooms/catacombs/32.yaml
+++ b/_datafiles/world/default/rooms/catacombs/32.yaml
@@ -5,6 +5,7 @@ zoneconfig:
   autoscale:
     minimum: 8
     maximum: 13
+  musicfile: music/catacombs.mp3
 title: Entrance to the Catacombs
 description: Beneath the Sanctuary of the Benevolent Heart lies the labyrinthine expanse
   known as the Catacombs. A network of narrow, winding tunnels and chambers, the Catacombs
diff --git a/_datafiles/world/default/rooms/dark_forest/300.yaml b/_datafiles/world/default/rooms/dark_forest/300.yaml
index bb325d90..44c182d0 100755
--- a/_datafiles/world/default/rooms/dark_forest/300.yaml
+++ b/_datafiles/world/default/rooms/dark_forest/300.yaml
@@ -4,6 +4,7 @@ zoneconfig:
   roomid: 300
   mutators:
   - mutatorid: forest-mist
+  musicfile: music/dark-forest.mp3
 title: Forest Road
 description: As you venture further along the old road, it leads you into the heart
   of the foreboding Dark Forest. The transition from the tranquil Frost Lake to this
diff --git a/_datafiles/world/default/rooms/frost_lake/304.yaml b/_datafiles/world/default/rooms/frost_lake/304.yaml
index f457c5f0..be35abac 100755
--- a/_datafiles/world/default/rooms/frost_lake/304.yaml
+++ b/_datafiles/world/default/rooms/frost_lake/304.yaml
@@ -5,6 +5,7 @@ zoneconfig:
   autoscale:
     minimum: 10
     maximum: 13
+  musicfile: music/frost-lake.mp3
 title: Frost Lake Shore
 description: The stillness here is profound, the world holding its breath in reverence
   for this enchanting realm. The silence is broken only by the soft, melodic chime
diff --git a/_datafiles/world/default/rooms/frostfang/1.yaml b/_datafiles/world/default/rooms/frostfang/1.yaml
index 42006c35..3460e375 100755
--- a/_datafiles/world/default/rooms/frostfang/1.yaml
+++ b/_datafiles/world/default/rooms/frostfang/1.yaml
@@ -5,6 +5,7 @@ zoneconfig:
   autoscale:
     minimum: 1
     maximum: 5
+  musicfile: music/frostfang.mp3
 title: Town Square
 description: In the shimmering heart of Frostfang, a city wrapped in a perpetual blanket
   of snow and illuminated by the ethereal glow of the auroras, lies the Town Square.
diff --git a/_datafiles/world/default/rooms/frostfang_slums/439.yaml b/_datafiles/world/default/rooms/frostfang_slums/439.yaml
index c86d6f26..b194ed56 100755
--- a/_datafiles/world/default/rooms/frostfang_slums/439.yaml
+++ b/_datafiles/world/default/rooms/frostfang_slums/439.yaml
@@ -7,6 +7,7 @@ zoneconfig:
     maximum: 10
   mutators:
   - mutatorid: pvp-enabled
+  musicfile: music/frostfang-slums.mp3
 title: Poorly Lit Street
 description: 'Tucked away in the heart of Frostfang''s sprawling slums, a dimly lit
   alleyway meanders from the bustling Beggars Lane. This concealed corner, a world
diff --git a/_datafiles/world/default/rooms/mirror_caves/218.yaml b/_datafiles/world/default/rooms/mirror_caves/218.yaml
index ef4649fb..31ce85c4 100755
--- a/_datafiles/world/default/rooms/mirror_caves/218.yaml
+++ b/_datafiles/world/default/rooms/mirror_caves/218.yaml
@@ -2,6 +2,7 @@ roomid: 218
 zone: Mirror Caves
 zoneconfig:
   roomid: 218
+  musicfile: music/mirror-caves.mp3
 title: Cave Entrance
 description: "As you cautiously step into the entrance of the mirror caves, a chilling
   draft greets you, carrying the faint scent of earth and ancient stone. The cave's
diff --git a/_datafiles/world/default/rooms/mystarion/612.yaml b/_datafiles/world/default/rooms/mystarion/612.yaml
index 001b1631..6d5d4bd6 100755
--- a/_datafiles/world/default/rooms/mystarion/612.yaml
+++ b/_datafiles/world/default/rooms/mystarion/612.yaml
@@ -2,6 +2,7 @@ roomid: 612
 zone: Mystarion
 zoneconfig:
   roomid: 612
+  musicfile: music/mystarion.mp3
 title: Main road
 description: The road itself becomes a cobblestone path, the stones worn smooth by
   centuries of use, each one seemingly placed with intention, leading inexorably towards
diff --git a/_datafiles/world/default/rooms/stormshards/575.yaml b/_datafiles/world/default/rooms/stormshards/575.yaml
index 3a3d5ea7..6b9514c1 100755
--- a/_datafiles/world/default/rooms/stormshards/575.yaml
+++ b/_datafiles/world/default/rooms/stormshards/575.yaml
@@ -2,6 +2,7 @@ roomid: 575
 zone: Stormshards
 zoneconfig:
   roomid: 575
+  musicfile: music/stormshards.mp3
 title: Mountain path
 description: As the path ascends, the terrain becomes more rugged; the trees thin
   out, giving way to rocky outcrops and steep, craggy inclines. The earth underfoot
diff --git a/_datafiles/world/default/rooms/stormwatchers_keep/880.yaml b/_datafiles/world/default/rooms/stormwatchers_keep/880.yaml
index e1540116..f392f57d 100755
--- a/_datafiles/world/default/rooms/stormwatchers_keep/880.yaml
+++ b/_datafiles/world/default/rooms/stormwatchers_keep/880.yaml
@@ -5,6 +5,7 @@ zoneconfig:
   autoscale:
     minimum: 15
     maximum: 25
+  musicfile: music/whispering-wastes.mp3
 title: Stormwatchers Keep
 description: The Halls of Stormwatchers Keep are a labyrinthine network of grand corridors
   and chambers carved into the heart of a colossal glacier. Each hall is adorned with
diff --git a/_datafiles/world/default/rooms/sun_anvil/1000.yaml b/_datafiles/world/default/rooms/sun_anvil/1000.yaml
index 61aa2a8e..a57db16b 100755
--- a/_datafiles/world/default/rooms/sun_anvil/1000.yaml
+++ b/_datafiles/world/default/rooms/sun_anvil/1000.yaml
@@ -4,6 +4,7 @@ zoneconfig:
   roomid: 1000
   mutators:
   - mutatorid: desert-sun
+  musicfile: music/sun-anvil.mp3
 title: Desert's Edge
 description: You find yourself at the threshold of the Sun Anvil Desert, where the
   air itself seems to shimmer under the relentless glare of a merciless sun. The ground
diff --git a/_datafiles/world/default/rooms/whispering_wastes/168.yaml b/_datafiles/world/default/rooms/whispering_wastes/168.yaml
index 724fc02f..f5c4161e 100755
--- a/_datafiles/world/default/rooms/whispering_wastes/168.yaml
+++ b/_datafiles/world/default/rooms/whispering_wastes/168.yaml
@@ -7,6 +7,7 @@ zoneconfig:
     maximum: 15
   mutators:
   - mutatorid: freezing-cold
+  musicfile: music/whispering-wastes.mp3
 title: Frozen Wasteland
 description: The relentless blizzard swallows the world in a veil of white. The sky,
   a perpetual twilight, casts a surreal glow over the endless expanse of snow and
diff --git a/_datafiles/world/default/templates/help/about.template b/_datafiles/world/default/templates/help/about.template
index fe0496fb..79185d76 100644
--- a/_datafiles/world/default/templates/help/about.template
+++ b/_datafiles/world/default/templates/help/about.template
@@ -12,9 +12,10 @@ or modified to build your own world using built-in tools.
 <ansi fg="187">:::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187"></ansi>
 '      `--'      `.-'      `--'      `--'      `--'      `-.'      `--'      `</ansi>
 
-<ansi fg="black-bold">.:</ansi> <ansi fg="magenta"></ansi><ansi fg="command">GoMud</ansi> History
+<ansi fg="black-bold">.:</ansi> <ansi fg="magenta"><ansi fg="command">GoMud</ansi> History</ansi>
 
-<ansi fg="command">GoMud</ansi> development began in <ansi fg="red">late 2023</ansi> with several key goals in mind:
+<ansi fg="command">GoMud</ansi> development began in <ansi fg="red">late 2023</ansi> by <ansi fg="14">Dylan Squires</ansi> (aka <ansi fg="11">Volte6</ansi>) with 
+several key goals in mind:
 
 <ansi fg="red-bold">1.</ansi> <ansi fg="11">Offer a new, free code base in a modern language.</ansi> 
    <ansi fg="command">Go</ansi> was selected as it has a fast build process and excellent OS/CPU 
@@ -40,3 +41,20 @@ or modified to build your own world using built-in tools.
 <ansi fg="6">  .--.      .-'.      .--.      .--.      .--.      .--.      .`-.      .--.
 <ansi fg="187">:::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187">::::::::.</ansi>\<ansi fg="187"></ansi>
 '      `--'      `.-'      `--'      `--'      `--'      `-.'      `--'      `</ansi>
+
+<ansi fg="black-bold">.:</ansi> <ansi fg="magenta">Special Thanks</ansi>
+
+<ansi fg="8">Those who contributed to <ansi fg="command">GoMud</ansi> via <ansi fg="15">testing</ansi>, <ansi fg="15">content</ansi>, <ansi fg="15">code</ansi>, and <ansi fg="15">discussion</ansi>
+during its first year of development. In alphabetical order:</ansi>
+
+    <ansi fg="14">Andrew Burns</ansi>    aka <ansi fg="11">mister_burns</ansi>
+    <ansi fg="14">Arin Bennett</ansi>    aka <ansi fg="11">Sloan</ansi>
+    <ansi fg="14">Colin Senner</ansi>    aka <ansi fg="11">colinsenner</ansi>
+    <ansi fg="14">Durf Durfleton</ansi>  aka <ansi fg="11">Durf</ansi>
+    <ansi fg="14">Ethan Samuels</ansi>   aka <ansi fg="11">ethaburd</ansi>
+    <ansi fg="14">Jake</ansi>            aka <ansi fg="11">Jake</ansi>
+    <ansi fg="14">Jeff</ansi>            aka <ansi fg="11">Armoredartist</ansi>
+    <ansi fg="14">Jeffrey Edwards</ansi> aka <ansi fg="11">Miphon</ansi>
+    <ansi fg="14">Michael Myers</ansi>   aka <ansi fg="11">avatus</ansi>
+    <ansi fg="14">Scott</ansi>           aka <ansi fg="11">Neopong</ansi>
+    <ansi fg="14">William L</ansi>       aka <ansi fg="11">1aw123</ansi>
diff --git a/_datafiles/world/default/templates/help/password.template b/_datafiles/world/default/templates/help/password.template
index f6213dc5..a198915c 100644
--- a/_datafiles/world/default/templates/help/password.template
+++ b/_datafiles/world/default/templates/help/password.template
@@ -2,4 +2,4 @@
 
 The <ansi fg="command">password</ansi> command allows you to change your password.
 
-Type ansi fg="command">password</ansi> and answer the prompts to make the change.
+Type <ansi fg="command">password</ansi> and answer the prompts to make the change.
diff --git a/_datafiles/world/empty/buffs/24-death_recovery.js b/_datafiles/world/empty/buffs/24-death_recovery.js
new file mode 100644
index 00000000..30e42584
--- /dev/null
+++ b/_datafiles/world/empty/buffs/24-death_recovery.js
@@ -0,0 +1,21 @@
+
+
+// Invoked every time the buff is triggered (see roundinterval)
+function onTrigger(actor, triggersLeft) {
+
+    healAmt = actor.AddHealth(UtilDiceRoll(1, 10))
+    manaAmt = actor.AddMana(UtilDiceRoll(1, 10))
+
+    if ( healAmt > 0 && manaAmt > 0 ) {
+        SendUserMessage(actor.UserId(),     'The shadow realm heals you for <ansi fg="healing">'+String(healAmt)+' damage</ansi> and restores <ansi fg="mana-100">'+String(manaAmt)+' mana</ansi>!')
+    } else if ( healAmt > 0 ) {
+        SendUserMessage(actor.UserId(),     'The shadow realm heals you for <ansi fg="healing">'+String(healAmt)+' damage</ansi>!')
+    } else if ( manaAmt > 0 ) {
+        SendUserMessage(actor.UserId(),     'The shadow realm restores <ansi fg="mana-100">'+String(manaAmt)+' mana</ansi>!')
+    }
+
+    if ( healAmt > 0 || manaAmt > 0 ) {
+        SendRoomMessage(actor.GetRoomId(),  actor.GetCharacterName(true)+' is recovering from a recent death.', actor.UserId())
+    }
+}
+
diff --git a/_datafiles/world/empty/buffs/24-death_recovery.yaml b/_datafiles/world/empty/buffs/24-death_recovery.yaml
new file mode 100644
index 00000000..94824fc8
--- /dev/null
+++ b/_datafiles/world/empty/buffs/24-death_recovery.yaml
@@ -0,0 +1,5 @@
+buffid: 24
+name: Death Recovery
+description: You are recovering from dying
+triggerrate: 1 rounds
+triggercount: 15
diff --git a/_datafiles/world/empty/templates/help/password.template b/_datafiles/world/empty/templates/help/password.template
index f6213dc5..a198915c 100644
--- a/_datafiles/world/empty/templates/help/password.template
+++ b/_datafiles/world/empty/templates/help/password.template
@@ -2,4 +2,4 @@
 
 The <ansi fg="command">password</ansi> command allows you to change your password.
 
-Type ansi fg="command">password</ansi> and answer the prompts to make the change.
+Type <ansi fg="command">password</ansi> and answer the prompts to make the change.
diff --git a/go.mod b/go.mod
index cc89a53c..cb1dd4b3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/volte6/gomud
 
-go 1.23
+go 1.24
 
 require (
 	github.com/Volte6/ansitags v0.0.0-20240205002851-61e010ad9511
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index 29c1604f..29b372c7 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -53,6 +53,7 @@ type Config struct {
 	TelnetPort                   ConfigSliceString `yaml:"TelnetPort"`                   // One or more Ports used to accept telnet connections
 	LocalPort                    ConfigInt         `yaml:"LocalPort"`                    // Port used for admin connections, localhost only
 	WebPort                      ConfigInt         `yaml:"WebPort"`                      // Port used for web requests
+	MspFileUrl                   ConfigString      `yaml:"MspFileUrl"`                   // Where sound and music files reside for MSP protocol support
 	NextRoomId                   ConfigInt         `yaml:"NextRoomId"`                   // The next room id to use when creating a new room
 	LootGoblinRoom               ConfigInt         `yaml:"LootGoblinRoom"`               // The room the loot goblin spawns in
 	LootGoblinRoundCount         ConfigInt         `yaml:"LootGoblinRoundCount"`         // How often to spawn a loot goblin
diff --git a/internal/connections/clientsettings.go b/internal/connections/clientsettings.go
index 01fd055a..90fc39c4 100644
--- a/internal/connections/clientsettings.go
+++ b/internal/connections/clientsettings.go
@@ -6,6 +6,8 @@ type ClientSettings struct {
 	Client  ClientType
 	// Enabled GMCP Modules
 	GMCPModules map[string]int
+	// Is MSP enabled?
+	MSPEnabled bool
 }
 
 type DisplaySettings struct {
@@ -28,6 +30,10 @@ func (c ClientSettings) IsMudlet() bool {
 	return c.Client.IsMudlet
 }
 
+func (c ClientSettings) IsMsp() bool {
+	return c.MSPEnabled
+}
+
 // Check whether a GMCP module is enabled on the client
 func (c ClientSettings) GmcpEnabled(moduleName string) bool {
 	if len(c.GMCPModules) == 0 {
diff --git a/internal/events/eventtypes.go b/internal/events/eventtypes.go
index 58c426c3..cf3a960c 100644
--- a/internal/events/eventtypes.go
+++ b/internal/events/eventtypes.go
@@ -90,3 +90,12 @@ type System struct {
 }
 
 func (s System) Type() string { return `System` }
+
+// Messages that are intended to reach all users on the system
+type MSP struct {
+	UserId    int
+	SoundType string // SOUND or MUSIC
+	SoundFile string
+}
+
+func (m MSP) Type() string { return `MSP` }
diff --git a/internal/inputhandlers/term_iac.go b/internal/inputhandlers/term_iac.go
index e44b3158..127c5c9e 100644
--- a/internal/inputhandlers/term_iac.go
+++ b/internal/inputhandlers/term_iac.go
@@ -5,6 +5,7 @@ import (
 	"log/slog"
 	"strings"
 
+	"github.com/volte6/gomud/internal/configs"
 	"github.com/volte6/gomud/internal/connections"
 	"github.com/volte6/gomud/internal/term"
 )
@@ -137,6 +138,36 @@ func TelnetIACHandler(clientInput *connections.ClientInput, sharedState map[stri
 			continue
 		}
 
+		if term.IsMSPCommand(iacCmd) {
+
+			if ok, payload := term.Matches(iacCmd, term.MspAccept); ok {
+				slog.Info("Received", "type", "IAC (Client-MSP Accept)", "data", term.BytesString(payload))
+
+				cs := connections.GetClientSettings(clientInput.ConnectionId)
+				cs.MSPEnabled = true
+				connections.OverwriteClientSettings(clientInput.ConnectionId, cs)
+
+				connections.SendTo(
+					term.MspCommand.BytesWithPayload([]byte("!!SOUND(Off U="+configs.GetConfig().MspFileUrl.String()+")")),
+					clientInput.ConnectionId,
+				)
+
+				continue
+			}
+
+			if ok, payload := term.Matches(iacCmd, term.MspRefuse); ok {
+				slog.Info("Received", "type", "IAC (Client-MSP Refuse)", "data", term.BytesString(payload))
+
+				cs := connections.GetClientSettings(clientInput.ConnectionId)
+				cs.MSPEnabled = false
+				connections.OverwriteClientSettings(clientInput.ConnectionId, cs)
+
+				continue
+			}
+
+			continue
+		}
+
 		if ok, payload := term.Matches(iacCmd, term.TelnetAcceptedChangeCharset); ok {
 			slog.Info("Received", "type", "IAC (TelnetAcceptedChangeCharset)", "data", term.BytesString(payload))
 			continue
diff --git a/internal/prompt/prompt_test.go b/internal/prompt/prompt_test.go
new file mode 100644
index 00000000..8e1becd4
--- /dev/null
+++ b/internal/prompt/prompt_test.go
@@ -0,0 +1,119 @@
+package prompt
+
+import (
+	"testing"
+)
+
+// TestNew tests the creation of a new Prompt object
+func TestNew(t *testing.T) {
+	p := New("testCommand", "testRest")
+
+	if p.Command != "testCommand" {
+		t.Errorf("Expected Command to be 'testCommand', got %s", p.Command)
+	}
+
+	if p.Rest != "testRest" {
+		t.Errorf("Expected Rest to be 'testRest', got %s", p.Rest)
+	}
+
+	if len(p.Questions) != 0 {
+		t.Errorf("Expected Questions length to be 0, got %d", len(p.Questions))
+	}
+}
+
+// TestAsk ensures that questions can be added correctly
+func TestAsk(t *testing.T) {
+	p := New("testCommand", "testRest")
+
+	q := p.Ask("Are you ready?", []string{"Yes", "No"}, "Yes")
+
+	if q.Question != "Are you ready?" {
+		t.Errorf("Expected question text to match, got %s", q.Question)
+	}
+
+	if len(q.Options) != 2 {
+		t.Errorf("Expected 2 options, got %d", len(q.Options))
+	}
+
+	if q.DefaultResponse != "Yes" {
+		t.Errorf("Expected default response to be 'Yes', got %s", q.DefaultResponse)
+	}
+
+	if len(p.Questions) != 1 {
+		t.Errorf("Expected Questions length to be 1, got %d", len(p.Questions))
+	}
+}
+
+// TestGetNextQuestion ensures that the next pending question is returned correctly
+func TestGetNextQuestion(t *testing.T) {
+	p := New("testCommand", "testRest")
+
+	p.Ask("Are you ready?", []string{"Yes", "No"}, "Yes")
+
+	nextQuestion := p.GetNextQuestion()
+	if nextQuestion == nil || nextQuestion.Question != "Are you ready?" {
+		t.Errorf("Expected next question to be 'Are you ready?', got %v", nextQuestion)
+	}
+
+	nextQuestion.Done = true
+
+	if p.GetNextQuestion() != nil {
+		t.Errorf("Expected no next question, but got one")
+	}
+}
+
+// TestAnswer ensures the Answer method works correctly
+func TestAnswer(t *testing.T) {
+	q := &Question{
+		Question:        "What's your favorite color?",
+		Options:         []string{"Red", "Blue", "Green"},
+		DefaultResponse: "Red",
+	}
+
+	q.Answer("Blue")
+
+	if q.Response != "Blue" {
+		t.Errorf("Expected response to be 'Blue', got %s", q.Response)
+	}
+
+	if !q.Done {
+		t.Errorf("Expected Done to be true, got false")
+	}
+
+	q.Answer("")
+	if q.Response != "Red" {
+		t.Errorf("Expected response to default to 'Red', got %s", q.Response)
+	}
+}
+
+// TestRejectResponse ensures the RejectResponse method works correctly
+func TestRejectResponse(t *testing.T) {
+	q := &Question{
+		Question: "What's your favorite color?",
+		Response: "Red",
+		Done:     true,
+	}
+
+	q.RejectResponse()
+
+	if q.Response != "" {
+		t.Errorf("Expected Response to be empty, got %s", q.Response)
+	}
+
+	if q.Done {
+		t.Errorf("Expected Done to be false, got true")
+	}
+}
+
+// TestReset ensures the Reset method works correctly
+func TestReset(t *testing.T) {
+	q := &Question{
+		Done: true,
+	}
+
+	q.Reset()
+
+	if q.Done {
+		t.Errorf("Expected Done to be false, got true")
+	}
+}
diff --git a/internal/rooms/roommanager.go b/internal/rooms/roommanager.go
index e02b13c0..c4700bae 100644
--- a/internal/rooms/roommanager.go
+++ b/internal/rooms/roommanager.go
@@ -439,6 +439,19 @@ func MoveToRoom(userId int, toRoomId int, isSpawn ...bool) error {
 		)
 	}
 
+	// If this zone has music, play it.
+	// Room music takes priority.
+	if newRoom.MusicFile != `` {
+		user.PlayMusic(newRoom.MusicFile)
+	} else {
+		zoneInfo := GetZoneConfig(newRoom.Zone)
+		if zoneInfo.MusicFile != `` {
+			user.PlayMusic(zoneInfo.MusicFile)
+		} else if currentRoom.MusicFile != `` {
+			user.PlayMusic(`Off`)
+		}
+	}
+
 	return nil
 }
 
diff --git a/internal/rooms/rooms.go b/internal/rooms/rooms.go
index 72d7203a..83840175 100644
--- a/internal/rooms/rooms.go
+++ b/internal/rooms/rooms.go
@@ -65,6 +65,7 @@ type Room struct {
 	RoomId            int        // a unique numeric index of the room. Also the filename.
 	Zone              string     // zone is a way to partition rooms into groups. Also into folders.
 	ZoneConfig        ZoneConfig `yaml:"zoneconfig,omitempty"`      // If non-null is a root room.
+	MusicFile         string     `yaml:"musicfile,omitempty"`       // background music to play when in this room
 	IsBank            bool       `yaml:"isbank,omitempty"`          // Is this a bank room? If so, players can deposit/withdraw gold here.
 	IsStorage         bool       `yaml:"isstorage,omitempty"`       // Is this a storage room? If so, players can add/remove objects here.
 	IsCharacterRoom   bool       `yaml:"ischaracterroom,omitempty"` // Is this a room where characters can create new characters to swap between them?
diff --git a/internal/rooms/zoneconfig.go b/internal/rooms/zoneconfig.go
index 3b25c069..cd74cc37 100644
--- a/internal/rooms/zoneconfig.go
+++ b/internal/rooms/zoneconfig.go
@@ -11,7 +11,8 @@ type ZoneConfig struct {
 		Minimum int `yaml:"minimum,omitempty"` // level scaling minimum
 		Maximum int `yaml:"maximum,omitempty"` // level scaling maximum
 	} `yaml:"autoscale,omitempty"` // level scaling range if any
-	Mutators mutators.MutatorList `yaml:"mutators,omitempty"` // mutators defined here apply to entire zone
+	Mutators  mutators.MutatorList `yaml:"mutators,omitempty"`  // mutators defined here apply to entire zone
+	MusicFile string               `yaml:"musicfile,omitempty"` // background music to play when in this zone
 }
 
 func (z *ZoneConfig) Validate() {
diff --git a/internal/term/msp.go b/internal/term/msp.go
new file mode 100644
index 00000000..43ef76d3
--- /dev/null
+++ b/internal/term/msp.go
@@ -0,0 +1,26 @@
+package term
+
+const (
+	MSP IACByte = 90 // https://www.zuggsoft.com/zmud/msp.htm
+)
+
+/*
+Handshake
+When a client connects to an MSDP enabled server the server should send IAC WILL MSDP.
+The client should respond with either IAC DO MSDP or IAC DONT MSDP.
+Once the server receives IAC DO MSDP both the client and the server can send MSDP sub-negotiations.
+*/
+
+var (
+	MspEnable  = TerminalCommand{[]byte{TELNET_IAC, TELNET_WILL, MSP}, []byte{}} // Indicates the server wants to enable MSP.
+	MspDisable = TerminalCommand{[]byte{TELNET_IAC, TELNET_WONT, MSP}, []byte{}} // Indicates the server wants to disable MSP.
+
+	MspAccept = TerminalCommand{[]byte{TELNET_IAC, TELNET_DO, MSP}, []byte{}}   // Indicates the client accepts MSP
+	MspRefuse = TerminalCommand{[]byte{TELNET_IAC, TELNET_DONT, MSP}, []byte{}} // Indicates the client refuses MSP
+
+	MspCommand = TerminalCommand{[]byte{TELNET_IAC, TELNET_SB, MSP}, []byte{TELNET_IAC, TELNET_SE}} // Send via TELNET MSP Command
+)
+
+func IsMSPCommand(b []byte) bool {
+	return len(b) > 2 && b[0] == TELNET_IAC && b[2] == MSP
+}
diff --git a/internal/users/userrecord.go b/internal/users/userrecord.go
index f680e401..13248cea 100644
--- a/internal/users/userrecord.go
+++ b/internal/users/userrecord.go
@@ -49,6 +49,7 @@ type UserRecord struct {
 	Muted          bool                  `yaml:"muted,omitempty"`    // Cannot SEND custom communications to anyone but admin/mods
 	Deafened       bool                  `yaml:"deafened,omitempty"` // Cannot HEAR custom communications from anyone but admin/mods
 	EventLog       UserLog               `yaml:"-"`                  // Do not retain in user file (for now)
+	LastMusic      string                `yaml:"-"`                  // Keeps track of the last music that was played
 	connectionId   uint64
 	unsentText     string
 	suggestText    string
@@ -144,6 +145,26 @@ func (u *UserRecord) GrantXP(amt int, source string) {
 
 }
 
+func (u *UserRecord) PlayMusic(musicFile string) {
+
+	events.AddToQueue(events.MSP{
+		UserId:    u.UserId,
+		SoundType: `MUSIC`,
+		SoundFile: musicFile,
+	})
+
+}
+
+func (u *UserRecord) PlaySound(soundFile string) {
+
+	events.AddToQueue(events.MSP{
+		UserId:    u.UserId,
+		SoundType: `SOUND`,
+		SoundFile: soundFile,
+	})
+
+}
+
 func (u *UserRecord) Command(inputTxt string, waitTurns ...int) {
 
 	wt := 0
diff --git a/main.go b/main.go
index 0df12440..e7d48c7a 100644
--- a/main.go
+++ b/main.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"io"
 	"net"
 	"os"
 	"os/signal"
@@ -129,7 +128,7 @@ func main() {
 
 	// Validate chosen world:
 	if err := util.ValidateWorldFiles(`_datafiles/world/default`, c.FolderDataFiles.String()); err != nil {
-		slog.Error("World", "error", err)
+		slog.Error("World Validation", "error", err)
 		os.Exit(1)
 	}
 
@@ -291,6 +290,12 @@ func handleTelnetConnection(connDetails *connections.ConnectionDetails, wg *sync
 		connDetails.ConnectionId(),
 	)
 
+	// Send request to enable MSP
+	connections.SendTo(
+		term.MspEnable.BytesWithPayload(nil),
+		connDetails.ConnectionId(),
+	)
+
 	clientSetupCommands := "" + //term.AnsiAltModeStart.String() + // alternative mode (No scrollback)
 		//term.AnsiCursorHide.String() + // Hide Cursor (Because we will manually echo back)
 		//term.AnsiCharSetUTF8.String() + // UTF8 mode
@@ -322,6 +327,11 @@ func handleTelnetConnection(connDetails *connections.ConnectionDetails, wg *sync
 	// The default behavior is to just send a welcome screen first
 	inputhandlers.LoginInputHandler(clientInput, sharedState)
 
+	connections.SendTo(
+		term.MspCommand.BytesWithPayload([]byte("!!MUSIC(music/intro.mp3 V=20 L=-1 C=1)")),
+		clientInput.ConnectionId,
+	)
+
 	var userObject *users.UserRecord
 	var sug suggestions.Suggestions
 	lastInput := time.Now()
@@ -356,11 +366,9 @@ func handleTelnetConnection(connDetails *connections.ConnectionDetails, wg *sync
 				}
 			}
 
-			if err == io.EOF {
-				connections.Remove(connDetails.ConnectionId())
-			} else {
-				slog.Warn("Conn Read Error", "error", err)
-			}
+			slog.Warn("Conn Read Error", "error", err)
+
+			connections.Remove(connDetails.ConnectionId())
 
 			break
 		}
@@ -448,6 +456,11 @@ func handleTelnetConnection(connDetails *connections.ConnectionDetails, wg *sync
 
 		if lastHandler == "LoginInputHandler" {
 
+			connections.SendTo(
+				term.MspCommand.BytesWithPayload([]byte("!!MUSIC(Off)")),
+				clientInput.ConnectionId,
+			)
+
 			// Remove the login handler
 			connDetails.RemoveInputHandler("LoginInputHandler")
 			// Replace it with a regular echo handler.
@@ -473,6 +486,7 @@ func handleTelnetConnection(connDetails *connections.ConnectionDetails, wg *sync
 			connDetails.SetState(connections.LoggedIn)
 
 			worldManager.SendEnterWorld(userObject.UserId, userObject.Character.RoomId)
+
 		}
 
 		// If they have pressed enter (submitted their input), and nothing else has handled/aborted
@@ -559,6 +573,16 @@ func HandleWebSocketConnection(conn *websocket.Conn) {
 	// The default behavior is to just send a welcome screen first
 	inputhandlers.LoginInputHandler(clientInput, sharedState)
 
+	connections.SendTo(
+		[]byte("!!SOUND(Off U="+configs.GetConfig().MspFileUrl.String()+")"),
+		clientInput.ConnectionId,
+	)
+
+	connections.SendTo(
+		[]byte("!!MUSIC(music/intro.mp3 V=20 L=-1 C=1)"),
+		clientInput.ConnectionId,
+	)
+
 	for {
 		_, message, err := conn.ReadMessage()
 
diff --git a/world.go b/world.go
index 7a72092e..70f35655 100644
--- a/world.go
+++ b/world.go
@@ -963,6 +963,93 @@ func (w *World) MessageTick() {
 
 	}
 
+	//
+	// Dispatch MSP events
+	//
+	eq = events.GetQueue(events.MSP{})
+	for eq.Len() > 0 {
+
+		e := eq.Poll().(events.Event)
+
+		msp, typeOk := e.(events.MSP)
+		if !typeOk {
+			slog.Error("Event", "Expected Type", "MSP", "Actual Type", e.Type())
+			continue
+		}
+
+		if msp.UserId < 1 {
+			continue
+		}
+
+		if user := users.GetByUserId(msp.UserId); user != nil {
+
+			if msp.SoundType == `MUSIC` {
+
+				if user.LastMusic != msp.SoundFile {
+
+					msg := []byte("!!MUSIC(Off)")
+					if connections.IsWebsocket(user.ConnectionId()) {
+
+						connections.SendTo(
+							msg,
+							user.ConnectionId(),
+						)
+
+					} else {
+
+						connections.SendTo(
+							term.MspCommand.BytesWithPayload(msg),
+							user.ConnectionId(),
+						)
+
+					}
+				}
+
+				user.LastMusic = msp.SoundFile
+
+				msg := []byte("!!MUSIC(" + msp.SoundFile + " V=80 L=-1 C=1)")
+
+				if connections.IsWebsocket(user.ConnectionId()) {
+
+					connections.SendTo(
+						msg,
+						user.ConnectionId(),
+					)
+
+				} else {
+
+					connections.SendTo(
+						term.MspCommand.BytesWithPayload(msg),
+						user.ConnectionId(),
+					)
+
+				}
+			} else {
+
+				msg := []byte("!!SOUND(" + msp.SoundFile + ")")
+
+				if connections.IsWebsocket(user.ConnectionId()) {
+
+					connections.SendTo(
+						msg,
+						user.ConnectionId(),
+					)
+
+				} else {
+
+					connections.SendTo(
+						term.MspCommand.BytesWithPayload(msg),
+						user.ConnectionId(),
+					)
+
+				}
+
+			}
+
+		}
+
+	}
+
 	//
 	// System-wide broadcasts
 	//
