Working on rewrite more.
Working on attributes query. Also removing more music-player specific.