Neutral songs

Merging this now to get the bug fixes and new functionality, still needs more neutral songs.