this doesn't look like it's related to soundcloud.  let's try to keep commits atomic