pull in changes whilst working on lastfm_queue