diff --git a/Remotely_ScreenCast/Program.cs b/Remotely_ScreenCast/Program.cs
index 16695292..96b40b07 100644
--- a/Remotely_ScreenCast/Program.cs
+++ b/Remotely_ScreenCast/Program.cs
@@ -20,14 +20,16 @@ namespace Remotely_ScreenCast
 {
 	public class Program
 	{
-        public static ICapturer Capturer { get; set; }
-        public static CaptureMode CaptureMode { get; set; }
+        public static ICapturer Capturer { get; private set; }
+        public static CaptureMode CaptureMode { get; private set; }
         public static bool DisconnectRequested { get; set; }
-        public static string Mode { get; set; }
-        public static string RequesterID { get; set; }
-        public static string HostName { get; set; }
-        public static HubConnection Connection { get; set; }
-        private static OutgoingMessages OutgoingMessages { get; set; }
+        public static bool IsCapturing { get; set; }
+        public static object LockObject { get; } = new object();
+        public static string Mode { get; private set; }
+        public static string RequesterID { get; private set; }
+        public static string HostName { get; private set; }
+        public static HubConnection Connection { get; private set; }
+        public static OutgoingMessages OutgoingMessages { get; private set; }
 
         static void Main(string[] args)
         {
@@ -40,10 +42,8 @@ namespace Remotely_ScreenCast
                 .WithUrl($"http://{HostName}/RCDeviceHub")
                 .Build();
 
-            MessageHandlers.ApplyConnectionHandlers(Connection);
-
             Connection.StartAsync().Wait();
-
+           
             OutgoingMessages = new OutgoingMessages(Connection);
 
             try
@@ -57,37 +57,16 @@ namespace Remotely_ScreenCast
                 CaptureMode = CaptureMode.BitBtl;
             }
 
-
-            OutgoingMessages.SendScreenCount(
-                Screen.AllScreens.ToList().IndexOf(Screen.PrimaryScreen), 
-                Screen.AllScreens.Length, 
-                RequesterID).Wait();
-
             Capturer.ScreenChanged += HandleScreenChanged;
 
-            OutgoingMessages.SendScreenSize(Capturer.CurrentScreenSize.Width, Capturer.CurrentScreenSize.Height).Wait();
+            MessageHandlers.ApplyConnectionHandlers(Connection, OutgoingMessages, Capturer);
 
-            while (!DisconnectRequested)
-            {
-                try
-                {
-                    Capturer.Capture();
-                    var newImage = ImageDiff.GetImageDiff(Capturer.CurrentFrame, Capturer.PreviousFrame, Capturer.CaptureFullscreen);
-                    var img = ImageDiff.EncodeBitmap(newImage);
-                    if (Capturer.CaptureFullscreen)
-                    {
-                        Capturer.CaptureFullscreen = false;
-                    }
-                    if (img?.Length > 0)
-                    {
-                        OutgoingMessages.SendScreenCapture(img).Wait();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Logger.Write($"Outer Error: {ex.Message}{Environment.NewLine}{ex.StackTrace}");
-                }
-            }
+            OutgoingMessages.NotifyRequesterUnattendedReady(RequesterID).Wait();
+        }
+
+        internal static void BeginCapturing()
+        {
+            
         }
 
         private static async void HandleScreenChanged(object sender, Size size)
diff --git a/Remotely_ScreenCast/Sockets/MessageHandlers.cs b/Remotely_ScreenCast/Sockets/MessageHandlers.cs
index 2cb8529e..6b4c71f4 100644
--- a/Remotely_ScreenCast/Sockets/MessageHandlers.cs
+++ b/Remotely_ScreenCast/Sockets/MessageHandlers.cs
@@ -1,16 +1,21 @@
 using Microsoft.AspNetCore.SignalR.Client;
 using Remotely_ScreenCapture.Utilities;
+using Remotely_ScreenCast;
+using Remotely_ScreenCast.Capture;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace Remotely_ScreenCapture.Sockets
 {
     public class MessageHandlers
     {
-        public static void ApplyConnectionHandlers(HubConnection hubConnection)
+        public static void ApplyConnectionHandlers(HubConnection hubConnection, 
+            OutgoingMessages outgoingMessages, 
+            ICapturer capturer)
         {
             hubConnection.Closed += (ex) =>
             {
@@ -19,6 +24,37 @@ namespace Remotely_ScreenCapture.Sockets
                 return Task.CompletedTask;
             };
 
+            hubConnection.On("GetScreenCast", (string viewerID, string requesterName) =>
+            {
+                outgoingMessages.SendScreenCount(
+                   Screen.AllScreens.ToList().IndexOf(Screen.PrimaryScreen),
+                   Screen.AllScreens.Length,
+                   viewerID).Wait();
+
+                outgoingMessages.SendScreenSize(capturer.CurrentScreenSize.Width, capturer.CurrentScreenSize.Height, viewerID).Wait();
+
+                while (!Program.DisconnectRequested)
+                {
+                    try
+                    {
+                        capturer.Capture();
+                        var newImage = ImageDiff.GetImageDiff(capturer.CurrentFrame, capturer.PreviousFrame, capturer.CaptureFullscreen);
+                        var img = ImageDiff.EncodeBitmap(newImage);
+                        if (capturer.CaptureFullscreen)
+                        {
+                            capturer.CaptureFullscreen = false;
+                        }
+                        if (img?.Length > 0)
+                        {
+                            outgoingMessages.SendScreenCapture(img, viewerID).Wait();
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.Write($"Outer Error: {ex.Message}{Environment.NewLine}{ex.StackTrace}");
+                    }
+                }
+            });
         }
     }
 }
diff --git a/Remotely_ScreenCast/Sockets/OutgoingMessages.cs b/Remotely_ScreenCast/Sockets/OutgoingMessages.cs
index 5dcf22b2..7ccf0a57 100644
--- a/Remotely_ScreenCast/Sockets/OutgoingMessages.cs
+++ b/Remotely_ScreenCast/Sockets/OutgoingMessages.cs
@@ -15,19 +15,24 @@ namespace Remotely_ScreenCapture.Sockets
         }
 
         private HubConnection Connection { get; }
-        public async Task SendScreenSize(int width, int height)
+        public async Task SendScreenSize(int width, int height, string viewerID)
         {
-            await Connection.SendAsync("ScreenSize", width, height);
+            await Connection.SendAsync("SendScreenSize", width, height, viewerID);
         }
 
-        public async Task SendScreenCapture(byte[] captureBytes)
+        public async Task SendScreenCapture(byte[] captureBytes, string viewerID)
         {
-            await Connection.SendAsync("ScreenCapture", captureBytes);
+            await Connection.SendAsync("SendScreenCapture", captureBytes, viewerID);
         }
 
-        internal async Task SendScreenCount(int primaryScreenIndex, int screenCount, string requesterID)
+        internal async Task SendScreenCount(int primaryScreenIndex, int screenCount, string viewerID)
         {
-            await Connection.SendAsync("SendScreenCountToBrowser", primaryScreenIndex, screenCount, requesterID);
+            await Connection.SendAsync("SendScreenCountToBrowser", primaryScreenIndex, screenCount, viewerID);
+        }
+
+        public async Task NotifyRequesterUnattendedReady(string requesterID)
+        {
+            await Connection.SendAsync("UnattendedSessionReady", requesterID);
         }
     }
 }
diff --git a/Remotely_Server/Services/RCBrowserSocketHub.cs b/Remotely_Server/Services/RCBrowserSocketHub.cs
index 7f5b3c74..dfc5aebd 100644
--- a/Remotely_Server/Services/RCBrowserSocketHub.cs
+++ b/Remotely_Server/Services/RCBrowserSocketHub.cs
@@ -66,7 +66,7 @@ namespace Remotely_Server.Services
             }
             await RCDeviceHub.Clients.Client(clientID).SendAsync("IceCandidate", candidate, Context.ConnectionId);
         }
-        public async Task SendOfferRequestToDevice(string clientID, string requesterName, string clientType)
+        public async Task SendScreenCastRequestToDevice(string clientID, string requesterName, string clientType)
         {
             if (clientType == "Normal")
             {
@@ -90,7 +90,7 @@ namespace Remotely_Server.Services
             Context.Items["ClientID"] = clientID;
             Context.Items["ClientType"] = clientType;
             Context.Items["RequesterName"] = requesterName;
-            await RCDeviceHub.Clients.Client(clientID).SendAsync("GetOfferRequest", Context.ConnectionId, requesterName);
+            await RCDeviceHub.Clients.Client(clientID).SendAsync("GetScreenCast", Context.ConnectionId, requesterName);
         }
         public async Task SelectScreen(int screenIndex)
         {
diff --git a/Remotely_Server/Services/RCDeviceSocketHub.cs b/Remotely_Server/Services/RCDeviceSocketHub.cs
index 21fa168d..8fe60aa5 100644
--- a/Remotely_Server/Services/RCDeviceSocketHub.cs
+++ b/Remotely_Server/Services/RCDeviceSocketHub.cs
@@ -51,10 +51,29 @@ namespace Remotely_Server.Services
             }
         }
 
-        public async Task SendScreenCountToBrowser(int primaryScreenIndex, int screenCount, string browserHubConnectionID)
+        public async Task SendScreenCountToBrowser(int primaryScreenIndex, int screenCount, string rcBrowserHubConnectionID)
         {
-            await RCBrowserHub.Clients.Client(browserHubConnectionID).SendAsync("ScreenCount", primaryScreenIndex, screenCount);
+            await RCBrowserHub.Clients.Client(rcBrowserHubConnectionID).SendAsync("ScreenCount", primaryScreenIndex, screenCount);
         }
+        public async Task SendScreenSize(int width, int height, string rcBrowserHubConnectionID)
+        {
+            await RCBrowserHub.Clients.Client(rcBrowserHubConnectionID).SendAsync("ScreenSize", width, height);
+        }
+        public async Task SendScreenCapture(byte[] captureBytes, string rcBrowserHubConnectionID)
+        {
+            await RCBrowserHub.Clients.Client(rcBrowserHubConnectionID).SendAsync("ScreenCapture", captureBytes, rcBrowserHubConnectionID);
+        }
+        public async Task NotifyRequesterUnattendedReady(string browserHubConnectionID)
+        {
+            await BrowserHub.Clients.Client(browserHubConnectionID).SendAsync("UnattendedSessionReady", Context.ConnectionId);
+        }
+        public async Task SendConnectionFailedToBrowser(string browserHubConnectionID)
+        {
+            await RCBrowserHub.Clients.Client(browserHubConnectionID).SendAsync("ConnectionFailed");
+        }
+
+
+
         public async Task SendRTCSessionToBrowser(object offer, string browserHubConnectionID)
         {
             await RCBrowserHub.Clients.Client(browserHubConnectionID).SendAsync("RTCSession", offer);
@@ -63,15 +82,7 @@ namespace Remotely_Server.Services
         {
             await RCBrowserHub.Clients.Client(browserHubConnectionID).SendAsync("IceCandidate", candidate);
         }
-        public async Task SendConnectionFailedToBrowser(string browserHubConnectionID)
-        {
-            await RCBrowserHub.Clients.Client(browserHubConnectionID).SendAsync("ConnectionFailed");
-        }
-
-        public async Task NotifyConsoleRequesterUnattendedReady(string browserHubConnectionID)
-        {
-            await BrowserHub.Clients.Client(browserHubConnectionID).SendAsync("UnattendedRTCReady", Context.ConnectionId);
-        }
+        
 
         public async Task NotifyViewerDesktopSwitching(string viewerID)
         {
diff --git a/Remotely_Server/wwwroot/scripts/BrowserSockets.js b/Remotely_Server/wwwroot/scripts/BrowserSockets.js
index 4ddc0f2a..f2f02f90 100644
--- a/Remotely_Server/wwwroot/scripts/BrowserSockets.js
+++ b/Remotely_Server/wwwroot/scripts/BrowserSockets.js
@@ -127,7 +127,7 @@ function applyMessageHandlers(hubConnection) {
     hubConnection.on("ServiceID", (serviceID) => {
         ServiceID = serviceID;
     });
-    hubConnection.on("UnattendedRTCReady", (rcConnectionID) => {
+    hubConnection.on("UnattendedSessionReady", (rcConnectionID) => {
         window.open(`/RemoteControl?clientID=${rcConnectionID}&serviceID=${ServiceID}`, "_blank");
     });
 }
diff --git a/Remotely_Server/wwwroot/scripts/BrowserSockets.js.map b/Remotely_Server/wwwroot/scripts/BrowserSockets.js.map
index c36cb4a2..196f6199 100644
--- a/Remotely_Server/wwwroot/scripts/BrowserSockets.js.map
+++ b/Remotely_Server/wwwroot/scripts/BrowserSockets.js.map
@@ -1 +1 @@
-{"version":3,"file":"BrowserSockets.js","sourceRoot":"","sources":["BrowserSockets.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"BrowserSockets.js","sourceRoot":"","sources":["BrowserSockets.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/BrowserSockets.ts b/Remotely_Server/wwwroot/scripts/BrowserSockets.ts
index e74184f0..013c56de 100644
--- a/Remotely_Server/wwwroot/scripts/BrowserSockets.ts
+++ b/Remotely_Server/wwwroot/scripts/BrowserSockets.ts
@@ -140,7 +140,7 @@ function applyMessageHandlers(hubConnection) {
     hubConnection.on("ServiceID", (serviceID: string) => {
         ServiceID = serviceID;
     });
-    hubConnection.on("UnattendedRTCReady", (rcConnectionID: string) => {
+    hubConnection.on("UnattendedSessionReady", (rcConnectionID: string) => {
         window.open(`/RemoteControl?clientID=${rcConnectionID}&serviceID=${ServiceID}`, "_blank");
     });
 }
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js b/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js
index ea85f34d..7d148479 100644
--- a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js
+++ b/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js
@@ -12,7 +12,7 @@ export class RCBrowserSockets {
             console.error(err.toString());
             console.log("Connection closed.");
         }).then(() => {
-            this.Connection.invoke("GetIceConfiguration");
+            this.SendScreenCastRequestToDevice();
         });
         this.Connection.closedCallbacks.push((ev) => {
             console.log("Connection closed.");
@@ -22,8 +22,8 @@ export class RCBrowserSockets {
         });
     }
     ;
-    SendOfferRequestToDevice() {
-        return this.Connection.invoke("SendOfferRequestToDevice", RemoteControl.ClientID, RemoteControl.RequesterName, RemoteControl.Mode);
+    SendScreenCastRequestToDevice() {
+        return this.Connection.invoke("SendScreenCastRequestToDevice", RemoteControl.ClientID, RemoteControl.RequesterName, RemoteControl.Mode);
     }
     SendIceCandidate(candidate) {
         return this.Connection.invoke("SendIceCandidateToDevice", candidate, RemoteControl.Mode, RemoteControl.ClientID);
@@ -80,7 +80,7 @@ export class RCBrowserSockets {
         hubConnection.on("IceConfiguration", (iceConfiguration) => {
             RemoteControl.BrowserRTC.IceConfiguration = iceConfiguration;
             RemoteControl.BrowserRTC.Init();
-            this.SendOfferRequestToDevice();
+            this.SendScreenCastRequestToDevice();
         });
         hubConnection.on("RTCSession", (description) => {
             UI.ConnectButton.removeAttribute("disabled");
@@ -130,7 +130,7 @@ export class RCBrowserSockets {
             RemoteControl.ClientID = newClientID;
             RemoteControl.BrowserRTC.PeerConnection.close();
             RemoteControl.BrowserRTC.Init();
-            this.SendOfferRequestToDevice();
+            this.SendScreenCastRequestToDevice();
         });
         hubConnection.on("DesktopSwitchFailed", () => {
             UI.ShowMessage("Desktop switch failed.  Please reconnect.");
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js.map b/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js.map
index 6fc7a5b5..f6fd599d 100644
--- a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js.map
+++ b/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js.map
@@ -1 +1 @@
-{"version":3,"file":"RCBrowserSockets.js","sourceRoot":"","sources":["RCBrowserSockets.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"RCBrowserSockets.js","sourceRoot":"","sources":["RCBrowserSockets.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.ts b/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.ts
index a1f173ee..89901b95 100644
--- a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.ts
+++ b/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.ts
@@ -21,7 +21,7 @@ export class RCBrowserSockets {
             console.error(err.toString());
             console.log("Connection closed.");
         }).then(() => {
-            this.Connection.invoke("GetIceConfiguration");
+            this.SendScreenCastRequestToDevice();
         })
         this.Connection.closedCallbacks.push((ev) => {
             console.log("Connection closed.");
@@ -30,8 +30,8 @@ export class RCBrowserSockets {
             UI.ConnectBox.style.removeProperty("display");
         });
     };
-    SendOfferRequestToDevice() {
-        return this.Connection.invoke("SendOfferRequestToDevice", RemoteControl.ClientID, RemoteControl.RequesterName, RemoteControl.Mode);
+    SendScreenCastRequestToDevice() {
+        return this.Connection.invoke("SendScreenCastRequestToDevice", RemoteControl.ClientID, RemoteControl.RequesterName, RemoteControl.Mode);
     }
     SendIceCandidate(candidate: RTCIceCandidate) {
         return this.Connection.invoke("SendIceCandidateToDevice", candidate, RemoteControl.Mode, RemoteControl.ClientID);
@@ -89,7 +89,7 @@ export class RCBrowserSockets {
         hubConnection.on("IceConfiguration", (iceConfiguration: any) => {
             RemoteControl.BrowserRTC.IceConfiguration = iceConfiguration;
             RemoteControl.BrowserRTC.Init();
-            this.SendOfferRequestToDevice();
+            this.SendScreenCastRequestToDevice();
         });
         hubConnection.on("RTCSession", (description: RTCSessionDescription) => {
             UI.ConnectButton.removeAttribute("disabled");
@@ -140,7 +140,7 @@ export class RCBrowserSockets {
             RemoteControl.ClientID = newClientID;
             RemoteControl.BrowserRTC.PeerConnection.close();
             RemoteControl.BrowserRTC.Init();
-            this.SendOfferRequestToDevice();
+            this.SendScreenCastRequestToDevice();
         });
         hubConnection.on("DesktopSwitchFailed", () => {
             UI.ShowMessage("Desktop switch failed.  Please reconnect.");