Making the playlist add songs into a collection. Removing the controller.
Fixing merge issues.