merging from connie
merged connie and master. playlist kinda works