Almost done, need to fix 'song <number or name>'