Added soundcloud support.  Refactored.