diff --git a/ruby/lib/jam_ruby/message_factory.rb b/ruby/lib/jam_ruby/message_factory.rb
index f5b59ae6e..7f3125da2 100644
--- a/ruby/lib/jam_ruby/message_factory.rb
+++ b/ruby/lib/jam_ruby/message_factory.rb
@@ -19,7 +19,7 @@ module JamRuby
 
     # given a string (bytes) payload, return a client message
     def parse_client_msg(payload)
-      return Jampb::ClientMessage.parse(payload)
+      Jampb::ClientMessage.parse(payload)
     end
 
     # create a login message using user/pass
@@ -30,7 +30,7 @@ module JamRuby
         :client_id => options[:client_id]
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::LOGIN,
         :route_to => SERVER_TARGET,
         :login => login
@@ -44,7 +44,7 @@ module JamRuby
         :client_id => options[:client_id]
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::LOGIN,
         :route_to => SERVER_TARGET,
         :login => login
@@ -63,7 +63,7 @@ module JamRuby
         :user_id => user_id
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::LOGIN_ACK,
         :route_to => CLIENT_TARGET,
         :login_ack => login_ack
@@ -73,7 +73,7 @@ module JamRuby
     def download_available
       download_available = Jampb::DownloadAvailable.new
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
           :type => ClientMessage::Type::DOWNLOAD_AVAILABLE,
           :route_to => CLIENT_TARGET,
           :download_available => download_available
@@ -84,7 +84,7 @@ module JamRuby
     def login_music_session(music_session)
       login_music_session = Jampb::LoginMusicSession.new(:music_session => music_session)
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::LOGIN_MUSIC_SESSION,
         :route_to => SERVER_TARGET,
         :login_music_session => login_music_session
@@ -95,7 +95,7 @@ module JamRuby
     def login_music_session_ack(error, error_reason)
       login_music_session_ack = Jampb::LoginMusicSessionAck.new(:error => error, :error_reason => error_reason)
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::LOGIN_MUSIC_SESSION_ACK,
         :route_to => CLIENT_TARGET,
         :login_music_session_ack => login_music_session_ack
@@ -106,7 +106,7 @@ module JamRuby
     def leave_music_session(music_session)
       leave_music_session = Jampb::LeaveMusicSession.new(:music_session => music_session)
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::LEAVE_MUSIC_SESSION,
         :route_to => SERVER_TARGET,
         :leave_music_session => leave_music_session
@@ -117,7 +117,7 @@ module JamRuby
     def leave_music_session_ack(error, error_reason)
       leave_music_session_ack = Jampb::LeaveMusicSessionAck.new(:error => error, :error_reason => error_reason)
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::LEAVE_MUSIC_SESSION_ACK,
         :route_to => CLIENT_TARGET,
         :leave_music_session_ack => leave_music_session_ack
@@ -128,7 +128,7 @@ module JamRuby
     def heartbeat()
       heartbeat = Jampb::Heartbeat.new
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::HEARTBEAT,
         :route_to => SERVER_TARGET,
         :heartbeat => heartbeat
@@ -139,7 +139,7 @@ module JamRuby
     def heartbeat_ack()
       heartbeat_ack = Jampb::HeartbeatAck.new
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::HEARTBEAT_ACK,
         :route_to => CLIENT_TARGET,
         :heartbeat_ack => heartbeat_ack
@@ -150,7 +150,7 @@ module JamRuby
     def server_bad_state_recovered(original_message_id)
       recovered = Jampb::ServerBadStateRecovered.new()
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::SERVER_BAD_STATE_RECOVERED,
         :route_to => CLIENT_TARGET,
         :server_bad_state_recovered => recovered,
@@ -162,7 +162,7 @@ module JamRuby
     def server_generic_error(error_msg)
       error = Jampb::ServerGenericError.new(:error_msg => error_msg)
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::SERVER_GENERIC_ERROR,
         :route_to => CLIENT_TARGET,
         :server_generic_error => error
@@ -173,7 +173,7 @@ module JamRuby
     def server_rejection_error(error_msg)
       error = Jampb::ServerRejectionError.new(:error_msg => error_msg)
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::SERVER_REJECTION_ERROR,
         :route_to => CLIENT_TARGET,
         :server_rejection_error => error
@@ -184,7 +184,7 @@ module JamRuby
     def server_permission_error(original_message_id, error_msg)
       error = Jampb::ServerPermissionError.new(:error_msg => error_msg)
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::SERVER_PERMISSION_ERROR,
         :route_to => CLIENT_TARGET,
         :server_permission_error => error,
@@ -196,7 +196,7 @@ module JamRuby
     def server_bad_state_error(original_message_id, error_msg)
       error = Jampb::ServerBadStateError.new(:error_msg => error_msg)
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::SERVER_BAD_STATE_ERROR,
         :route_to => CLIENT_TARGET,
         :server_bad_state_error => error,
@@ -215,7 +215,7 @@ module JamRuby
         :msg => msg
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::FRIEND_UPDATE,
         :route_to => USER_TARGET_PREFIX + user_id,
         :friend_update => friend
@@ -232,7 +232,7 @@ module JamRuby
         :created_at => created_at
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::FRIEND_REQUEST,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :friend_request => friend_request
@@ -248,7 +248,7 @@ module JamRuby
         :created_at => created_at
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::FRIEND_REQUEST_ACCEPTED,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :friend_request_accepted => friend_request_accepted
@@ -263,7 +263,7 @@ module JamRuby
         :created_at => created_at
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::NEW_USER_FOLLOWER,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :new_user_follower => new_user_follower
@@ -278,7 +278,7 @@ module JamRuby
         :created_at => created_at
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::NEW_BAND_FOLLOWER,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :new_band_follower => new_band_follower
@@ -293,7 +293,7 @@ module JamRuby
         :created_at => created_at
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::SESSION_INVITATION,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :session_invitation => session_invitation
@@ -311,7 +311,7 @@ module JamRuby
         :created_at => created_at
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::JOIN_REQUEST,
         :route_to => SESSION_TARGET_PREFIX + session_id,
         :join_request => req
@@ -329,7 +329,7 @@ module JamRuby
         :created_at => created_at
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::JOIN_REQUEST_APPROVED,
         :route_to => SESSION_TARGET_PREFIX + session_id,
         :join_request_approved => req_approved
@@ -347,7 +347,7 @@ module JamRuby
         :created_at => created_at
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::JOIN_REQUEST_REJECTED,
         :route_to => SESSION_TARGET_PREFIX + session_id,
         :join_request_rejected => req_rejected
@@ -361,7 +361,7 @@ module JamRuby
         :msg => msg
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::SESSION_JOIN,
         :route_to => CLIENT_TARGET,
         :session_join => join
@@ -376,7 +376,7 @@ module JamRuby
         :recording_id => recording_id
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::SESSION_DEPART,
         :route_to => CLIENT_TARGET,
         :session_depart => left
@@ -392,7 +392,7 @@ module JamRuby
         :created_at => created_at
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::MUSICIAN_SESSION_JOIN,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :musician_session_join => musician_session_join
@@ -408,7 +408,7 @@ module JamRuby
           :created_at => created_at
         )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::BAND_SESSION_JOIN,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :band_session_join => band_session_join
@@ -424,7 +424,7 @@ module JamRuby
         :created_at => created_at
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::MUSICIAN_RECORDING_SAVED,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :musician_recording_saved => musician_recording_saved
@@ -440,7 +440,7 @@ module JamRuby
         :created_at => created_at
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::BAND_RECORDING_SAVED,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :band_recording_saved => band_recording_saved
@@ -453,7 +453,7 @@ module JamRuby
         :msg => msg
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::RECORDING_STARTED,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :recording_started => recording_started
@@ -466,7 +466,7 @@ module JamRuby
         :msg => msg
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::RECORDING_ENDED,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :recording_ended => recording_ended
@@ -482,7 +482,7 @@ module JamRuby
           :created_at => created_at
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
           :type => ClientMessage::Type::RECORDING_MASTER_MIX_COMPLETE,
           :route_to => USER_TARGET_PREFIX + receiver_id,
           :recording_master_mix_complete => recording_master_mix_complete
@@ -500,7 +500,7 @@ module JamRuby
           :created_at => created_at
         )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::BAND_INVITATION,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :band_invitation => band_invitation
@@ -517,7 +517,7 @@ module JamRuby
           :created_at => created_at
         )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::BAND_INVITATION_ACCEPTED,
         :route_to => USER_TARGET_PREFIX + receiver_id,
         :band_invitation_accepted => band_invitation_accepted
@@ -533,7 +533,7 @@ module JamRuby
         :photo_url => photo_url
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::MUSICIAN_SESSION_FRESH,
         :route_to => CLIENT_TARGET,
         :musician_session_fresh => fresh
@@ -549,18 +549,45 @@ module JamRuby
         :photo_url => photo_url
       )
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::MUSICIAN_SESSION_STALE,
         :route_to => CLIENT_TARGET,
         :musician_session_stale => stale
       )
     end
 
+    # create a source up requested message to send to clients in a session,
+    # so that one of the clients will start sending source audio to icecast
+    def source_up_requested (session_id, host, port, mount, source_user, source_pass)
+      source_up_requested = Jampb::SourceUpRequested.new(
+          host: host,
+          port: port,
+          mount: mount,
+          source_user: source_user,
+          source_pass: source_pass)
+
+      Jampb::ClientMessage.new(
+          type: ClientMessage::Type::SOURCE_UP_REQUESTED,
+          route_to:  SESSION_TARGET_PREFIX + session_id,
+          source_up_requested: source_up_requested)
+    end
+
+    # create a source up requested message to send to clients in a session,
+    # so that one of the clients will start sending source audio to icecast
+    def source_down_requested (session_id, mount)
+      source_down_requested = Jampb::SourceDownRequested.new(mount: mount)
+
+      Jampb::ClientMessage.new(
+          type: ClientMessage::Type::SOURCE_DOWN_REQUESTED,
+          route_to:  SESSION_TARGET_PREFIX + session_id,
+          source_down_requested: source_down_requested)
+    end
+
     # create a test message to send in session
     def test_session_message(session_id, msg)
       test = Jampb::TestSessionMessage.new(:msg => msg)
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::TEST_SESSION_MESSAGE,
         :route_to => SESSION_TARGET_PREFIX + session_id,
         :test_session_message => test
@@ -573,7 +600,7 @@ module JamRuby
     def ping_request(client_id, from)
       ping_request = Jampb::PingRequest.new()
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::PING_REQUEST,
         :route_to => CLIENT_TARGET_PREFIX + client_id,
         :from => from,
@@ -585,7 +612,7 @@ module JamRuby
     def ping_ack(client_id, from)
       ping_ack = Jampb::PingAck.new
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::PING_ACK,
         :route_to => CLIENT_TARGET_PREFIX + client_id,
         :from => from,
@@ -597,7 +624,7 @@ module JamRuby
     def test_client_message(client_id, from, msg)
       test = Jampb::TestClientMessage.new(:msg => msg)
 
-      return Jampb::ClientMessage.new(
+      Jampb::ClientMessage.new(
         :type => ClientMessage::Type::TEST_CLIENT_MESSAGE,
         :route_to => CLIENT_TARGET_PREFIX + client_id,
         :from => from,
diff --git a/ruby/spec/jam_ruby/resque/icecast_config_worker_spec.rb b/ruby/spec/jam_ruby/resque/icecast_config_worker_spec.rb
index 4eb95adcf..fd32efa9e 100644
--- a/ruby/spec/jam_ruby/resque/icecast_config_worker_spec.rb
+++ b/ruby/spec/jam_ruby/resque/icecast_config_worker_spec.rb
@@ -124,6 +124,7 @@ describe IcecastConfigWriter do
         end
 
         describe "queue_jobs_needing_retry" do
+          pending "failing on build server"
 
           it "finds an unchecked server" do
             server.touch