ability to jump songs
prep for background pull
fixed merge