refactor to get playlist stuff back in playlist module