Rewrite
Add playlist support