Add in better playlist capability