More progress on scrobbling + some testing.