Set up song suggestions
fixed merge conflicts