Refactoring, even more playlist features