Work on playlist functionality