Last commit. I might come back, who knows?
Refactoring the Spotify code