Further work on song-upload