diff --git a/Gemfile.lock b/Gemfile.lock
index 9d4268f..6875dbb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -148,7 +148,7 @@ GEM
     net-ssh (2.3.0)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    nokogiri (1.5.2)
+    nokogiri (1.5.5)
     oauth2 (0.8.0)
       faraday (~> 0.8)
       httpauth (~> 0.1)
@@ -163,7 +163,7 @@ GEM
     omniauth-oauth2 (1.1.1)
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
-    pandora_client (0.1.0)
+    pandora_client (0.1.2)
       crypt19 (~> 1.2.1)
       faraday (~> 0.8)
       nokogiri (~> 1.5.2)
diff --git a/README.md b/README.md
index 71e65b7..88a2052 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,13 @@ $ echo 'FACEBOOK_APP_ID=111111111111111' >> .env
 $ echo 'FACEBOOK_APP_SECRET=abcdefabcdefabcdefabcdefabcdefab' >> .env
 ```
 
+Add your SoundCloud Client ID. Note that Warble currently exposes this 
+to end users. Get a new ID from http://soundcloud.com/you/apps/new
+
+```sh
+$ echo 'SOUNDCLOUD_CLIENT_ID=soundcloud_client_id' >> .env
+```
+
 Add credentials for a Pandora partner. Pick one from
 <http://pan-do-ra-api.wikia.com/wiki/Json/5/partners>:
 
diff --git a/app/assets/images/soundcloud.png b/app/assets/images/soundcloud.png
new file mode 100644
index 0000000..1eb8c9c
Binary files /dev/null and b/app/assets/images/soundcloud.png differ
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 97fb17e..d8690c5 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -8,7 +8,6 @@
 #= require faye-browser
 #= require jquery.mapkey
 #= require tooltip
-
 #= require_self
 
 #= require_tree ./components
@@ -30,6 +29,7 @@ jQuery(document).ready ($) ->
       'hype/popular/3days/:page'  : 'hypePopular3Days'
       'hype/popular/week/:page'   : 'hypePopularWeek'
       'hype/:user/:page'          : 'hypeUser'
+      'soundcloud'                : 'soundcloud'
       '*unmatched'                : 'home'
 
     initialize: ->
@@ -41,15 +41,16 @@ jQuery(document).ready ($) ->
       @hypeSongs   = new Warble.HypeSongList
 
       # initialize views
-      @headerView          = new Warble.HeaderView model: @jukebox
-      @currentPlayView     = new Warble.CurrentPlayView model: @jukebox
-      @playlistView        = new Warble.PlaylistView collection: @playlist
-      @serviceChooserView  = new Warble.ServiceChooserView
-      @pandoraAuthView     = new Warble.PandoraCredentialsView
-      @pandoraStationsView = new Warble.PandoraStationsView collection: @stationList
-      @youtubeSearchView   = new Warble.YoutubeSearchView
-      @hypeChooserView     = new Warble.HypeFeedsView
-      @hypeSongsView       = new Warble.HypeSongsView collection: @hypeSongs
+      @headerView             = new Warble.HeaderView model: @jukebox
+      @currentPlayView        = new Warble.CurrentPlayView model: @jukebox
+      @playlistView           = new Warble.PlaylistView collection: @playlist
+      @serviceChooserView     = new Warble.ServiceChooserView
+      @pandoraAuthView        = new Warble.PandoraCredentialsView
+      @pandoraStationsView    = new Warble.PandoraStationsView collection: @stationList
+      @youtubeSearchView      = new Warble.YoutubeSearchView
+      @hypeChooserView        = new Warble.HypeFeedsView
+      @hypeSongsView          = new Warble.HypeSongsView collection: @hypeSongs
+      @soundcloudSearchView   = new Warble.SoundcloudSearchView
 
       # load data
       @jukebox.fetch()
@@ -146,6 +147,9 @@ jQuery(document).ready ($) ->
       @hypeSongs.url = "/hype?username=#{encodeURIComponent(user)}&page=#{encodeURIComponent(page)}"
       @hypeSongs.fetch()
 
+    soundcloud: ->
+      #SC.initialize client_id: "dae39b5eb16934e43c93209cb65051ee"
+      @switchPane @soundcloudSearchView
 
   window.workspace = workspace = new Warble.WorkspaceRouter
   Backbone.history.start pushState: true
diff --git a/app/assets/javascripts/templates/soundcloud.jst.hbs b/app/assets/javascripts/templates/soundcloud.jst.hbs
new file mode 100644
index 0000000..58bc49e
--- /dev/null
+++ b/app/assets/javascripts/templates/soundcloud.jst.hbs
@@ -0,0 +1,12 @@
+<div class="breadcrumbs">
+  <a href="/" data-relative="true">Sources</a>
+  &raquo;
+  <span class="current">SoundCloud</span>
+</div>
+
+<h2>SoundCloud</h2>
+
+<input type="text" id="soundcloud_query"/>
+<a href="#" class="button" id="soundcloud_search">Search</a>
+
+<div id="soundcloud_search_results"></div>
diff --git a/app/assets/javascripts/templates/soundcloud_preview.jst.hbs b/app/assets/javascripts/templates/soundcloud_preview.jst.hbs
new file mode 100644
index 0000000..46c16d6
--- /dev/null
+++ b/app/assets/javascripts/templates/soundcloud_preview.jst.hbs
@@ -0,0 +1,2 @@
+<audio class="scpreview-player" controls="controls" src="{{url}}" type="audio/mp3" autoplay />
+
diff --git a/app/assets/javascripts/templates/soundcloud_results.jst.hbs b/app/assets/javascripts/templates/soundcloud_results.jst.hbs
new file mode 100644
index 0000000..4ae7f93
--- /dev/null
+++ b/app/assets/javascripts/templates/soundcloud_results.jst.hbs
@@ -0,0 +1,26 @@
+<ul>
+{{#results}}
+  <li>
+    <a href="#" class="entry" data-id="{{index}}">
+      <img src="{{thumbnail}}" class="thumbnail" />
+      <div class="title">{{title}}</div>
+      <div class="author">{{author}}</div>
+    </a>
+    <div class="scpreview" data-soundcloud="{{url}}"><a href='#'>preview</a></div>
+  </li>
+{{/results}}
+</ul>
+
+{{#if hasPrev}}
+  <a href="#" class="paging button" id="previous_results">
+    <span class="pictos">[</span>
+    Previous
+  </a>
+{{/if}}
+
+{{#if hasNext}}
+  <a href="#" class="paging button" id="next_results">
+    Next
+    <span class="pictos">]</span>
+  </a>
+{{/if}}
diff --git a/app/assets/javascripts/templates/sources.jst.hbs.erb b/app/assets/javascripts/templates/sources.jst.hbs.erb
index 6d5076a..c915a6a 100644
--- a/app/assets/javascripts/templates/sources.jst.hbs.erb
+++ b/app/assets/javascripts/templates/sources.jst.hbs.erb
@@ -11,6 +11,12 @@
       YouTube
     </a>
   </li>
+  <li>
+    <a href="/soundcloud" data-relative="true">
+      <%= image_tag 'soundcloud.png' %>
+      SoundCloud
+    </a>
+  </li>
   <li>
     <a href="/hype" data-relative="true">
       The Hype Machine
diff --git a/app/assets/javascripts/ui/application/panes/soundcloud.js.coffee.erb b/app/assets/javascripts/ui/application/panes/soundcloud.js.coffee.erb
new file mode 100644
index 0000000..f25b66b
--- /dev/null
+++ b/app/assets/javascripts/ui/application/panes/soundcloud.js.coffee.erb
@@ -0,0 +1,98 @@
+#= require ui/application/panes/pane
+#= require templates/soundcloud
+#= require templates/soundcloud_results
+#= require templates/soundcloud_preview
+
+# TODO: proper controller routes for pages and queries
+class Warble.SoundcloudSearchView extends Warble.PaneView
+  SOUNDCLOUD_CLIENT_ID = "<%= ENV['SOUNDCLOUD_CLIENT_ID'] %>"
+  SOUNDCLOUD_SEARCH_URL = "https://api.soundcloud.com/tracks"
+
+  template:              window.JST['templates/soundcloud']
+  searchResultsTemplate: window.JST['templates/soundcloud_results']
+
+  events:
+    'click #soundlcoud_search'    : 'search'
+    'keypress input'              : 'handleEnter'
+    'click a.entry'               : 'queueSong'
+    'click .scpreview a'          : 'previewAudio'
+    'click a#previous_results'    : 'previousPage'
+    'click a#next_results'        : 'nextPage'
+
+  initialize: ->
+    @searchData = null
+    @query      = ''
+    @pageSize   = 10
+    @startIndex = 0
+    
+  activate: ->
+    @$('#soundcloud_query').focus()
+
+  handleEnter: (event) ->
+    if event.which == 13
+      this.search event
+
+  previewAudio: (event) ->
+    preview_el = @$(event.currentTarget)
+    preview_el.parent('div').parent('li').addClass('show-preview')
+    preview_el.parent('div').html window.JST['templates/soundcloud_preview']
+      url: preview_el.parent('div').data('soundcloud')
+    this
+
+  previousPage: (event) ->
+    @startIndex -= @pageSize + 1
+    this.search event
+
+  nextPage: (event) ->
+    @startIndex += @pageSize + 1
+    this.search event
+
+  search: (event) ->
+    window.workspace.showSpinner()
+    q = @$('#soundcloud_query').val()
+    
+    #reset the search start-index if it's a new search
+    if @query != q
+      @startIndex = 1
+      @query = q
+    
+    search_params =
+      q:            @query
+      'limit':      @pageSize
+      'offset':     @startIndex if @startIndex >= @pageSize
+      'client_id':  SOUNDCLOUD_CLIENT_ID
+
+    $.getJSON SOUNDCLOUD_SEARCH_URL, search_params, (data) =>
+      # extract results into a saner object array
+      @data = _.map data, (entry, index) ->
+        index:          index
+        soundcloud_id:  entry.id
+        title:          entry.title
+        thumbnail:      entry.artwork_url
+        author:         entry.user.username
+        url:            entry.stream_url + "?client_id=" + SOUNDCLOUD_CLIENT_ID
+      
+      $('#soundcloud_search_results').html @searchResultsTemplate
+        results: @data
+        hasPrev: @startIndex > 1
+        hasNext: true #Fix this. Need total number of results from soundcloud.
+    
+      @$el.scrollTop 0
+      window.workspace.hideSpinner()
+    event.preventDefault()
+
+  queueSong: (event) ->
+    console.log @data[$(event.currentTarget).attr('data-id')]
+    window.workspace.showSpinner()
+    
+    $.ajax '/jukebox/playlist',
+      type: 'POST'
+      data:
+        soundcloud: @data[$(event.currentTarget).attr('data-id')]
+      success: =>
+        window.workspace.hideSpinner()
+      error: ->
+        window.workspace.navigate '/', true
+        window.workspace.hideSpinner()
+
+    event.preventDefault()
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 5dc0683..c8b59da 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -468,19 +468,22 @@ header
           +box-shadow(rgba(0, 0, 0, 0.6) 1px 1px 4px)
 
 
-  #youtube_query, #search_query     // TODO: combine
+  #youtube_query, #soundcloud_query, #search_query     // TODO: combine
     width: 220px
 
   #youtube_search, #library_search, #username_search  // TODO: combine
     margin-left: 15px
 
-  #youtube_search_results
+  #youtube_search_results, #soundcloud_search_results
     li  // TODO: combine with pandora_songs list
       height: 48px
       padding: 10px 0
 
       &.preview
         padding-bottom: 220px
+        
+      &.show-preview
+        padding-bottom: 35px
 
       img   // TODO: compied from pandora_songs list, consolidate them
         float: left
@@ -493,7 +496,6 @@ header
       .title
         margin-top: 10px
 
-
   a.button
     font-size: 13px
     background: $secondary_a_dark
diff --git a/app/controllers/pandora/base_controller.rb b/app/controllers/pandora/base_controller.rb
index d5493c5..26e0c1b 100644
--- a/app/controllers/pandora/base_controller.rb
+++ b/app/controllers/pandora/base_controller.rb
@@ -1,22 +1,42 @@
-class Pandora::BaseController < ApplicationController
-  before_filter :check_pandora_credentials!
+module Pandora
+  class BaseController < ApplicationController
+    before_filter :check_pandora_credentials!
 
 
- private
+   private
 
-  def check_pandora_credentials!
-    if !$pandora_partner   # Keys not provided via envvars
-      head :service_unavailable
-    elsif !current_user.pandora_credentials?
-      head :forbidden
+    def check_pandora_credentials!
+      if !$pandora_partner   # Keys not provided via envvars
+        head :service_unavailable
+      elsif !current_user.pandora_credentials?
+        render json: { error: :missing_credentials }, status: :forbidden
+      end
+    end
+
+    # Run the given block with the pandora client. Reauthenticate and retry if
+    # a Pandora 1001 INVALID_AUTH_TOKEN is raised.
+    def retry_on_auth_failure(&block)
+      retried = false
+      begin
+        yield pandora_client
+      rescue Pandora::APIError => ex
+        if !retried && ex.code == 1001  # INVALID_AUTH_TOKEN
+          pandora_client.reauthenticate
+          retried = true
+          retry
+        else
+          raise
+        end
+      end
     end
-  end
 
-  def pandora_client
-    session[:pandora_user] ||=
-      $pandora_partner.login_user(
-        current_user.pandora_username,
-        current_user.pandora_password
-      )
+    # Current user's Pandora session stored in the cookie session.
+    def pandora_client
+      session[:pandora_user] ||=
+        $pandora_partner.login_user(
+          current_user.pandora_username,
+          current_user.pandora_password
+        )
+    end
   end
 end
diff --git a/app/controllers/plays_controller.rb b/app/controllers/plays_controller.rb
index 4fa10d0..6a98b4f 100644
--- a/app/controllers/plays_controller.rb
+++ b/app/controllers/plays_controller.rb
@@ -11,7 +11,12 @@ def create
         Jukebox.enqueue(Song.find(song_id), current_user)
       end
       head :created
-
+      
+    elsif params[:soundcloud]
+      song = Song.find_or_create_from_soundcloud_params(params[:soundcloud], current_user)
+      Jukebox.enqueue(song, current_user)
+      head :created
+      
     elsif params[:youtube]
       song = Song.find_or_create_from_youtube_params(params[:youtube], current_user)
       Jukebox.enqueue(song, current_user)
diff --git a/app/models/song.rb b/app/models/song.rb
index efb2f3f..3ef2c24 100644
--- a/app/models/song.rb
+++ b/app/models/song.rb
@@ -43,6 +43,25 @@ def self.find_or_create_from_pandora_song(pandora_song, submitter)
       song
     end
   end
+  
+  def self.find_or_create_from_soundcloud_params(params, submitter)
+    if song = where(source: 'soundcloud').where(external_id: params[:soundcloud_id]).first
+      song.fsck! params[:url]
+      song
+    else   # first time seeing the song, so create it
+      song = Song.create({
+        source:      'soundcloud',
+        title:       params[:title],
+        artist:      params[:author],
+        cover_url:   params[:artwork_url],
+        url:         params[:url],
+        external_id: params[:soundcloud_id],
+        user:        submitter
+      }, without_protection: true)
+      ArchiveSongWorker.perform_async song.id   # Queue for archiving
+      song
+    end
+  end
 
   def self.find_or_create_from_youtube_params(params, submitter)
     if song = where(source: 'youtube').where(external_id: params[:youtube_id]).first
@@ -106,7 +125,7 @@ def self.random
 
   # Is this song archivable to disk?
   def archivable?
-    %w[pandora hypem].include?(source)
+    %w[pandora hypem soundcloud].include?(source)
   end
 
   # Ensure a song has been archived.