more scrubbing
incremental commit, starting to map song names