factoring out some redundancy
in process of tidying up, fixed backwards functionality, need to add playlists
fixed merge conflicts