integrated playlist into hierarchy, heirarchy of filtering completely functional
fixed merge conflict