The more I think about this the more I think you are right. Unless there are any huge objections I say after we pull this in and I will do the playlist refactor as its own branch.