Massive clean up of the music section

Rip out the old broken code, rearrange and get it working again.