Added echonest stuff. Doesn't work yet, leave it commented