Bring back keep_alive - that wasn't the memory leak...
Hack together a wreck of a revert/commit
Some fixes towards the playlist refactor.

Ugh ugh ugh sloppy sloppy sloppy.