Minor refactoring
Some extra minor refactoring
Adds add to playlist option
Preparing for playlist support