diff --git a/js/main.js b/js/main.js
index 805ca1e..0ae7a20 100644
--- a/js/main.js
+++ b/js/main.js
@@ -499,7 +499,7 @@ class Player extends PrimaryView {
         this.renderer.set_level(this.level);
         this.root.classList.toggle('--has-demo', !!this.level.stored_level.demo);
         // TODO base this on a hash of the UA + some identifier for the pack + the level index.  StoredLevel doesn't know its own index atm...
-        this.change_music(Math.floor(Math.random() * SOUNDTRACK.length));
+        this.change_music(this.conductor.level_index % SOUNDTRACK.length);
         this._clear_state();
     }
 
@@ -918,7 +918,10 @@ class Player extends PrimaryView {
 
         let author_el = this.music_el.querySelector('#player-music-author');
         author_el.textContent = track.author;
-        if (track.twitter) {
+        if (track.url) {
+            author_el.setAttribute('href', track.url);
+        }
+        else if (track.twitter) {
             author_el.setAttribute('href', 'https://twitter.com/' + track.twitter);
         }
         else {
diff --git a/js/soundtrack.js b/js/soundtrack.js
index 34a4f19..8fc6689 100644
--- a/js/soundtrack.js
+++ b/js/soundtrack.js
@@ -28,4 +28,21 @@ export default [{
     twitter: "trotimwolf",
     beepbox: 'https://www.beepbox.co/#8n31s7k4l00e0jt2mm0a7g0jj07i0r1o3210T1v2L4u3bq1d5f7y1z7C0c2AcF8B4V6Q047cPa744E0000T1v1L4u61q1d5f7y0z6C1c0A5F2B6V7Q0530Pf636E0011T5v1L4ue8q3d6f7y1z8C0c0h6H-SstrsrBzjAqihT4v1L4uf0q1z6666ji8k8k3jSBKSJJAArriiiiii07JCABrzrrrrrrr00YrkqHrsrrrrjr005zrAqzrjzrrqr1jRjrqGGrrzsrsA099ijrABJJJIAzrrtirqrqjqixzsrAjrqjiqaqqysttAJqjikikrizrHtBJJAzArzrIsRCITKSS099ijrAJS____Qg99habbCAYrDzh00b010y8x4h00000000000id10Mk60id18Q4zgid18Q4h8h4w00cPcPcMp23MFEZkzjn_V97ihQAujAAth7F8RdjRW1jhZ4th7ihVdph7mhwkQvp7ohQAs0hQAth6FBZezqqfwzOp7khQAs2hQAth7CTA4uh8XyeAzJ8WieEzOXO2f8Atp7ihS4t97khVtV17pE_lOePieKOe0m8WX8Xt8SCnQWa_IQv7Aukn8X_8WX8U1szHIzJQzNlvYzOcITE-Heh4O0-hQarneGFFQQQFHOkOCSO5Bd6h14t76Vll97B0',
     path: 'music/gently-haunting.ogg',
+}, {
+    title: "punful existence",
+    author: "TheMIDIMan",
+    twitter: "TheMIDIMan1",
+    beepbox: 'https://www.beepbox.co/#8n43sbk3l00e0st2cm0a7g0sj08i0r1o3223000T0v0L4u00q0d1f8y0z1C0w4c0h0T0v0L8u00q0d1f8y0z1C2w3c2h0T5v0L4u42q1d1f6y1z7C1c0h0H_RBHBziiii9998T0v0L0u00q0d1f8y0z1C0w4c1h0T2v1L4u02q0d1f3y0z1C0w1T2v1L4u02q0d1f3y0z1C0w1T2v1L4u02q1d5fay3z1C0w1b000i4N8j4xd5hx8j4xc000000id18QlDwid18QAi4N8j4xci4Ql64xc0000000018Q4zhmu18Q4zih8j4xci4N8j4xci4M0000014h8y8y8zcP8y8PcQ410g410g410g410g410gp2e9FBMqEa2ibnnnnBMs3vBRRRVttJKnn0mVs5nnBRRRYK2LLOWWWYK-0KOWWWYKKSTbHJHOWWWYKKKLBTmRVtttunrrtBRRRVttJKnnrrBRRRVtttv9IwEfbHHHOU61wsKKKLbHJJOWU2TbwGWYKKKLBMlZ-nnnnBTM5SnnnnBRSSVttJunnnnBRRRYKWSLbHHHOXrrIKKKLbHJJOWXrsKKKLbHHH5jTXFYy0jnU43jN830rqu9wpJszkZ-R-Kjq_CRrrU50M21FUC1wdJf4McSKhYlT6rlJJjTXOYCXSLMq22uOBTtyLhiXKNtIc7ZKXInrKX5uQvtTs1__v__No85YntSbNtToJtToLr202SXKNtKXInr20XrKX5SXKNubKXwf_X__-bKYUKXInyXKNqXKNuTTnJTtyXtToKTKZJTtyXtToL5TtT__T__XtToHQzHKXHKXSXKWXK_cU47NtToLdTtyXo88eTtSbJTtyYntT0v_T__Ym21v5TtyYntSbntSbSMw0JKXInrKX5SMweSXKNtKXInyXKU3_-___yXLebKX5UKXImKXInJZRXtToKTtSbJXLrtToKTtSbNtTt__Z__-TtSbPtTttTuTtTntSaDntPAg2q_0wqu90o3rjNc3dHAqDnsjROrnYjnZmS-hgeg86Dyo60SQYj0PqV7PnsVPlJJjHLgirFBeamqdWYEFE5Oq8YEmwnaHaaq1sGIEngkVdphjgbAQhVgJ0KlmkbBlBcORkCkEnyGYkkVdphjgbAQhVgJ0KlmkbBljdcQO18QOwhjgkQ5d1jgkQ5d1jgbiagbA2V0KgbA2V0KgbA2V0KgbA2V0KgbA2V0KgbOacz8EEOcyyz8Oaacz8EEOcyyz8Oaacz8EEOcyAUYwXY5DRM97jNs0',
+    path: 'music/punful-existence.ogg',
+}, {
+    title: "tiny jam",
+    author: "fluffy",
+    url: 'https://beesbuzz.biz/',
+    path: 'music/tiny-jam.ogg',
+}, {
+    title: "conundrum",
+    author: "fluffy",
+    url: 'https://beesbuzz.biz/',
+    beepbox: 'https://www.beepbox.co/#8n31sbk0l00e0rt2mm0a7g0rj07i0r1o3210T1v1L4u01q3d7fay3z6C0c1A5F4B0V1Q0248Pac74E0085T1v1L4u01q1d1f4y4z9C0c1A1F0B0V1Q200ePd593E0787T5v1L4u05q3d0f1y4z0C2c0h0H_--D-quSRIAJJST4v1L4u04q1z6666ji8k8k3jSBKSJJAArriiiiii07JCABrzrrrrrrr00YrkqHrsrrrrjr005zrAqzrjzrrqr1jRjrqGGrrzsrsA099ijrABJJJIAzrrtirqrqjqixzsrAjrqjiqaqqysttAJqjikikrizrHtBJJAzArzrIsRCITKSS099ijrAJS____Qg99habbCAYrDzh00bkzgid18Q4zgid0000000018Nwz55p88Nhnh5t000000ichgR5zkicg004hcx4O4jhkohd14z4isp25PFJvy1wqY58llp2GhKFLh_wFLh-czArdWfRuKrdQ_p13c5FKfZ_tRBPjub_aq_TYtjhZgtBdJlldtlldtlleKGGCKGGCK1wqoiGGiOdI3j1RlkOJBtdZllmG1wqoiGGCK1JFxaEm1STTQMBlldtlldtlJKoHrarqGGqWGGqWGGth7ihT4sChON7a4sIpqPhDkCz9FFOG8YwzOF8Wp8WFOHyfAVARQVB4ughVkAtcAtkVl97Op8Wd8Td6nl9EOaqSqcyIz9UzMbaXbAenShhAPvehhrBRApcVmnlsV5vaGysD9CKsyyLbH8OpOIKGVEGKttV56jdkV55uTnpeldpuptSltdRKpEPpFFOW8YwzOF8Wp8WFOGU0',
+    path: 'music/conundrum.ogg',
 }];
diff --git a/music/conundrum.ogg b/music/conundrum.ogg
new file mode 100644
index 0000000..0abddd7
Binary files /dev/null and b/music/conundrum.ogg differ
diff --git a/music/punful-existence.ogg b/music/punful-existence.ogg
new file mode 100644
index 0000000..dfbf0c9
Binary files /dev/null and b/music/punful-existence.ogg differ
diff --git a/music/tiny-jam.ogg b/music/tiny-jam.ogg
new file mode 100644
index 0000000..9817ea9
Binary files /dev/null and b/music/tiny-jam.ogg differ