Did some work on Song and SongQueue classes