Merge Hanse's branch. sounds.json history is in this commit, if wanting to copy and paste the old file.