Adding current_song