diff --git a/Remotely_Agent/Remotely_Agent.csproj b/Remotely_Agent/Remotely_Agent.csproj
index 029f8c26..a632906c 100644
--- a/Remotely_Agent/Remotely_Agent.csproj
+++ b/Remotely_Agent/Remotely_Agent.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Copyright>Copyright ©  2018 Translucency Software</Copyright>
+    <Copyright>Copyright ©  2019 Translucency Software</Copyright>
     <Description>Background service that maintains a connection to the DoXM server.  The service is used for remote support and maintenance by this computer's administrators.</Description>
     <PackageLicenseUrl>https://doxm.app/EULA</PackageLicenseUrl>
     <Authors>Jared Goodwin</Authors>
diff --git a/Remotely_Agent/Resources/Remotely_ScreenCapture.exe b/Remotely_Agent/Resources/Remotely_ScreenCapture.exe
index 6b775bdc..8519b93f 100644
Binary files a/Remotely_Agent/Resources/Remotely_ScreenCapture.exe and b/Remotely_Agent/Resources/Remotely_ScreenCapture.exe differ
diff --git a/Remotely_Agent/Services/Bash.cs b/Remotely_Agent/Services/Bash.cs
index 80231357..ecfb852d 100644
--- a/Remotely_Agent/Services/Bash.cs
+++ b/Remotely_Agent/Services/Bash.cs
@@ -127,7 +127,7 @@ namespace Remotely_Agent.Services
             var partialResult =  new GenericCommandResult()
             {
                 CommandContextID = LastInputID,
-                MachineID = Utilities.GetConnectionInfo().MachineID,
+                DeviceID = Utilities.GetConnectionInfo().DeviceID,
                 CommandType = "Bash",
                 StandardOutput = StandardOut,
                 ErrorOutput = "WARNING: The command execution froze and was forced to return before finishing.  " +
@@ -143,7 +143,7 @@ namespace Remotely_Agent.Services
             return new GenericCommandResult()
             {
                 CommandContextID = LastInputID,
-                MachineID = Utilities.GetConnectionInfo().MachineID,
+                DeviceID = Utilities.GetConnectionInfo().DeviceID,
                 CommandType = "Bash",
                 StandardOutput = StandardOut,
                 ErrorOutput = ErrorOut
diff --git a/Remotely_Agent/Services/CMD.cs b/Remotely_Agent/Services/CMD.cs
index 70eb0b56..76783b05 100644
--- a/Remotely_Agent/Services/CMD.cs
+++ b/Remotely_Agent/Services/CMD.cs
@@ -128,7 +128,7 @@ namespace Remotely_Agent.Services
             var partialResult = new GenericCommandResult()
             {
                 CommandContextID = LastInputID,
-                MachineID = Utilities.GetConnectionInfo().MachineID,
+                DeviceID = Utilities.GetConnectionInfo().DeviceID,
                 CommandType = "CMD",
                 StandardOutput = StandardOut,
                 ErrorOutput = "WARNING: The command execution froze and was forced to return before finishing.  " +
@@ -144,7 +144,7 @@ namespace Remotely_Agent.Services
             return new GenericCommandResult()
             {
                 CommandContextID = LastInputID,
-                MachineID = Utilities.GetConnectionInfo().MachineID,
+                DeviceID = Utilities.GetConnectionInfo().DeviceID,
                 CommandType = "CMD",
                 StandardOutput = StandardOut,
                 ErrorOutput = ErrorOut
diff --git a/Remotely_Agent/Services/ClientSocket.cs b/Remotely_Agent/Services/ClientSocket.cs
index 4e3755ef..b6fe3868 100644
--- a/Remotely_Agent/Services/ClientSocket.cs
+++ b/Remotely_Agent/Services/ClientSocket.cs
@@ -39,9 +39,9 @@ namespace Remotely_Agent.Services
 
             await HubConnection.StartAsync();
 
-            var machine = Machine.Create(ConnectionInfo);
+            var device = Device.Create(ConnectionInfo);
 
-            await HubConnection.InvokeAsync("MachineCameOnline", machine);
+            await HubConnection.InvokeAsync("DeviceCameOnline", device);
 
             if (string.IsNullOrWhiteSpace(ConnectionInfo.ServerVerificationToken))
             {
@@ -67,8 +67,8 @@ namespace Remotely_Agent.Services
 
         public static void SendHeartbeat()
         {
-            var currentInfo = Machine.Create(ConnectionInfo);
-            HubConnection.InvokeAsync("MachineHeartbeat", currentInfo);
+            var currentInfo = Device.Create(ConnectionInfo);
+            HubConnection.InvokeAsync("DeviceHeartbeat", currentInfo);
         }
 
         private static async Task ExecuteCommand(string mode, string command, string commandID, string senderConnectionID)
@@ -153,7 +153,7 @@ namespace Remotely_Agent.Services
             catch (Exception ex)
             {
                 Logger.Write(ex);
-                await HubConnection.InvokeAsync("DisplayConsoleMessage", $"There was an error executing the command.  It has been logged on the client machine.", senderConnectionID);
+                await HubConnection.InvokeAsync("DisplayConsoleMessage", $"There was an error executing the command.  It has been logged on the client device.", senderConnectionID);
             }
         }
 
@@ -305,7 +305,7 @@ namespace Remotely_Agent.Services
                             var result = Win32Interop.OpenInteractiveProcess(filePath + $" -mode unattended -requester {requesterID} -serviceid {serviceID} -hostname {Utilities.GetConnectionInfo().Host.Split("//").Last()}", "default", true, out procInfo);
                             if (!result)
                             {
-                                await hubConnection.InvokeAsync("DisplayConsoleMessage", "Remote control failed to download or start on target machine.", requesterID);
+                                await hubConnection.InvokeAsync("DisplayConsoleMessage", "Remote control failed to start on target device.", requesterID);
                             }
                         }
 
@@ -320,7 +320,7 @@ namespace Remotely_Agent.Services
                 }
                 catch
                 {
-                    await hubConnection.InvokeAsync("DisplayConsoleMessage", "Remote control failed to download or start on target machine.", requesterID);
+                    await hubConnection.InvokeAsync("DisplayConsoleMessage", "Remote control failed to start on target device.", requesterID);
                     throw;
                 }
             });
diff --git a/Remotely_Agent/Services/PSCore.cs b/Remotely_Agent/Services/PSCore.cs
index 11459f84..1a598bdd 100644
--- a/Remotely_Agent/Services/PSCore.cs
+++ b/Remotely_Agent/Services/PSCore.cs
@@ -78,7 +78,7 @@ namespace Remotely_Agent.Services
             return new PSCoreCommandResult()
             {
                 CommandContextID = commandID,
-                MachineID = Utilities.GetConnectionInfo().MachineID,
+                DeviceID = Utilities.GetConnectionInfo().DeviceID,
                 DebugOutput = debugOut,
                 ErrorOutput = errorOut,
                 VerboseOutput = verboseOut,
diff --git a/Remotely_Agent/Services/Updater.cs b/Remotely_Agent/Services/Updater.cs
index 3a514707..7ee24ff6 100644
--- a/Remotely_Agent/Services/Updater.cs
+++ b/Remotely_Agent/Services/Updater.cs
@@ -54,7 +54,7 @@ namespace Remotely_Agent.Services
 
                 var wc = new WebClient();
                 var latestVersion = wc.DownloadString(Utilities.GetConnectionInfo().Host + $"/API/CoreVersion/{platform}");
-                var thisVersion = FileVersionInfo.GetVersionInfo("Remote_Agent.dll").FileVersion.ToString();
+                var thisVersion = FileVersionInfo.GetVersionInfo("Remotely_Agent.dll").FileVersion.ToString();
                 if (thisVersion != latestVersion)
                 {
                     Logger.Write($"Service Updater: Downloading update.  Current Version: {thisVersion}.  Latest Version: {latestVersion}.");
diff --git a/Remotely_Agent/Services/WindowsPS.cs b/Remotely_Agent/Services/WindowsPS.cs
index 8dd46807..10c481b6 100644
--- a/Remotely_Agent/Services/WindowsPS.cs
+++ b/Remotely_Agent/Services/WindowsPS.cs
@@ -125,7 +125,7 @@ namespace Remotely_Agent.Services
             var partialResult = new GenericCommandResult()
             {
                 CommandContextID = LastInputID,
-                MachineID = Utilities.GetConnectionInfo().MachineID,
+                DeviceID = Utilities.GetConnectionInfo().DeviceID,
                 CommandType = "WinPS",
                 StandardOutput = StandardOut,
                 ErrorOutput = "WARNING: The command execution froze and was forced to return before finishing.  " +
@@ -141,7 +141,7 @@ namespace Remotely_Agent.Services
             return new GenericCommandResult()
             {
                 CommandContextID = LastInputID,
-                MachineID = Utilities.GetConnectionInfo().MachineID,
+                DeviceID = Utilities.GetConnectionInfo().DeviceID,
                 CommandType = "WinPS",
                 StandardOutput = StandardOut,
                 ErrorOutput = ErrorOut
diff --git a/Remotely_Library/Models/CommandContext.cs b/Remotely_Library/Models/CommandContext.cs
index c54de771..311b42ca 100644
--- a/Remotely_Library/Models/CommandContext.cs
+++ b/Remotely_Library/Models/CommandContext.cs
@@ -14,12 +14,12 @@ namespace Remotely_Library.Models
         public string CommandText { get; set; }
         public string SenderUserID { get; set; }
         public string SenderConnectionID { get; set; }
-        public string[] TargetMachineIDs { get; set; }
+        public string[] TargetDeviceIDs { get; set; }
         public List<PSCoreCommandResult> PSCoreResults { get; set; } = new List<PSCoreCommandResult>();
         public List<GenericCommandResult> CommandResults { get; set; } = new List<GenericCommandResult>();
         public DateTime TimeStamp { get; set; } = DateTime.Now;
         [IgnoreDataMember]
-        public Organization Organization { get; set; }
+        public virtual Organization Organization { get; set; }
         public string OrganizationID { get; set; }
     }
 }
diff --git a/Remotely_Library/Models/CommandContext.cs.d.ts b/Remotely_Library/Models/CommandContext.cs.d.ts
index 8e8aa30c..12ea1458 100644
--- a/Remotely_Library/Models/CommandContext.cs.d.ts
+++ b/Remotely_Library/Models/CommandContext.cs.d.ts
@@ -4,7 +4,7 @@
 		CommandText: string;
 		SenderUserID: string;
 		SenderConnectionID: string;
-		TargetMachineIDs: string[];
+		TargetDeviceIDs: string[];
 		PSCoreResults: any[];
 		CommandResults: any[];
 		TimeStamp: Date;
diff --git a/Remotely_Library/Models/ConnectionInfo.cs b/Remotely_Library/Models/ConnectionInfo.cs
index 3d075391..c04f7d5b 100644
--- a/Remotely_Library/Models/ConnectionInfo.cs
+++ b/Remotely_Library/Models/ConnectionInfo.cs
@@ -6,7 +6,7 @@ namespace Remotely_Library.Models
 {
     public class ConnectionInfo
     {
-        public string MachineID { get; set; } = Guid.NewGuid().ToString();
+        public string DeviceID { get; set; } = Guid.NewGuid().ToString();
         private string host;
         public string Host
         {
diff --git a/Remotely_Library/Models/Machine.cs b/Remotely_Library/Models/Device.cs
similarity index 90%
rename from Remotely_Library/Models/Machine.cs
rename to Remotely_Library/Models/Device.cs
index 3854520d..5759eb1c 100644
--- a/Remotely_Library/Models/Machine.cs
+++ b/Remotely_Library/Models/Device.cs
@@ -11,7 +11,7 @@ using System.Runtime.InteropServices;
 
 namespace Remotely_Library.Models
 {
-    public class Machine
+    public class Device
     {
         public string CurrentUser { get; set; }
         public virtual List<Drive> Drives { get; set; }
@@ -29,7 +29,7 @@ namespace Remotely_Library.Models
 
         public DateTime LastOnline { get; set; }
 
-        public string MachineName { get; set; }
+        public string DeviceName { get; set; }
 
         public virtual Organization Organization { get; set; }
         public string OrganizationID { get; set; }
@@ -37,7 +37,7 @@ namespace Remotely_Library.Models
 
         public string OSDescription { get; set; }
 
-        public List<PermissionGroup> PermissionGroups { get; set; } = new List<PermissionGroup>();
+        public virtual List<PermissionGroup> PermissionGroups { get; set; } = new List<PermissionGroup>();
         public string Platform { get; set; }
 
         public int ProcessorCount { get; set; }
@@ -47,7 +47,7 @@ namespace Remotely_Library.Models
 
         public double TotalMemory { get; set; }
         public double TotalStorage { get; set; }
-        public static Machine Create(ConnectionInfo connectionInfo)
+        public static Device Create(ConnectionInfo connectionInfo)
         {
             OSPlatform platform = OSUtils.GetPlatform();
             DriveInfo systemDrive;
@@ -67,10 +67,10 @@ namespace Remotely_Library.Models
                     x.RootDirectory.FullName == Path.GetPathRoot(Environment.CurrentDirectory));
             }
 
-            var machine = new Machine()
+            var device = new Device()
             {
-                ID = connectionInfo.MachineID,
-                MachineName = Environment.MachineName,
+                ID = connectionInfo.DeviceID,
+                DeviceName = Environment.MachineName,
                 Platform = platform.ToString(),
                 ProcessorCount = Environment.ProcessorCount,
                 OSArchitecture = RuntimeInformation.OSArchitecture,
@@ -92,9 +92,9 @@ namespace Remotely_Library.Models
 
             if (systemDrive != null && systemDrive.TotalSize > 0 && systemDrive.TotalFreeSpace > 0)
             {
-                machine.TotalStorage = Math.Round((double)(systemDrive.TotalSize / 1024 / 1024 / 1024), 2);
+                device.TotalStorage = Math.Round((double)(systemDrive.TotalSize / 1024 / 1024 / 1024), 2);
                 var freeStorage = Math.Round((double)(systemDrive.TotalFreeSpace / 1024 / 1024 / 1024), 2);
-                machine.FreeStorage = freeStorage / machine.TotalStorage;
+                device.FreeStorage = freeStorage / device.TotalStorage;
             }
 
             Tuple<double, double> totalMemory = new Tuple<double, double>(0, 0);
@@ -110,15 +110,15 @@ namespace Remotely_Library.Models
           
             if (totalMemory.Item2 > 0)
             {
-                machine.FreeMemory = totalMemory.Item1 / totalMemory.Item2;
+                device.FreeMemory = totalMemory.Item1 / totalMemory.Item2;
             }
             else
             {
-                machine.FreeMemory = 0;
+                device.FreeMemory = 0;
             }
-            machine.TotalMemory = totalMemory.Item2;
+            device.TotalMemory = totalMemory.Item2;
 
-            return machine;
+            return device;
         }
 
 
diff --git a/Remotely_Library/Models/Drive.cs b/Remotely_Library/Models/Drive.cs
index 482d92c2..e5be3586 100644
--- a/Remotely_Library/Models/Drive.cs
+++ b/Remotely_Library/Models/Drive.cs
@@ -17,6 +17,6 @@ namespace Remotely_Library.Models
         public double FreeSpace { get; internal set; }
         public double TotalSize { get; internal set; }
         public string VolumeLabel { get; internal set; }
-        public string MachineID { get; set; }
+        public string DeviceID { get; set; }
     }
 }
diff --git a/Remotely_Library/Models/EventLog.cs b/Remotely_Library/Models/EventLog.cs
index 728a243e..46a8dc6a 100644
--- a/Remotely_Library/Models/EventLog.cs
+++ b/Remotely_Library/Models/EventLog.cs
@@ -17,7 +17,7 @@ namespace Remotely_Library.Models
         public string OrganizationID { get; set; }
         public DateTime TimeStamp { get; set; } = DateTime.Now;
         [JsonIgnore]
-        public Organization Organization { get; set; }
+        public virtual Organization Organization { get; set; }
     }
     public enum EventTypes
     {
diff --git a/Remotely_Library/Models/GenericCommandResult.cs b/Remotely_Library/Models/GenericCommandResult.cs
index 066d0950..c5199b7d 100644
--- a/Remotely_Library/Models/GenericCommandResult.cs
+++ b/Remotely_Library/Models/GenericCommandResult.cs
@@ -6,7 +6,7 @@ namespace Remotely_Library.Models
 {
     public class GenericCommandResult
     {
-        public string MachineID { get; set; }
+        public string DeviceID { get; set; }
         public string CommandContextID { get; set; }
         public string CommandType { get; set; }
         public string StandardOutput { get; set; }
diff --git a/Remotely_Library/Models/GenericCommandResult.cs.d.ts b/Remotely_Library/Models/GenericCommandResult.cs.d.ts
index 82cff77a..d2d900d5 100644
--- a/Remotely_Library/Models/GenericCommandResult.cs.d.ts
+++ b/Remotely_Library/Models/GenericCommandResult.cs.d.ts
@@ -1,5 +1,5 @@
 	interface GenericCommandResult {
-		MachineID: string;
+		DeviceID: string;
 		CommandContextID: string;
 		CommandType: string;
 		StandardOutput: string;
diff --git a/Remotely_Library/Models/InviteLink.cs b/Remotely_Library/Models/InviteLink.cs
index fc9e7846..db4d15df 100644
--- a/Remotely_Library/Models/InviteLink.cs
+++ b/Remotely_Library/Models/InviteLink.cs
@@ -12,6 +12,6 @@ namespace Remotely_Library.Models
         public string InvitedUser { get; set; }
         public bool IsAdmin { get; set; }
         public DateTime DateSent { get; set; }
-        public Organization Organization { get; set; }
+        public virtual Organization Organization { get; set; }
     }
 }
diff --git a/Remotely_Library/Models/Machine.cs.d.ts b/Remotely_Library/Models/Machine.cs.d.ts
deleted file mode 100644
index e926b14e..00000000
--- a/Remotely_Library/Models/Machine.cs.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-	interface Machine {
-		Drives: any[];
-		ID: string;
-		Is64Bit: boolean;
-		IsOnline: boolean;
-		LastOnline: Date;
-		MachineName: string;
-		OrganizationID: string;
-		Organization: {
-			ID: string;
-			OrganizationName: string;
-			RemotelyUsers: any[];
-			Machines: server.Machine[];
-			CommandContexts: any[];
-			EventLogs: any[];
-			PermissionGroups: any[];
-			InviteLinks: any[];
-			SharedFiles: any[];
-		};
-		OSArchitecture: any;
-		OSDescription: string;
-		Platform: string;
-		ProcessorCount: number;
-		TotalMemory: number;
-		FreeStorage: number;
-		TotalStorage: number;
-		FreeMemory: number;
-		CurrentUser: string;
-		PermissionGroups: any[];
-		Tags: string;
-		ServerVerificationToken: string;
-	}
diff --git a/Remotely_Library/Models/Organization.cs b/Remotely_Library/Models/Organization.cs
index dabc462d..1013be02 100644
--- a/Remotely_Library/Models/Organization.cs
+++ b/Remotely_Library/Models/Organization.cs
@@ -12,12 +12,12 @@ namespace Remotely_Library.Models
 
         [StringLength(25)]
         public string OrganizationName { get; set; }
-        public List<RemotelyUser> RemotelyUsers { get; set; }
-        public List<Machine> Machines { get; set; }
-        public List<CommandContext> CommandContexts { get; set; }
-        public List<EventLog> EventLogs { get; set; }
-        public List<PermissionGroup> PermissionGroups { get; set; } = new List<PermissionGroup>();
-        public List<InviteLink> InviteLinks { get; set; }
-        public List<SharedFile> SharedFiles { get; set; }
+        public virtual List<RemotelyUser> RemotelyUsers { get; set; }
+        public virtual List<Device> Devices { get; set; }
+        public virtual List<CommandContext> CommandContexts { get; set; }
+        public virtual List<EventLog> EventLogs { get; set; }
+        public virtual List<PermissionGroup> PermissionGroups { get; set; } = new List<PermissionGroup>();
+        public virtual List<InviteLink> InviteLinks { get; set; }
+        public virtual List<SharedFile> SharedFiles { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Remotely_Library/Models/PSCoreCommandResult.cs b/Remotely_Library/Models/PSCoreCommandResult.cs
index d89166a2..a6dffea1 100644
--- a/Remotely_Library/Models/PSCoreCommandResult.cs
+++ b/Remotely_Library/Models/PSCoreCommandResult.cs
@@ -8,7 +8,7 @@ namespace Remotely_Library.Models
     public class PSCoreCommandResult
     {
         public string CommandContextID { get; set; }
-        public string MachineID { get; set; }
+        public string DeviceID { get; set; }
         public List<string> VerboseOutput { get; set; }
         public List<string> DebugOutput { get; set; }
         public List<string> ErrorOutput { get; set; }
diff --git a/Remotely_Library/Models/PSCoreCommandResult.cs.d.ts b/Remotely_Library/Models/PSCoreCommandResult.cs.d.ts
index 577f72b5..7e4f17f5 100644
--- a/Remotely_Library/Models/PSCoreCommandResult.cs.d.ts
+++ b/Remotely_Library/Models/PSCoreCommandResult.cs.d.ts
@@ -1,6 +1,6 @@
 	interface PSCoreCommandResult {
 		CommandContextID: string;
-		MachineID: string;
+		DeviceID: string;
 		VerboseOutput: string[];
 		DebugOutput: string[];
 		ErrorOutput: string[];
diff --git a/Remotely_Library/Models/PermissionGroup.cs b/Remotely_Library/Models/PermissionGroup.cs
index d2d8dd03..73b247cd 100644
--- a/Remotely_Library/Models/PermissionGroup.cs
+++ b/Remotely_Library/Models/PermissionGroup.cs
@@ -12,6 +12,8 @@ namespace Remotely_Library.Models
         public string ID { get; set; } = Guid.NewGuid().ToString();
         [StringLength(100)]
         public string Name { get; set; }
-        public Organization Organization { get; set; }
-    }
+        public virtual Organization Organization { get; set; }
+		public virtual List<Device> Devices { get; set; }
+		public virtual List<RemotelyUser> RemotelyUsers { get; set; }
+	}
 }
diff --git a/Remotely_Library/Models/RemotelyUser.cs b/Remotely_Library/Models/RemotelyUser.cs
index 99c19047..692ace54 100644
--- a/Remotely_Library/Models/RemotelyUser.cs
+++ b/Remotely_Library/Models/RemotelyUser.cs
@@ -14,12 +14,12 @@ namespace Remotely_Library.Models
             UserOptions = new RemotelyUserOptions();
             Organization = new Organization();
         }
-        public RemotelyUserOptions UserOptions { get; set; }
+        public virtual RemotelyUserOptions UserOptions { get; set; }
 
-        public Organization Organization { get; set; }
+        public virtual Organization Organization { get; set; }
         public string OrganizationID { get; set; }
 
-        public List<PermissionGroup> PermissionGroups { get; set; } = new List<PermissionGroup>();
+        public virtual List<PermissionGroup> PermissionGroups { get; set; } = new List<PermissionGroup>();
 
         public bool IsAdministrator { get; set; } = true;
     }
diff --git a/Remotely_Library/Models/SharedFile.cs b/Remotely_Library/Models/SharedFile.cs
index a2e75262..557dd65e 100644
--- a/Remotely_Library/Models/SharedFile.cs
+++ b/Remotely_Library/Models/SharedFile.cs
@@ -13,6 +13,6 @@ namespace Remotely_Library.Models
         public string ContentType { get; set; }
         public byte[] FileContents { get; set; }
         public DateTime Timestamp { get; set; } = DateTime.Now;
-        public Organization Organization { get; set; }
+        public virtual Organization Organization { get; set; }
     }
 }
diff --git a/Remotely_Library/Remotely_Library.csproj b/Remotely_Library/Remotely_Library.csproj
index c9e2deac..667a2962 100644
--- a/Remotely_Library/Remotely_Library.csproj
+++ b/Remotely_Library/Remotely_Library.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="Models\Machine.d.ts">
-      <DependentUpon>Machine.cs</DependentUpon>
+    <None Include="Models\Device.d.ts">
+      <DependentUpon>Device.cs</DependentUpon>
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
     </None>
@@ -39,7 +39,7 @@
       <LastGenOutput>GenericCommandResult.cs.d.ts</LastGenOutput>
       <Generator>DtsGenerator</Generator>
     </Compile>
-    <Compile Update="Models\Machine.cs">
+    <Compile Update="Models\Device.cs">
       <LastGenOutput>Machine.cs.d.ts</LastGenOutput>
       <Generator>DtsGenerator</Generator>
     </Compile>
diff --git a/Remotely_ScreenCast/Capture/BitBltCapture.cs b/Remotely_ScreenCast/Capture/BitBltCapture.cs
index 53597fb5..395c1f57 100644
--- a/Remotely_ScreenCast/Capture/BitBltCapture.cs
+++ b/Remotely_ScreenCast/Capture/BitBltCapture.cs
@@ -73,20 +73,6 @@ namespace Remotely_ScreenCast.Capture
 			desktopName = Win32Interop.GetCurrentDesktop();
         }
 
-        public async void BeginCapturing(string participantID)
-        {
-            CursorIconWatcher.Current.OnChange += CursorIcon_OnChange;
-            while (IsCapturing)
-            {
-                Capture();
-
-        
-                await Task.Delay(PauseForMilliseconds);
-                PauseForMilliseconds = 1;
-            }
-            CursorIconWatcher.Current.OnChange -= CursorIcon_OnChange;
-        }
-
         private void CursorIcon_OnChange(object sender, int e)
         {
             //AditClient.SocketMessageHandler.SendIconUpdate(e);
diff --git a/Remotely_ScreenCast/Capture/DXCapture.cs b/Remotely_ScreenCast/Capture/DXCapture.cs
index b5107408..5b29d725 100644
--- a/Remotely_ScreenCast/Capture/DXCapture.cs
+++ b/Remotely_ScreenCast/Capture/DXCapture.cs
@@ -19,10 +19,6 @@ namespace Remotely_ScreenCast.Capture
 {
     public class DXCapture : ICapturer
     {
-		public DXCapture()
-		{
-			Init();
-		}
         public Bitmap PreviousFrame { get; set; }
         public Bitmap CurrentFrame { get; set; }
         public Size CurrentScreenSize
@@ -64,7 +60,7 @@ namespace Remotely_ScreenCast.Capture
                 NeedsInit = true;
             }
         }
-        public bool NeedsInit { get; set; }
+        public bool NeedsInit { get; set; } = true;
 
         private string desktopName;
 		private Factory1 factory;
@@ -102,7 +98,10 @@ namespace Remotely_ScreenCast.Capture
 			var newHeight = output.Description.DesktopBounds.Bottom - output.Description.DesktopBounds.Top;
             if (newWidth != width || newHeight != height)
             {
-                ScreenChanged(this, new Size(newWidth, newHeight));
+                if (ScreenChanged != null)
+                {
+                    ScreenChanged(this, new Size(newWidth, newHeight));
+                }
             }
             width = newWidth;
             height = newHeight;
diff --git a/Remotely_ScreenCast/Program.cs b/Remotely_ScreenCast/Program.cs
index 9ba7bfd8..925929bf 100644
--- a/Remotely_ScreenCast/Program.cs
+++ b/Remotely_ScreenCast/Program.cs
@@ -34,6 +34,7 @@ namespace Remotely_ScreenCast
 
         static void Main(string[] args)
         {
+            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
             var argDict = ProcessArgs(args);
             Mode = argDict["mode"];
             RequesterID = argDict["requester"];
@@ -52,8 +53,9 @@ namespace Remotely_ScreenCast
                 Capturer = new DXCapture();
                 CaptureMode = CaptureMode.DirectX;
             }
-            catch
+            catch (Exception ex)
             {
+                Logger.Write(ex);
                 Capturer = new BitBltCapture();
                 CaptureMode = CaptureMode.BitBtl;
             }
@@ -63,11 +65,13 @@ namespace Remotely_ScreenCast
             MessageHandlers.ApplyConnectionHandlers(Connection, OutgoingMessages, Capturer);
 
             OutgoingMessages.NotifyRequesterUnattendedReady(RequesterID).Wait();
+
+            Console.ReadKey();
         }
 
-        internal static void BeginCapturing()
+        private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
-            
+            Logger.Write((Exception)e.ExceptionObject);
         }
 
         private static async void HandleScreenChanged(object sender, Size size)
diff --git a/Remotely_ScreenCast/Sockets/MessageHandlers.cs b/Remotely_ScreenCast/Sockets/MessageHandlers.cs
index 3647afc8..782f8fe2 100644
--- a/Remotely_ScreenCast/Sockets/MessageHandlers.cs
+++ b/Remotely_ScreenCast/Sockets/MessageHandlers.cs
@@ -14,8 +14,8 @@ namespace Remotely_ScreenCapture.Sockets
     public class MessageHandlers
     {
         public static void ApplyConnectionHandlers(HubConnection hubConnection, 
-            OutgoingMessages outgoingMessages, 
-            ICapturer capturer)
+                                                    OutgoingMessages outgoingMessages, 
+                                                    ICapturer capturer)
         {
             hubConnection.Closed += (ex) =>
             {
diff --git a/Remotely_ScreenCast/Sockets/OutgoingMessages.cs b/Remotely_ScreenCast/Sockets/OutgoingMessages.cs
index 7ccf0a57..09aa1add 100644
--- a/Remotely_ScreenCast/Sockets/OutgoingMessages.cs
+++ b/Remotely_ScreenCast/Sockets/OutgoingMessages.cs
@@ -32,7 +32,7 @@ namespace Remotely_ScreenCapture.Sockets
 
         public async Task NotifyRequesterUnattendedReady(string requesterID)
         {
-            await Connection.SendAsync("UnattendedSessionReady", requesterID);
+            await Connection.SendAsync("NotifyRequesterUnattendedReady", requesterID);
         }
     }
 }
diff --git a/Remotely_Server/API/CommandsController.cs b/Remotely_Server/API/CommandsController.cs
index 49ca86b7..854f4d67 100644
--- a/Remotely_Server/API/CommandsController.cs
+++ b/Remotely_Server/API/CommandsController.cs
@@ -81,11 +81,11 @@ namespace Remotely_Server.API
         }
 
         // GET api/<controller>/5
-        [HttpGet("PSCoreResult/{commandID}/{machineID}")]
+        [HttpGet("PSCoreResult/{commandID}/{deviceID}")]
         [Authorize]
-        public PSCoreCommandResult PSCoreResult(string commandID, string machineID)
+        public PSCoreCommandResult PSCoreResult(string commandID, string deviceID)
         {
-            return DataService.GetCommandContext(commandID, User.Identity.Name).PSCoreResults.Find(x => x.MachineID == machineID);
+            return DataService.GetCommandContext(commandID, User.Identity.Name).PSCoreResults.Find(x => x.DeviceID == deviceID);
         }
 
         // POST api/<controller>
diff --git a/Remotely_Server/API/MachinesController.cs b/Remotely_Server/API/DevicesController.cs
similarity index 71%
rename from Remotely_Server/API/MachinesController.cs
rename to Remotely_Server/API/DevicesController.cs
index a44d71c4..7a2c19aa 100644
--- a/Remotely_Server/API/MachinesController.cs
+++ b/Remotely_Server/API/DevicesController.cs
@@ -15,10 +15,10 @@ namespace Remotely_Server.API
     [Authorize]
     [ApiController]
     [Route("api/[controller]")]
-    public class MachinesController : Controller
+    public class DevicesController : Controller
     {
    
-        public MachinesController(DataService dataService, UserManager<RemotelyUser> userManager)
+        public DevicesController(DataService dataService, UserManager<RemotelyUser> userManager)
         {
             this.DataService = dataService;
             this.UserManager = userManager;
@@ -28,19 +28,19 @@ namespace Remotely_Server.API
 
         // GET: api/<controller>
         [HttpGet]
-        public async Task<IEnumerable<Machine>> Get()
+        public async Task<IEnumerable<Device>> Get()
         {
             var user = await UserManager.GetUserAsync(User);
-            var machines = DataService.GetAllMachines(user.Id);
-            return machines;
+            var devices = DataService.GetAllDevicesForUser(user.Id);
+            return devices;
         }
 
         // GET api/<controller>/5
         [HttpGet("{id}")]
-        public async Task<Machine> Get(string id)
+        public async Task<Device> Get(string id)
         {
             var user = await UserManager.GetUserAsync(User);
-            return DataService.GetMachine(user.Id, id);
+            return DataService.GetDeviceForUser(user.Id, id);
         }
     }
 }
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml b/Remotely_Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml
index 605de843..c636d161 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml
+++ b/Remotely_Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml
@@ -4,8 +4,8 @@
     ViewData["Title"] = "Forgot your password?";
 }
 
-<h2>@ViewData["Title"]</h2>
-<h4>Enter your email.</h4>
+<h3>@ViewData["Title"]</h3>
+<h5>Enter your email.</h5>
 <hr />
 <div class="row">
     <div class="col-md-4">
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Login.cshtml b/Remotely_Server/Areas/Identity/Pages/Account/Login.cshtml
index c91c9b4a..8165defa 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Login.cshtml
+++ b/Remotely_Server/Areas/Identity/Pages/Account/Login.cshtml
@@ -6,12 +6,12 @@
     ViewData["Title"] = "Log in";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Title"]</h3>
 <div class="row">
     <div class="col-md-4">
         <section>
             <form method="post">
-                <h4>Use your Remotely account to log in.</h4>
+                <h5>Use your Remotely account to log in.</h5>
                 <hr />
                 <div asp-validation-summary="All" class="text-danger"></div>
                 <div class="form-group">
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/Options.cshtml b/Remotely_Server/Areas/Identity/Pages/Account/Manage/Options.cshtml
index 52ed31b3..c2450243 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Manage/Options.cshtml
+++ b/Remotely_Server/Areas/Identity/Pages/Account/Manage/Options.cshtml
@@ -78,8 +78,8 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h5 class="modal-title">Command Mode Shortcuts</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
             </div>
             <div class="modal-body">
                 <p>
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/_Layout.cshtml b/Remotely_Server/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
index 2f73a69b..04a22697 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
+++ b/Remotely_Server/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
@@ -3,10 +3,10 @@
     Layout = "/Pages/Shared/_Layout.cshtml";
 }
 
-<h2>Manage your account</h2>
+<h3>Manage your account</h3>
 
 <div>
-    <h4>Change your account settings</h4>
+    <h5>Change your account settings</h5>
     <hr />
     <div class="row">
         <div class="col-md-3">
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Register.cshtml b/Remotely_Server/Areas/Identity/Pages/Account/Register.cshtml
index 08b9f5bf..781f8fb5 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Register.cshtml
+++ b/Remotely_Server/Areas/Identity/Pages/Account/Register.cshtml
@@ -5,14 +5,14 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h3>@ViewData["Title"]</h3>
 
 <div class="row">
     @if (AppConfig.AllowSelfRegistration)
     {
         <div class="col-md-4">
             <form asp-route-returnUrl="@Model.ReturnUrl" method="post">
-                <h4>Create a new account.</h4>
+                <h5>Create a new account.</h5>
                 <hr />
                 <div asp-validation-summary="All" class="text-danger"></div>
                 <div class="form-group">
@@ -37,7 +37,7 @@
     else
     {
         <div class="col-sm-12">
-            <h4>Self-registration is disabled.</h4>
+            <h5>Self-registration is disabled.</h5>
 
         </div>
     }
diff --git a/Remotely_Server/Data/ApplicationDbContext.cs b/Remotely_Server/Data/ApplicationDbContext.cs
index 506d7701..e74a868d 100644
--- a/Remotely_Server/Data/ApplicationDbContext.cs
+++ b/Remotely_Server/Data/ApplicationDbContext.cs
@@ -20,7 +20,7 @@ namespace Remotely_Server.Data
 
         public DbSet<Drive> Drives { get; set; }
 
-        public DbSet<Machine> Machines { get; set; }
+        public DbSet<Device> Devices { get; set; }
 
         public DbSet<Organization> Organizations { get; set; }
 
@@ -34,7 +34,7 @@ namespace Remotely_Server.Data
 
         public DbSet<PermissionGroup> PermissionGroups { get; set; }
 
-        protected override void OnModelCreating(ModelBuilder builder)
+		protected override void OnModelCreating(ModelBuilder builder)
         {
             base.OnModelCreating(builder);
             
@@ -42,7 +42,7 @@ namespace Remotely_Server.Data
             builder.Entity<RemotelyUser>().ToTable("RemotelyUsers");
 
             builder.Entity<Organization>()
-                .HasMany(x => x.Machines)
+                .HasMany(x => x.Devices)
                 .WithOne(x=>x.Organization);
             builder.Entity<Organization>()
                 .HasMany(x => x.RemotelyUsers)
@@ -65,7 +65,7 @@ namespace Remotely_Server.Data
 
 
             builder.Entity<CommandContext>()
-                .Property(x=>x.TargetMachineIDs)
+                .Property(x=>x.TargetDeviceIDs)
                 .HasConversion(
                     x => JsonConvert.SerializeObject(x),
                     x => JsonConvert.DeserializeObject<string[]>(x));
@@ -80,28 +80,25 @@ namespace Remotely_Server.Data
                     x => JsonConvert.SerializeObject(x),
                     x => JsonConvert.DeserializeObject<List<GenericCommandResult>>(x));
 
-            builder.Entity<RemotelyUser>()
-                .Property(x => x.UserOptions)
-                .HasConversion(
-                    x => JsonConvert.SerializeObject(x),
-                    x => JsonConvert.DeserializeObject<Remotely_Library.Models.RemotelyUserOptions>(x));
-            builder.Entity<RemotelyUser>()
-                .Property(x => x.PermissionGroups)
-                .HasConversion(
-                    x => JsonConvert.SerializeObject(x),
-                    x => JsonConvert.DeserializeObject<List<PermissionGroup>>(x)
-                );
-            builder.Entity<RemotelyUser>()
+
+			builder.Entity<RemotelyUser>()
+				.HasMany(x => x.PermissionGroups);
+
+			builder.Entity<Device>()
+				.HasMany(x => x.PermissionGroups);
+
+			builder.Entity<PermissionGroup>()
+				.HasMany(x => x.RemotelyUsers);
+
+			builder.Entity<PermissionGroup>()
+				.HasMany(x => x.Devices);
+
+			builder.Entity<RemotelyUser>()
                .HasOne(x => x.Organization);
 
-            builder.Entity<Machine>()
+            builder.Entity<Device>()
                 .HasMany(x => x.Drives);
-            builder.Entity<RemotelyUser>()
-               .Property(x => x.PermissionGroups)
-               .HasConversion(
-                   x => JsonConvert.SerializeObject(x),
-                   x => JsonConvert.DeserializeObject<List<PermissionGroup>>(x)
-               );
+
         }
     }
 }
diff --git a/Remotely_Server/Data/DataService.cs b/Remotely_Server/Data/DataService.cs
index 40d601c5..ca686f3a 100644
--- a/Remotely_Server/Data/DataService.cs
+++ b/Remotely_Server/Data/DataService.cs
@@ -46,27 +46,27 @@ namespace Remotely_Server.Data
             RemotelyContext.SaveChanges();
         }
 
-        public bool AddOrUpdateMachine(Machine machine)
+        public bool AddOrUpdateDevice(Device device)
         {
-            var existingMachine = RemotelyContext.Machines.Find(machine.ID);
-            if (existingMachine != null)
+            var existingDevice = RemotelyContext.Devices.Find(device.ID);
+            if (existingDevice != null)
             {
-                machine.ServerVerificationToken = existingMachine.ServerVerificationToken;
-                RemotelyContext.Entry(existingMachine).CurrentValues.SetValues(machine);
+                device.ServerVerificationToken = existingDevice.ServerVerificationToken;
+                RemotelyContext.Entry(existingDevice).CurrentValues.SetValues(device);
             }
             else
             {
-                if (!RemotelyContext.Organizations.Any(x => x.ID == machine.OrganizationID))
+                if (!RemotelyContext.Organizations.Any(x => x.ID == device.OrganizationID))
                 {
                     WriteEvent(new EventLog()
                     {
                         EventType = EventTypes.Info,
-                        Message = $"Unable to add machine {machine.MachineName} because organization {machine.OrganizationID} does not exist.",
-                        Source = "DataService.AddOrUpdateMachine"
+                        Message = $"Unable to add device {device.DeviceName} because organization {device.OrganizationID} does not exist.",
+                        Source = "DataService.AddOrUpdateDevice"
                     });
                     return false;
                 }
-                RemotelyContext.Machines.Add(machine);
+                RemotelyContext.Devices.Add(device);
             }
             RemotelyContext.SaveChanges();
             return true;
@@ -78,7 +78,7 @@ namespace Remotely_Server.Data
                 .Include(x => x.RemotelyUsers)
                 .Include(x => x.CommandContexts)
                 .Include(x => x.InviteLinks)
-                .Include(x => x.Machines)
+                .Include(x => x.Devices)
                 .Include(x => x.SharedFiles)
                 .Include(x => x.PermissionGroups)
                 .Where(x => x.RemotelyUsers.Count == 0);
@@ -99,66 +99,57 @@ namespace Remotely_Server.Data
             return RemotelyContext.Users.Any(x => x.UserName == userName);
         }
 
-        public bool DoesUserHaveAccessToMachine(string machineID, RemotelyUser remotelyUser)
+        public bool DoesUserHaveAccessToDevice(string deviceID, RemotelyUser remotelyUser)
         {
-            return RemotelyContext.Machines.Any(x =>
+            return RemotelyContext.Devices.Any(x =>
                 x.OrganizationID == remotelyUser.OrganizationID &&
                     (
                         x.PermissionGroups.Count == 0 ||
                         x.PermissionGroups.Any(y => remotelyUser.PermissionGroups.Any(z => z.ID == y.ID))
                     ) &&
-                x.ID == machineID);
+                x.ID == deviceID);
         }
 
-        public string[] FilterMachineIDsByUserPermission(string[] machineIDs, RemotelyUser remotelyUser)
+        public string[] FilterDeviceIDsByUserPermission(string[] deviceIDs, RemotelyUser remotelyUser)
         {
-            return RemotelyContext.Machines.Where(x =>
+            return RemotelyContext.Devices.Where(x =>
                     x.OrganizationID == remotelyUser.OrganizationID &&
                     (
                         x.PermissionGroups.Count == 0 ||
                         x.PermissionGroups.Any(y => remotelyUser.PermissionGroups.Any(z => z.ID == y.ID))
                     ) &&
-                    machineIDs.Contains(x.ID))
+                    deviceIDs.Contains(x.ID))
                 .Select(x => x.ID)
                 .ToArray();
         }
 
         public IEnumerable<CommandContext> GetAllCommandContexts(string userName)
         {
-            var orgID = GetUserByName(userName).OrganizationID;
+			var orgID = GetUserByName(userName).OrganizationID;
             return RemotelyContext.CommandContexts.Where(x => x.OrganizationID == orgID);
         }
 
-        public IEnumerable<Machine> GetAllMachines(string userID)
+        public IEnumerable<Device> GetAllDevicesForUser(string userID)
         {
-            var orgID = GetUserByID(userID).OrganizationID;
+			var user = RemotelyContext.Users
+				.Include(x => x.PermissionGroups)
+				.FirstOrDefault(x => x.Id == userID);
 
-            var machines = RemotelyContext.Machines
-                .Include(x => x.Drives)
-                .Where(x => x.OrganizationID == orgID)
-                .Select(x=> new Machine()
-                {
-                    CurrentUser =  x.CurrentUser,
-                    Drives = x.Drives,
-                    FreeMemory = x.FreeMemory,
-                    FreeStorage = x.FreeStorage,
-                    ID = x.ID,
-                    Is64Bit = x.Is64Bit,
-                    IsOnline = x.IsOnline,
-                    LastOnline = x.LastOnline,
-                    MachineName = x.MachineName,
-                    OrganizationID = x.OrganizationID,
-                    OSArchitecture = x.OSArchitecture,
-                    OSDescription = x.OSDescription,
-                    PermissionGroups = x.PermissionGroups,
-                    Platform = x.Platform,
-                    ProcessorCount = x.ProcessorCount,
-                    Tags = x.Tags,
-                    TotalMemory = x.TotalMemory,
-                    TotalStorage = x.TotalStorage
-                });
+			var result = RemotelyContext.Devices
+				.Include(x => x.PermissionGroups)
+				.Include(x => x.Drives)
+                .Where(x => x.OrganizationID == user.OrganizationID);
 
-            return machines;
+			if (user.IsAdministrator)
+			{
+				return result;
+			}
+			else
+			{
+				return result.Where(x =>
+							x.PermissionGroups.Count == 0 ||
+							x.PermissionGroups.Any(y => user.PermissionGroups.Any(z => z.ID == y.ID)));
+			}
         }
 
       
@@ -194,33 +185,27 @@ namespace Remotely_Server.Data
             return AppConfig.DefaultPrompt;
         }
 
-        public Machine GetMachine(string userID, string machineID)
+        public Device GetDeviceForUser(string userID, string deviceID)
         {
-            var orgID = GetUserByID(userID).OrganizationID;
+			var user = RemotelyContext.Users
+				.Include(x => x.PermissionGroups)
+				.FirstOrDefault(x => x.Id == userID);
 
-            return RemotelyContext.Machines
-                .Where(x => x.OrganizationID == orgID && x.ID == machineID)
-                .Select(x => new Machine()
-                {
-                    CurrentUser = x.CurrentUser,
-                    Drives = x.Drives,
-                    FreeMemory = x.FreeMemory,
-                    FreeStorage = x.FreeStorage,
-                    ID = x.ID,
-                    Is64Bit = x.Is64Bit,
-                    IsOnline = x.IsOnline,
-                    LastOnline = x.LastOnline,
-                    MachineName = x.MachineName,
-                    OrganizationID = x.OrganizationID,
-                    OSArchitecture = x.OSArchitecture,
-                    OSDescription = x.OSDescription,
-                    PermissionGroups = x.PermissionGroups,
-                    Platform = x.Platform,
-                    ProcessorCount = x.ProcessorCount,
-                    Tags = x.Tags,
-                    TotalMemory = x.TotalMemory,
-                    TotalStorage = x.TotalStorage
-                }).FirstOrDefault();
+			var result = RemotelyContext.Devices
+						.Include(x => x.PermissionGroups)
+						.Include(x => x.Drives)
+						.Where(x =>
+							x.OrganizationID == user.OrganizationID &&
+							x.ID == deviceID);
+
+			if (!user.IsAdministrator)
+			{
+				result = result.Where(x =>
+						x.PermissionGroups.Count == 0 ||
+						x.PermissionGroups.Any(y => user.PermissionGroups.Any(z => z.ID == y.ID)));
+			}
+
+			return result.FirstOrDefault();
         }
 
         public RemotelyUser GetUserByID(string userID)
@@ -245,37 +230,37 @@ namespace Remotely_Server.Data
                 .FirstOrDefault(x => x.UserName == userName);
         }
 
-        public void MachineDisconnected(string machineID)
+        public void DeviceDisconnected(string deviceID)
         {
-            var machine = RemotelyContext.Machines.Find(machineID);
-            if (machine != null)
+            var device = RemotelyContext.Devices.Find(deviceID);
+            if (device != null)
             {
-                machine.LastOnline = DateTime.Now;
-                machine.IsOnline = false;
+                device.LastOnline = DateTime.Now;
+                device.IsOnline = false;
                 RemotelyContext.SaveChanges();
             }
         }
 
-        public void RemoveMachines(string[] machineIDs)
+        public void RemoveDevices(string[] deviceIDs)
         {
-            var machines = RemotelyContext.Machines
+            var devices = RemotelyContext.Devices
                 .Include(x => x.Drives)
-                .Where(x => machineIDs.Contains(x.ID));
-            foreach (var machine in machines)
+                .Where(x => deviceIDs.Contains(x.ID));
+            foreach (var device in devices)
             {
 
-                if (machine?.Drives?.Count > 0)
+                if (device?.Drives?.Count > 0)
                 {
-                    RemotelyContext.Drives.RemoveRange(machine.Drives);
+                    RemotelyContext.Drives.RemoveRange(device.Drives);
                 }
-                RemotelyContext.Machines.Remove(machine);
+                RemotelyContext.Devices.Remove(device);
             }
             RemotelyContext.SaveChanges();
         }
 
-        public void SetAllMachinesNotOnline()
+        public void SetAllDevicesNotOnline()
         {
-            RemotelyContext.Machines.ForEachAsync(x =>
+            RemotelyContext.Devices.ForEachAsync(x =>
             {
                 x.IsOnline = false;
             });
@@ -350,26 +335,26 @@ namespace Remotely_Server.Data
             return Tuple.Create(true, newPermission.ID);
         }
 
-        internal void AddPermissionToMachines(string userID, string[] machineIDs, string groupName)
+        internal void AddPermissionToDevices(string userID, string[] deviceIDs, string groupName)
         {
             var user = RemotelyContext.Users
                        .Include(x => x.Organization)
                        .Include(x => x.Organization)
-                       .ThenInclude(x => x.Machines)
+                       .ThenInclude(x => x.Devices)
                        .FirstOrDefault(x => x.Id == userID);
 
             var group = user.Organization.PermissionGroups.FirstOrDefault(x => x.Name.ToLower() == groupName.ToLower());
-            foreach (var machineID in machineIDs)
+            foreach (var deviceID in deviceIDs)
             {
-                if (user.Organization.Machines.Exists(x => x.ID == machineID))
+                if (user.Organization.Devices.Exists(x => x.ID == deviceID))
                 {
-                    var machine = RemotelyContext.Machines
+                    var device = RemotelyContext.Devices
                                 .Include(x => x.PermissionGroups)
-                                .FirstOrDefault(x => x.ID == machineID);
-                    if (!machine.PermissionGroups.Exists(x => x.ID == group.ID))
+                                .FirstOrDefault(x => x.ID == deviceID);
+                    if (!device.PermissionGroups.Exists(x => x.ID == group.ID))
                     {
-                        machine.PermissionGroups.Add(group);
-                        RemotelyContext.Entry(machine).State = EntityState.Modified;
+                        device.PermissionGroups.Add(group);
+                        RemotelyContext.Entry(device).State = EntityState.Modified;
                     }
                 }
             }
@@ -383,7 +368,8 @@ namespace Remotely_Server.Data
                 .FirstOrDefault(x => x.UserName == requesterUserName);
 
             var user = RemotelyContext.Users
-                        .FirstOrDefault(x => x.OrganizationID == requester.OrganizationID && x.Id == targetUserID);
+						.Include(x => x.PermissionGroups)
+						.FirstOrDefault(x => x.OrganizationID == requester.OrganizationID && x.Id == targetUserID);
 
             if (user.PermissionGroups.Exists(x => x.ID == permissionID))
             {
@@ -394,7 +380,6 @@ namespace Remotely_Server.Data
                 .Include(x => x.Organization)
                 .Where(x => x.Organization.ID == requester.Organization.ID);
             user.PermissionGroups.Add(permissions.FirstOrDefault(x => x.ID == permissionID));
-            RemotelyContext.Entry(user).State = EntityState.Modified;
             RemotelyContext.SaveChanges();
             return Tuple.Create(true, "");
         }
@@ -454,7 +439,7 @@ namespace Remotely_Server.Data
                         RemotelyContext.Remove(x);
                     });
 
-                RemotelyContext.Machines
+                RemotelyContext.Devices
                     .Where(x => DateTime.Now - x.LastOnline > TimeSpan.FromDays(AppConfig.DataRetentionInDays))
                     .ForEachAsync(x =>
                     {
@@ -542,6 +527,7 @@ namespace Remotely_Server.Data
             var targetUser = RemotelyContext.Users
                     .Include(x => x.Organization)
                     .ThenInclude(x => x.RemotelyUsers)
+					.ThenInclude(x => x.PermissionGroups)
                     .FirstOrDefault(x => x.UserName == requesterUserName)
                     .Organization
                     .RemotelyUsers
@@ -566,6 +552,7 @@ namespace Remotely_Server.Data
 
             var user = RemotelyContext.Users
                 .Include(x => x.Organization)
+				.Include(x => x.PermissionGroups)
                 .FirstOrDefault(x => x.UserName == userName);
 
             user.Organization = invite.Organization;
@@ -594,23 +581,23 @@ namespace Remotely_Server.Data
             RemotelyContext.SaveChanges();
         }
 
-        internal void RemovePermissionFromMachines(string userID, string[] machineIDs, string groupName)
+        internal void RemovePermissionFromDevices(string userID, string[] deviceIDs, string groupName)
         {
             var user = RemotelyContext.Users
                       .Include(x => x.Organization)
-                      .ThenInclude(x => x.Machines)
+                      .ThenInclude(x => x.Devices)
                       .FirstOrDefault(x => x.Id == userID);
 
             var group = user.Organization.PermissionGroups.FirstOrDefault(x => x.Name.ToLower() == groupName.ToLower());
-            foreach (var machineID in machineIDs)
+            foreach (var deviceID in deviceIDs)
             {
-                if (user.Organization.Machines.Exists(x => x.ID == machineID))
+                if (user.Organization.Devices.Exists(x => x.ID == deviceID))
                 {
-                    var machine = RemotelyContext.Machines
+                    var device = RemotelyContext.Devices
                                 .Include(x => x.PermissionGroups)
-                                .FirstOrDefault(x => x.ID == machineID);
-                    machine.PermissionGroups.RemoveAll(x => x.ID == group.ID);
-                    RemotelyContext.Entry(machine).State = EntityState.Modified;
+                                .FirstOrDefault(x => x.ID == deviceID);
+                    device.PermissionGroups.RemoveAll(x => x.ID == group.ID);
+                    RemotelyContext.Entry(device).State = EntityState.Modified;
                 }
             }
             RemotelyContext.SaveChanges();
@@ -620,6 +607,7 @@ namespace Remotely_Server.Data
             var requester = RemotelyContext.Users
               .Include(x => x.Organization)
               .ThenInclude(x => x.RemotelyUsers)
+			  .ThenInclude(x => x.PermissionGroups)
               .FirstOrDefault(x => x.UserName == requesterUserName);
 
             var target = requester.Organization.RemotelyUsers.FirstOrDefault(x => x.Id == targetUserID);
@@ -628,12 +616,12 @@ namespace Remotely_Server.Data
             RemotelyContext.SaveChanges();
         }
 
-        internal void SetServerVerificationToken(string machineID, string verificationToken)
+        internal void SetServerVerificationToken(string deviceID, string verificationToken)
         {
-            var machine = RemotelyContext.Machines.Find(machineID);
-            if (machine != null)
+            var device = RemotelyContext.Devices.Find(deviceID);
+            if (device != null)
             {
-                machine.ServerVerificationToken = verificationToken;
+                device.ServerVerificationToken = verificationToken;
                 RemotelyContext.SaveChanges();
             }
         }
@@ -648,9 +636,9 @@ namespace Remotely_Server.Data
             RemotelyContext.SaveChanges();
         }
 
-        internal void UpdateTags(string machineID, string tag)
+        internal void UpdateTags(string deviceID, string tag)
         {
-            RemotelyContext.Machines.Find(machineID).Tags = tag;
+            RemotelyContext.Devices.Find(deviceID).Tags = tag;
             RemotelyContext.SaveChanges();
         }
 
diff --git a/Remotely_Server/Migrations/20190118025611_Initial.Designer.cs b/Remotely_Server/Migrations/20190225192927_Initial.Designer.cs
similarity index 78%
rename from Remotely_Server/Migrations/20190118025611_Initial.Designer.cs
rename to Remotely_Server/Migrations/20190225192927_Initial.Designer.cs
index 09c7984c..f543896f 100644
--- a/Remotely_Server/Migrations/20190118025611_Initial.Designer.cs
+++ b/Remotely_Server/Migrations/20190225192927_Initial.Designer.cs
@@ -1,256 +1,22 @@
 // <auto-generated />
 using System;
-using Remotely_Server.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Remotely_Server.Data;
 
 namespace Remotely_Server.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20190118025611_Initial")]
+    [Migration("20190225192927_Initial")]
     partial class Initial
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.1-servicing-10028")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("Library.Models.CommandContext", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("CommandMode");
-
-                    b.Property<string>("CommandResults");
-
-                    b.Property<string>("CommandText");
-
-                    b.Property<string>("OrganizationID");
-
-                    b.Property<string>("PSCoreResults");
-
-                    b.Property<string>("SenderConnectionID");
-
-                    b.Property<string>("SenderUserID");
-
-                    b.Property<string>("TargetMachineIDs");
-
-                    b.Property<DateTime>("TimeStamp");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("OrganizationID");
-
-                    b.ToTable("CommandContexts");
-                });
-
-            modelBuilder.Entity("Library.Models.RemotelyUserOptions", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("CommandModeShortcutBash")
-                        .HasMaxLength(10);
-
-                    b.Property<string>("CommandModeShortcutCMD")
-                        .HasMaxLength(10);
-
-                    b.Property<string>("CommandModeShortcutRemotely")
-                        .HasMaxLength(10);
-
-                    b.Property<string>("CommandModeShortcutPSCore")
-                        .HasMaxLength(10);
-
-                    b.Property<string>("CommandModeShortcutWinPS")
-                        .HasMaxLength(10);
-
-                    b.Property<string>("ConsolePrompt")
-                        .HasMaxLength(5);
-
-                    b.HasKey("ID");
-
-                    b.ToTable("RemotelyUserOptions");
-                });
-
-            modelBuilder.Entity("Library.Models.Drive", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("DriveFormat");
-
-                    b.Property<int>("DriveType");
-
-                    b.Property<double>("FreeSpace");
-
-                    b.Property<string>("MachineID");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("RootDirectory");
-
-                    b.Property<double>("TotalSize");
-
-                    b.Property<string>("VolumeLabel");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("MachineID");
-
-                    b.ToTable("Drives");
-                });
-
-            modelBuilder.Entity("Library.Models.EventLog", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("EventType");
-
-                    b.Property<string>("Message");
-
-                    b.Property<string>("OrganizationID");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("StackTrace");
-
-                    b.Property<DateTime>("TimeStamp");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("OrganizationID");
-
-                    b.ToTable("EventLogs");
-                });
-
-            modelBuilder.Entity("Library.Models.InviteLink", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTime>("DateSent");
-
-                    b.Property<string>("InvitedUser");
-
-                    b.Property<bool>("IsAdmin");
-
-                    b.Property<string>("OrganizationID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("OrganizationID");
-
-                    b.ToTable("InviteLinks");
-                });
-
-            modelBuilder.Entity("Library.Models.Machine", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("CurrentUser");
-
-                    b.Property<double>("FreeMemory");
-
-                    b.Property<double>("FreeStorage");
-
-                    b.Property<bool>("Is64Bit");
-
-                    b.Property<bool>("IsOnline");
-
-                    b.Property<DateTime>("LastOnline");
-
-                    b.Property<string>("MachineName");
-
-                    b.Property<int>("OSArchitecture");
-
-                    b.Property<string>("OSDescription");
-
-                    b.Property<string>("OrganizationID");
-
-                    b.Property<string>("Platform");
-
-                    b.Property<int>("ProcessorCount");
-
-                    b.Property<string>("ServerVerificationToken");
-
-                    b.Property<string>("Tags")
-                        .HasMaxLength(200);
-
-                    b.Property<double>("TotalMemory");
-
-                    b.Property<double>("TotalStorage");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("OrganizationID");
-
-                    b.ToTable("Machines");
-                });
-
-            modelBuilder.Entity("Library.Models.Organization", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("OrganizationName")
-                        .HasMaxLength(25);
-
-                    b.HasKey("ID");
-
-                    b.ToTable("Organizations");
-                });
-
-            modelBuilder.Entity("Library.Models.PermissionGroup", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("MachineID");
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(100);
-
-                    b.Property<string>("OrganizationID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("MachineID");
-
-                    b.HasIndex("OrganizationID");
-
-                    b.ToTable("PermissionGroups");
-                });
-
-            modelBuilder.Entity("Library.Models.SharedFile", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ContentType");
-
-                    b.Property<byte[]>("FileContents");
-
-                    b.Property<string>("FileName");
-
-                    b.Property<string>("OrganizationID");
-
-                    b.Property<DateTime>("Timestamp");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("OrganizationID");
-
-                    b.ToTable("SharedFiles");
-                });
+                .HasAnnotation("ProductVersion", "2.2.2-servicing-10034");
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
                 {
@@ -270,8 +36,7 @@ namespace Remotely_Server.Migrations
 
                     b.HasIndex("NormalizedName")
                         .IsUnique()
-                        .HasName("RoleNameIndex")
-                        .HasFilter("[NormalizedName] IS NOT NULL");
+                        .HasName("RoleNameIndex");
 
                     b.ToTable("AspNetRoles");
                 });
@@ -279,8 +44,7 @@ namespace Remotely_Server.Migrations
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
                 {
                     b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .ValueGeneratedOnAdd();
 
                     b.Property<string>("ClaimType");
 
@@ -344,8 +108,7 @@ namespace Remotely_Server.Migrations
 
                     b.HasIndex("NormalizedUserName")
                         .IsUnique()
-                        .HasName("UserNameIndex")
-                        .HasFilter("[NormalizedUserName] IS NOT NULL");
+                        .HasName("UserNameIndex");
 
                     b.ToTable("RemotelyUsers");
 
@@ -355,8 +118,7 @@ namespace Remotely_Server.Migrations
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
                 {
                     b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .ValueGeneratedOnAdd();
 
                     b.Property<string>("ClaimType");
 
@@ -422,7 +184,246 @@ namespace Remotely_Server.Migrations
                     b.ToTable("AspNetUserTokens");
                 });
 
-            modelBuilder.Entity("Library.Models.RemotelyUser", b =>
+            modelBuilder.Entity("Remotely_Library.Models.CommandContext", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("CommandMode");
+
+                    b.Property<string>("CommandResults");
+
+                    b.Property<string>("CommandText");
+
+                    b.Property<string>("OrganizationID");
+
+                    b.Property<string>("PSCoreResults");
+
+                    b.Property<string>("SenderConnectionID");
+
+                    b.Property<string>("SenderUserID");
+
+                    b.Property<string>("TargetDeviceIDs");
+
+                    b.Property<DateTime>("TimeStamp");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("CommandContexts");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.Device", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("CurrentUser");
+
+                    b.Property<string>("DeviceName");
+
+                    b.Property<double>("FreeMemory");
+
+                    b.Property<double>("FreeStorage");
+
+                    b.Property<bool>("Is64Bit");
+
+                    b.Property<bool>("IsOnline");
+
+                    b.Property<DateTime>("LastOnline");
+
+                    b.Property<int>("OSArchitecture");
+
+                    b.Property<string>("OSDescription");
+
+                    b.Property<string>("OrganizationID");
+
+                    b.Property<string>("PermissionGroupID");
+
+                    b.Property<string>("Platform");
+
+                    b.Property<int>("ProcessorCount");
+
+                    b.Property<string>("ServerVerificationToken");
+
+                    b.Property<string>("Tags")
+                        .HasMaxLength(200);
+
+                    b.Property<double>("TotalMemory");
+
+                    b.Property<double>("TotalStorage");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("PermissionGroupID");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.Drive", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("DeviceID");
+
+                    b.Property<string>("DriveFormat");
+
+                    b.Property<int>("DriveType");
+
+                    b.Property<double>("FreeSpace");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("RootDirectory");
+
+                    b.Property<double>("TotalSize");
+
+                    b.Property<string>("VolumeLabel");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceID");
+
+                    b.ToTable("Drives");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.EventLog", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EventType");
+
+                    b.Property<string>("Message");
+
+                    b.Property<string>("OrganizationID");
+
+                    b.Property<string>("Source");
+
+                    b.Property<string>("StackTrace");
+
+                    b.Property<DateTime>("TimeStamp");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("EventLogs");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.InviteLink", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("DateSent");
+
+                    b.Property<string>("InvitedUser");
+
+                    b.Property<bool>("IsAdmin");
+
+                    b.Property<string>("OrganizationID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("InviteLinks");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.Organization", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("OrganizationName")
+                        .HasMaxLength(25);
+
+                    b.HasKey("ID");
+
+                    b.ToTable("Organizations");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.PermissionGroup", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("DeviceID");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(100);
+
+                    b.Property<string>("OrganizationID");
+
+                    b.Property<string>("RemotelyUserId");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("RemotelyUserId");
+
+                    b.ToTable("PermissionGroups");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.RemotelyUserOptions", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("CommandModeShortcutBash")
+                        .HasMaxLength(10);
+
+                    b.Property<string>("CommandModeShortcutCMD")
+                        .HasMaxLength(10);
+
+                    b.Property<string>("CommandModeShortcutPSCore")
+                        .HasMaxLength(10);
+
+                    b.Property<string>("CommandModeShortcutRemotely")
+                        .HasMaxLength(10);
+
+                    b.Property<string>("CommandModeShortcutWinPS")
+                        .HasMaxLength(10);
+
+                    b.Property<string>("ConsolePrompt")
+                        .HasMaxLength(5);
+
+                    b.HasKey("ID");
+
+                    b.ToTable("RemotelyUserOptions");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.SharedFile", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ContentType");
+
+                    b.Property<byte[]>("FileContents");
+
+                    b.Property<string>("FileName");
+
+                    b.Property<string>("OrganizationID");
+
+                    b.Property<DateTime>("Timestamp");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("SharedFiles");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.RemotelyUser", b =>
                 {
                     b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
 
@@ -430,70 +431,21 @@ namespace Remotely_Server.Migrations
 
                     b.Property<string>("OrganizationID");
 
-                    b.Property<string>("PermissionGroups");
+                    b.Property<string>("PermissionGroupID");
 
-                    b.Property<string>("UserOptions");
+                    b.Property<string>("UserOptionsID");
 
                     b.HasIndex("OrganizationID");
 
+                    b.HasIndex("PermissionGroupID");
+
+                    b.HasIndex("UserOptionsID");
+
                     b.ToTable("RemotelyUsers");
 
                     b.HasDiscriminator().HasValue("RemotelyUser");
                 });
 
-            modelBuilder.Entity("Library.Models.CommandContext", b =>
-                {
-                    b.HasOne("Library.Models.Organization", "Organization")
-                        .WithMany("CommandContexts")
-                        .HasForeignKey("OrganizationID");
-                });
-
-            modelBuilder.Entity("Library.Models.Drive", b =>
-                {
-                    b.HasOne("Library.Models.Machine")
-                        .WithMany("Drives")
-                        .HasForeignKey("MachineID");
-                });
-
-            modelBuilder.Entity("Library.Models.EventLog", b =>
-                {
-                    b.HasOne("Library.Models.Organization", "Organization")
-                        .WithMany("EventLogs")
-                        .HasForeignKey("OrganizationID");
-                });
-
-            modelBuilder.Entity("Library.Models.InviteLink", b =>
-                {
-                    b.HasOne("Library.Models.Organization", "Organization")
-                        .WithMany("InviteLinks")
-                        .HasForeignKey("OrganizationID");
-                });
-
-            modelBuilder.Entity("Library.Models.Machine", b =>
-                {
-                    b.HasOne("Library.Models.Organization", "Organization")
-                        .WithMany("Machines")
-                        .HasForeignKey("OrganizationID");
-                });
-
-            modelBuilder.Entity("Library.Models.PermissionGroup", b =>
-                {
-                    b.HasOne("Library.Models.Machine")
-                        .WithMany("PermissionGroups")
-                        .HasForeignKey("MachineID");
-
-                    b.HasOne("Library.Models.Organization", "Organization")
-                        .WithMany("PermissionGroups")
-                        .HasForeignKey("OrganizationID");
-                });
-
-            modelBuilder.Entity("Library.Models.SharedFile", b =>
-                {
-                    b.HasOne("Library.Models.Organization", "Organization")
-                        .WithMany("SharedFiles")
-                        .HasForeignKey("OrganizationID");
-                });
-
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
                 {
                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
@@ -539,11 +491,80 @@ namespace Remotely_Server.Migrations
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("Library.Models.RemotelyUser", b =>
+            modelBuilder.Entity("Remotely_Library.Models.CommandContext", b =>
                 {
-                    b.HasOne("Library.Models.Organization", "Organization")
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
+                        .WithMany("CommandContexts")
+                        .HasForeignKey("OrganizationID");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.Device", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
+                        .WithMany("Devices")
+                        .HasForeignKey("OrganizationID");
+
+                    b.HasOne("Remotely_Library.Models.PermissionGroup")
+                        .WithMany("Devices")
+                        .HasForeignKey("PermissionGroupID");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.Drive", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Device")
+                        .WithMany("Drives")
+                        .HasForeignKey("DeviceID");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.EventLog", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
+                        .WithMany("EventLogs")
+                        .HasForeignKey("OrganizationID");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.InviteLink", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
+                        .WithMany("InviteLinks")
+                        .HasForeignKey("OrganizationID");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.PermissionGroup", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Device")
+                        .WithMany("PermissionGroups")
+                        .HasForeignKey("DeviceID");
+
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
+                        .WithMany("PermissionGroups")
+                        .HasForeignKey("OrganizationID");
+
+                    b.HasOne("Remotely_Library.Models.RemotelyUser")
+                        .WithMany("PermissionGroups")
+                        .HasForeignKey("RemotelyUserId");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.SharedFile", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
+                        .WithMany("SharedFiles")
+                        .HasForeignKey("OrganizationID");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.RemotelyUser", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
                         .WithMany("RemotelyUsers")
                         .HasForeignKey("OrganizationID");
+
+                    b.HasOne("Remotely_Library.Models.PermissionGroup")
+                        .WithMany("RemotelyUsers")
+                        .HasForeignKey("PermissionGroupID");
+
+                    b.HasOne("Remotely_Library.Models.RemotelyUserOptions", "UserOptions")
+                        .WithMany()
+                        .HasForeignKey("UserOptionsID");
                 });
 #pragma warning restore 612, 618
         }
diff --git a/Remotely_Server/Migrations/20190118025611_Initial.cs b/Remotely_Server/Migrations/20190225192927_Initial.cs
similarity index 81%
rename from Remotely_Server/Migrations/20190118025611_Initial.cs
rename to Remotely_Server/Migrations/20190225192927_Initial.cs
index 69ebd14b..bed868a8 100644
--- a/Remotely_Server/Migrations/20190118025611_Initial.cs
+++ b/Remotely_Server/Migrations/20190225192927_Initial.cs
@@ -1,5 +1,4 @@
 using System;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Remotely_Server.Migrations
@@ -22,6 +21,18 @@ namespace Remotely_Server.Migrations
                     table.PrimaryKey("PK_AspNetRoles", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "Organizations",
+                columns: table => new
+                {
+                    ID = table.Column<string>(nullable: false),
+                    OrganizationName = table.Column<string>(maxLength: 25, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Organizations", x => x.ID);
+                });
+
             migrationBuilder.CreateTable(
                 name: "RemotelyUserOptions",
                 columns: table => new
@@ -39,24 +50,12 @@ namespace Remotely_Server.Migrations
                     table.PrimaryKey("PK_RemotelyUserOptions", x => x.ID);
                 });
 
-            migrationBuilder.CreateTable(
-                name: "Organizations",
-                columns: table => new
-                {
-                    ID = table.Column<string>(nullable: false),
-                    OrganizationName = table.Column<string>(maxLength: 25, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Organizations", x => x.ID);
-                });
-
             migrationBuilder.CreateTable(
                 name: "AspNetRoleClaims",
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                        .Annotation("Sqlite:Autoincrement", true),
                     RoleId = table.Column<string>(nullable: false),
                     ClaimType = table.Column<string>(nullable: true),
                     ClaimValue = table.Column<string>(nullable: true)
@@ -81,7 +80,7 @@ namespace Remotely_Server.Migrations
                     CommandText = table.Column<string>(nullable: true),
                     SenderUserID = table.Column<string>(nullable: true),
                     SenderConnectionID = table.Column<string>(nullable: true),
-                    TargetMachineIDs = table.Column<string>(nullable: true),
+                    TargetDeviceIDs = table.Column<string>(nullable: true),
                     PSCoreResults = table.Column<string>(nullable: true),
                     CommandResults = table.Column<string>(nullable: true),
                     TimeStamp = table.Column<DateTime>(nullable: false),
@@ -98,42 +97,6 @@ namespace Remotely_Server.Migrations
                         onDelete: ReferentialAction.Restrict);
                 });
 
-            migrationBuilder.CreateTable(
-                name: "RemotelyUsers",
-                columns: table => new
-                {
-                    Id = table.Column<string>(nullable: false),
-                    UserName = table.Column<string>(maxLength: 256, nullable: true),
-                    NormalizedUserName = table.Column<string>(maxLength: 256, nullable: true),
-                    Email = table.Column<string>(maxLength: 256, nullable: true),
-                    NormalizedEmail = table.Column<string>(maxLength: 256, nullable: true),
-                    EmailConfirmed = table.Column<bool>(nullable: false),
-                    PasswordHash = table.Column<string>(nullable: true),
-                    SecurityStamp = table.Column<string>(nullable: true),
-                    ConcurrencyStamp = table.Column<string>(nullable: true),
-                    PhoneNumber = table.Column<string>(nullable: true),
-                    PhoneNumberConfirmed = table.Column<bool>(nullable: false),
-                    TwoFactorEnabled = table.Column<bool>(nullable: false),
-                    LockoutEnd = table.Column<DateTimeOffset>(nullable: true),
-                    LockoutEnabled = table.Column<bool>(nullable: false),
-                    AccessFailedCount = table.Column<int>(nullable: false),
-                    Discriminator = table.Column<string>(nullable: false),
-                    UserOptions = table.Column<string>(nullable: true),
-                    OrganizationID = table.Column<string>(nullable: true),
-                    PermissionGroups = table.Column<string>(nullable: true),
-                    IsAdministrator = table.Column<bool>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_RemotelyUsers", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_RemotelyUsers_Organizations_OrganizationID",
-                        column: x => x.OrganizationID,
-                        principalTable: "Organizations",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
             migrationBuilder.CreateTable(
                 name: "EventLogs",
                 columns: table => new
@@ -178,39 +141,6 @@ namespace Remotely_Server.Migrations
                         onDelete: ReferentialAction.Restrict);
                 });
 
-            migrationBuilder.CreateTable(
-                name: "Machines",
-                columns: table => new
-                {
-                    ID = table.Column<string>(nullable: false),
-                    Is64Bit = table.Column<bool>(nullable: false),
-                    IsOnline = table.Column<bool>(nullable: false),
-                    LastOnline = table.Column<DateTime>(nullable: false),
-                    MachineName = table.Column<string>(nullable: true),
-                    OrganizationID = table.Column<string>(nullable: true),
-                    OSArchitecture = table.Column<int>(nullable: false),
-                    OSDescription = table.Column<string>(nullable: true),
-                    Platform = table.Column<string>(nullable: true),
-                    ProcessorCount = table.Column<int>(nullable: false),
-                    TotalMemory = table.Column<double>(nullable: false),
-                    FreeStorage = table.Column<double>(nullable: false),
-                    TotalStorage = table.Column<double>(nullable: false),
-                    FreeMemory = table.Column<double>(nullable: false),
-                    CurrentUser = table.Column<string>(nullable: true),
-                    Tags = table.Column<string>(maxLength: 200, nullable: true),
-                    ServerVerificationToken = table.Column<string>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Machines", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_Machines_Organizations_OrganizationID",
-                        column: x => x.OrganizationID,
-                        principalTable: "Organizations",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
             migrationBuilder.CreateTable(
                 name: "SharedFiles",
                 columns: table => new
@@ -233,12 +163,158 @@ namespace Remotely_Server.Migrations
                         onDelete: ReferentialAction.Restrict);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "AspNetUserRoles",
+                columns: table => new
+                {
+                    UserId = table.Column<string>(nullable: false),
+                    RoleId = table.Column<string>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId });
+                    table.ForeignKey(
+                        name: "FK_AspNetUserRoles_AspNetRoles_RoleId",
+                        column: x => x.RoleId,
+                        principalTable: "AspNetRoles",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Drives",
+                columns: table => new
+                {
+                    ID = table.Column<string>(nullable: false),
+                    DriveType = table.Column<int>(nullable: false),
+                    RootDirectory = table.Column<string>(nullable: true),
+                    Name = table.Column<string>(nullable: true),
+                    DriveFormat = table.Column<string>(nullable: true),
+                    FreeSpace = table.Column<double>(nullable: false),
+                    TotalSize = table.Column<double>(nullable: false),
+                    VolumeLabel = table.Column<string>(nullable: true),
+                    DeviceID = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Drives", x => x.ID);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "PermissionGroups",
+                columns: table => new
+                {
+                    ID = table.Column<string>(nullable: false),
+                    Name = table.Column<string>(maxLength: 100, nullable: true),
+                    OrganizationID = table.Column<string>(nullable: true),
+                    DeviceID = table.Column<string>(nullable: true),
+                    RemotelyUserId = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_PermissionGroups", x => x.ID);
+                    table.ForeignKey(
+                        name: "FK_PermissionGroups_Organizations_OrganizationID",
+                        column: x => x.OrganizationID,
+                        principalTable: "Organizations",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Devices",
+                columns: table => new
+                {
+                    ID = table.Column<string>(nullable: false),
+                    CurrentUser = table.Column<string>(nullable: true),
+                    FreeMemory = table.Column<double>(nullable: false),
+                    FreeStorage = table.Column<double>(nullable: false),
+                    Is64Bit = table.Column<bool>(nullable: false),
+                    IsOnline = table.Column<bool>(nullable: false),
+                    LastOnline = table.Column<DateTime>(nullable: false),
+                    DeviceName = table.Column<string>(nullable: true),
+                    OrganizationID = table.Column<string>(nullable: true),
+                    OSArchitecture = table.Column<int>(nullable: false),
+                    OSDescription = table.Column<string>(nullable: true),
+                    Platform = table.Column<string>(nullable: true),
+                    ProcessorCount = table.Column<int>(nullable: false),
+                    ServerVerificationToken = table.Column<string>(nullable: true),
+                    Tags = table.Column<string>(maxLength: 200, nullable: true),
+                    TotalMemory = table.Column<double>(nullable: false),
+                    TotalStorage = table.Column<double>(nullable: false),
+                    PermissionGroupID = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Devices", x => x.ID);
+                    table.ForeignKey(
+                        name: "FK_Devices_Organizations_OrganizationID",
+                        column: x => x.OrganizationID,
+                        principalTable: "Organizations",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_Devices_PermissionGroups_PermissionGroupID",
+                        column: x => x.PermissionGroupID,
+                        principalTable: "PermissionGroups",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "RemotelyUsers",
+                columns: table => new
+                {
+                    Id = table.Column<string>(nullable: false),
+                    UserName = table.Column<string>(maxLength: 256, nullable: true),
+                    NormalizedUserName = table.Column<string>(maxLength: 256, nullable: true),
+                    Email = table.Column<string>(maxLength: 256, nullable: true),
+                    NormalizedEmail = table.Column<string>(maxLength: 256, nullable: true),
+                    EmailConfirmed = table.Column<bool>(nullable: false),
+                    PasswordHash = table.Column<string>(nullable: true),
+                    SecurityStamp = table.Column<string>(nullable: true),
+                    ConcurrencyStamp = table.Column<string>(nullable: true),
+                    PhoneNumber = table.Column<string>(nullable: true),
+                    PhoneNumberConfirmed = table.Column<bool>(nullable: false),
+                    TwoFactorEnabled = table.Column<bool>(nullable: false),
+                    LockoutEnd = table.Column<DateTimeOffset>(nullable: true),
+                    LockoutEnabled = table.Column<bool>(nullable: false),
+                    AccessFailedCount = table.Column<int>(nullable: false),
+                    Discriminator = table.Column<string>(nullable: false),
+                    UserOptionsID = table.Column<string>(nullable: true),
+                    OrganizationID = table.Column<string>(nullable: true),
+                    IsAdministrator = table.Column<bool>(nullable: true),
+                    PermissionGroupID = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_RemotelyUsers", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_RemotelyUsers_Organizations_OrganizationID",
+                        column: x => x.OrganizationID,
+                        principalTable: "Organizations",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_RemotelyUsers_PermissionGroups_PermissionGroupID",
+                        column: x => x.PermissionGroupID,
+                        principalTable: "PermissionGroups",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_RemotelyUsers_RemotelyUserOptions_UserOptionsID",
+                        column: x => x.UserOptionsID,
+                        principalTable: "RemotelyUserOptions",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
             migrationBuilder.CreateTable(
                 name: "AspNetUserClaims",
                 columns: table => new
                 {
                     Id = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                        .Annotation("Sqlite:Autoincrement", true),
                     UserId = table.Column<string>(nullable: false),
                     ClaimType = table.Column<string>(nullable: true),
                     ClaimValue = table.Column<string>(nullable: true)
@@ -274,30 +350,6 @@ namespace Remotely_Server.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
-            migrationBuilder.CreateTable(
-                name: "AspNetUserRoles",
-                columns: table => new
-                {
-                    UserId = table.Column<string>(nullable: false),
-                    RoleId = table.Column<string>(nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId });
-                    table.ForeignKey(
-                        name: "FK_AspNetUserRoles_AspNetRoles_RoleId",
-                        column: x => x.RoleId,
-                        principalTable: "AspNetRoles",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_AspNetUserRoles_RemotelyUsers_UserId",
-                        column: x => x.UserId,
-                        principalTable: "RemotelyUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
             migrationBuilder.CreateTable(
                 name: "AspNetUserTokens",
                 columns: table => new
@@ -318,57 +370,6 @@ namespace Remotely_Server.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
-            migrationBuilder.CreateTable(
-                name: "Drives",
-                columns: table => new
-                {
-                    ID = table.Column<string>(nullable: false),
-                    DriveType = table.Column<int>(nullable: false),
-                    RootDirectory = table.Column<string>(nullable: true),
-                    Name = table.Column<string>(nullable: true),
-                    DriveFormat = table.Column<string>(nullable: true),
-                    FreeSpace = table.Column<double>(nullable: false),
-                    TotalSize = table.Column<double>(nullable: false),
-                    VolumeLabel = table.Column<string>(nullable: true),
-                    MachineID = table.Column<string>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Drives", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_Drives_Machines_MachineID",
-                        column: x => x.MachineID,
-                        principalTable: "Machines",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "PermissionGroups",
-                columns: table => new
-                {
-                    ID = table.Column<string>(nullable: false),
-                    Name = table.Column<string>(maxLength: 100, nullable: true),
-                    OrganizationID = table.Column<string>(nullable: true),
-                    MachineID = table.Column<string>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_PermissionGroups", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_PermissionGroups_Machines_MachineID",
-                        column: x => x.MachineID,
-                        principalTable: "Machines",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_PermissionGroups_Organizations_OrganizationID",
-                        column: x => x.OrganizationID,
-                        principalTable: "Organizations",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
             migrationBuilder.CreateIndex(
                 name: "IX_AspNetRoleClaims_RoleId",
                 table: "AspNetRoleClaims",
@@ -378,8 +379,7 @@ namespace Remotely_Server.Migrations
                 name: "RoleNameIndex",
                 table: "AspNetRoles",
                 column: "NormalizedName",
-                unique: true,
-                filter: "[NormalizedName] IS NOT NULL");
+                unique: true);
 
             migrationBuilder.CreateIndex(
                 name: "IX_AspNetUserClaims_UserId",
@@ -402,26 +402,19 @@ namespace Remotely_Server.Migrations
                 column: "OrganizationID");
 
             migrationBuilder.CreateIndex(
-                name: "IX_RemotelyUsers_OrganizationID",
-                table: "RemotelyUsers",
+                name: "IX_Devices_OrganizationID",
+                table: "Devices",
                 column: "OrganizationID");
 
             migrationBuilder.CreateIndex(
-                name: "EmailIndex",
-                table: "RemotelyUsers",
-                column: "NormalizedEmail");
+                name: "IX_Devices_PermissionGroupID",
+                table: "Devices",
+                column: "PermissionGroupID");
 
             migrationBuilder.CreateIndex(
-                name: "UserNameIndex",
-                table: "RemotelyUsers",
-                column: "NormalizedUserName",
-                unique: true,
-                filter: "[NormalizedUserName] IS NOT NULL");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Drives_MachineID",
+                name: "IX_Drives_DeviceID",
                 table: "Drives",
-                column: "MachineID");
+                column: "DeviceID");
 
             migrationBuilder.CreateIndex(
                 name: "IX_EventLogs_OrganizationID",
@@ -434,28 +427,102 @@ namespace Remotely_Server.Migrations
                 column: "OrganizationID");
 
             migrationBuilder.CreateIndex(
-                name: "IX_Machines_OrganizationID",
-                table: "Machines",
-                column: "OrganizationID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_PermissionGroups_MachineID",
+                name: "IX_PermissionGroups_DeviceID",
                 table: "PermissionGroups",
-                column: "MachineID");
+                column: "DeviceID");
 
             migrationBuilder.CreateIndex(
                 name: "IX_PermissionGroups_OrganizationID",
                 table: "PermissionGroups",
                 column: "OrganizationID");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_PermissionGroups_RemotelyUserId",
+                table: "PermissionGroups",
+                column: "RemotelyUserId");
+
+            migrationBuilder.CreateIndex(
+                name: "EmailIndex",
+                table: "RemotelyUsers",
+                column: "NormalizedEmail");
+
+            migrationBuilder.CreateIndex(
+                name: "UserNameIndex",
+                table: "RemotelyUsers",
+                column: "NormalizedUserName",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RemotelyUsers_OrganizationID",
+                table: "RemotelyUsers",
+                column: "OrganizationID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RemotelyUsers_PermissionGroupID",
+                table: "RemotelyUsers",
+                column: "PermissionGroupID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RemotelyUsers_UserOptionsID",
+                table: "RemotelyUsers",
+                column: "UserOptionsID");
+
             migrationBuilder.CreateIndex(
                 name: "IX_SharedFiles_OrganizationID",
                 table: "SharedFiles",
                 column: "OrganizationID");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_AspNetUserRoles_RemotelyUsers_UserId",
+                table: "AspNetUserRoles",
+                column: "UserId",
+                principalTable: "RemotelyUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Drives_Devices_DeviceID",
+                table: "Drives",
+                column: "DeviceID",
+                principalTable: "Devices",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_PermissionGroups_RemotelyUsers_RemotelyUserId",
+                table: "PermissionGroups",
+                column: "RemotelyUserId",
+                principalTable: "RemotelyUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_PermissionGroups_Devices_DeviceID",
+                table: "PermissionGroups",
+                column: "DeviceID",
+                principalTable: "Devices",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.DropForeignKey(
+                name: "FK_PermissionGroups_RemotelyUsers_RemotelyUserId",
+                table: "PermissionGroups");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Devices_Organizations_OrganizationID",
+                table: "Devices");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_PermissionGroups_Organizations_OrganizationID",
+                table: "PermissionGroups");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Devices_PermissionGroups_PermissionGroupID",
+                table: "Devices");
+
             migrationBuilder.DropTable(
                 name: "AspNetRoleClaims");
 
@@ -474,9 +541,6 @@ namespace Remotely_Server.Migrations
             migrationBuilder.DropTable(
                 name: "CommandContexts");
 
-            migrationBuilder.DropTable(
-                name: "RemotelyUserOptions");
-
             migrationBuilder.DropTable(
                 name: "Drives");
 
@@ -486,9 +550,6 @@ namespace Remotely_Server.Migrations
             migrationBuilder.DropTable(
                 name: "InviteLinks");
 
-            migrationBuilder.DropTable(
-                name: "PermissionGroups");
-
             migrationBuilder.DropTable(
                 name: "SharedFiles");
 
@@ -499,10 +560,16 @@ namespace Remotely_Server.Migrations
                 name: "RemotelyUsers");
 
             migrationBuilder.DropTable(
-                name: "Machines");
+                name: "RemotelyUserOptions");
 
             migrationBuilder.DropTable(
                 name: "Organizations");
+
+            migrationBuilder.DropTable(
+                name: "PermissionGroups");
+
+            migrationBuilder.DropTable(
+                name: "Devices");
         }
     }
 }
diff --git a/Remotely_Server/Migrations/ApplicationDbContextModelSnapshot.cs b/Remotely_Server/Migrations/ApplicationDbContextModelSnapshot.cs
index 2540e675..735414bd 100644
--- a/Remotely_Server/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Remotely_Server/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -1,10 +1,9 @@
 // <auto-generated />
 using System;
-using Remotely_Server.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Remotely_Server.Data;
 
 namespace Remotely_Server.Migrations
 {
@@ -15,240 +14,7 @@ namespace Remotely_Server.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.1-servicing-10028")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("Library.Models.CommandContext", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("CommandMode");
-
-                    b.Property<string>("CommandResults");
-
-                    b.Property<string>("CommandText");
-
-                    b.Property<string>("OrganizationID");
-
-                    b.Property<string>("PSCoreResults");
-
-                    b.Property<string>("SenderConnectionID");
-
-                    b.Property<string>("SenderUserID");
-
-                    b.Property<string>("TargetMachineIDs");
-
-                    b.Property<DateTime>("TimeStamp");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("OrganizationID");
-
-                    b.ToTable("CommandContexts");
-                });
-
-            modelBuilder.Entity("Library.Models.RemotelyUserOptions", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("CommandModeShortcutBash")
-                        .HasMaxLength(10);
-
-                    b.Property<string>("CommandModeShortcutCMD")
-                        .HasMaxLength(10);
-
-                    b.Property<string>("CommandModeShortcutRemotely")
-                        .HasMaxLength(10);
-
-                    b.Property<string>("CommandModeShortcutPSCore")
-                        .HasMaxLength(10);
-
-                    b.Property<string>("CommandModeShortcutWinPS")
-                        .HasMaxLength(10);
-
-                    b.Property<string>("ConsolePrompt")
-                        .HasMaxLength(5);
-
-                    b.HasKey("ID");
-
-                    b.ToTable("RemotelyUserOptions");
-                });
-
-            modelBuilder.Entity("Library.Models.Drive", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("DriveFormat");
-
-                    b.Property<int>("DriveType");
-
-                    b.Property<double>("FreeSpace");
-
-                    b.Property<string>("MachineID");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("RootDirectory");
-
-                    b.Property<double>("TotalSize");
-
-                    b.Property<string>("VolumeLabel");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("MachineID");
-
-                    b.ToTable("Drives");
-                });
-
-            modelBuilder.Entity("Library.Models.EventLog", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("EventType");
-
-                    b.Property<string>("Message");
-
-                    b.Property<string>("OrganizationID");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("StackTrace");
-
-                    b.Property<DateTime>("TimeStamp");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("OrganizationID");
-
-                    b.ToTable("EventLogs");
-                });
-
-            modelBuilder.Entity("Library.Models.InviteLink", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTime>("DateSent");
-
-                    b.Property<string>("InvitedUser");
-
-                    b.Property<bool>("IsAdmin");
-
-                    b.Property<string>("OrganizationID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("OrganizationID");
-
-                    b.ToTable("InviteLinks");
-                });
-
-            modelBuilder.Entity("Library.Models.Machine", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("CurrentUser");
-
-                    b.Property<double>("FreeMemory");
-
-                    b.Property<double>("FreeStorage");
-
-                    b.Property<bool>("Is64Bit");
-
-                    b.Property<bool>("IsOnline");
-
-                    b.Property<DateTime>("LastOnline");
-
-                    b.Property<string>("MachineName");
-
-                    b.Property<int>("OSArchitecture");
-
-                    b.Property<string>("OSDescription");
-
-                    b.Property<string>("OrganizationID");
-
-                    b.Property<string>("Platform");
-
-                    b.Property<int>("ProcessorCount");
-
-                    b.Property<string>("ServerVerificationToken");
-
-                    b.Property<string>("Tags")
-                        .HasMaxLength(200);
-
-                    b.Property<double>("TotalMemory");
-
-                    b.Property<double>("TotalStorage");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("OrganizationID");
-
-                    b.ToTable("Machines");
-                });
-
-            modelBuilder.Entity("Library.Models.Organization", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("OrganizationName")
-                        .HasMaxLength(25);
-
-                    b.HasKey("ID");
-
-                    b.ToTable("Organizations");
-                });
-
-            modelBuilder.Entity("Library.Models.PermissionGroup", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("MachineID");
-
-                    b.Property<string>("Name")
-                        .HasMaxLength(100);
-
-                    b.Property<string>("OrganizationID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("MachineID");
-
-                    b.HasIndex("OrganizationID");
-
-                    b.ToTable("PermissionGroups");
-                });
-
-            modelBuilder.Entity("Library.Models.SharedFile", b =>
-                {
-                    b.Property<string>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("ContentType");
-
-                    b.Property<byte[]>("FileContents");
-
-                    b.Property<string>("FileName");
-
-                    b.Property<string>("OrganizationID");
-
-                    b.Property<DateTime>("Timestamp");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("OrganizationID");
-
-                    b.ToTable("SharedFiles");
-                });
+                .HasAnnotation("ProductVersion", "2.2.2-servicing-10034");
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
                 {
@@ -268,8 +34,7 @@ namespace Remotely_Server.Migrations
 
                     b.HasIndex("NormalizedName")
                         .IsUnique()
-                        .HasName("RoleNameIndex")
-                        .HasFilter("[NormalizedName] IS NOT NULL");
+                        .HasName("RoleNameIndex");
 
                     b.ToTable("AspNetRoles");
                 });
@@ -277,8 +42,7 @@ namespace Remotely_Server.Migrations
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
                 {
                     b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .ValueGeneratedOnAdd();
 
                     b.Property<string>("ClaimType");
 
@@ -342,8 +106,7 @@ namespace Remotely_Server.Migrations
 
                     b.HasIndex("NormalizedUserName")
                         .IsUnique()
-                        .HasName("UserNameIndex")
-                        .HasFilter("[NormalizedUserName] IS NOT NULL");
+                        .HasName("UserNameIndex");
 
                     b.ToTable("RemotelyUsers");
 
@@ -353,8 +116,7 @@ namespace Remotely_Server.Migrations
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
                 {
                     b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+                        .ValueGeneratedOnAdd();
 
                     b.Property<string>("ClaimType");
 
@@ -420,7 +182,246 @@ namespace Remotely_Server.Migrations
                     b.ToTable("AspNetUserTokens");
                 });
 
-            modelBuilder.Entity("Library.Models.RemotelyUser", b =>
+            modelBuilder.Entity("Remotely_Library.Models.CommandContext", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("CommandMode");
+
+                    b.Property<string>("CommandResults");
+
+                    b.Property<string>("CommandText");
+
+                    b.Property<string>("OrganizationID");
+
+                    b.Property<string>("PSCoreResults");
+
+                    b.Property<string>("SenderConnectionID");
+
+                    b.Property<string>("SenderUserID");
+
+                    b.Property<string>("TargetDeviceIDs");
+
+                    b.Property<DateTime>("TimeStamp");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("CommandContexts");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.Device", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("CurrentUser");
+
+                    b.Property<string>("DeviceName");
+
+                    b.Property<double>("FreeMemory");
+
+                    b.Property<double>("FreeStorage");
+
+                    b.Property<bool>("Is64Bit");
+
+                    b.Property<bool>("IsOnline");
+
+                    b.Property<DateTime>("LastOnline");
+
+                    b.Property<int>("OSArchitecture");
+
+                    b.Property<string>("OSDescription");
+
+                    b.Property<string>("OrganizationID");
+
+                    b.Property<string>("PermissionGroupID");
+
+                    b.Property<string>("Platform");
+
+                    b.Property<int>("ProcessorCount");
+
+                    b.Property<string>("ServerVerificationToken");
+
+                    b.Property<string>("Tags")
+                        .HasMaxLength(200);
+
+                    b.Property<double>("TotalMemory");
+
+                    b.Property<double>("TotalStorage");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("PermissionGroupID");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.Drive", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("DeviceID");
+
+                    b.Property<string>("DriveFormat");
+
+                    b.Property<int>("DriveType");
+
+                    b.Property<double>("FreeSpace");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("RootDirectory");
+
+                    b.Property<double>("TotalSize");
+
+                    b.Property<string>("VolumeLabel");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceID");
+
+                    b.ToTable("Drives");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.EventLog", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EventType");
+
+                    b.Property<string>("Message");
+
+                    b.Property<string>("OrganizationID");
+
+                    b.Property<string>("Source");
+
+                    b.Property<string>("StackTrace");
+
+                    b.Property<DateTime>("TimeStamp");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("EventLogs");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.InviteLink", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("DateSent");
+
+                    b.Property<string>("InvitedUser");
+
+                    b.Property<bool>("IsAdmin");
+
+                    b.Property<string>("OrganizationID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("InviteLinks");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.Organization", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("OrganizationName")
+                        .HasMaxLength(25);
+
+                    b.HasKey("ID");
+
+                    b.ToTable("Organizations");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.PermissionGroup", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("DeviceID");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(100);
+
+                    b.Property<string>("OrganizationID");
+
+                    b.Property<string>("RemotelyUserId");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("RemotelyUserId");
+
+                    b.ToTable("PermissionGroups");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.RemotelyUserOptions", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("CommandModeShortcutBash")
+                        .HasMaxLength(10);
+
+                    b.Property<string>("CommandModeShortcutCMD")
+                        .HasMaxLength(10);
+
+                    b.Property<string>("CommandModeShortcutPSCore")
+                        .HasMaxLength(10);
+
+                    b.Property<string>("CommandModeShortcutRemotely")
+                        .HasMaxLength(10);
+
+                    b.Property<string>("CommandModeShortcutWinPS")
+                        .HasMaxLength(10);
+
+                    b.Property<string>("ConsolePrompt")
+                        .HasMaxLength(5);
+
+                    b.HasKey("ID");
+
+                    b.ToTable("RemotelyUserOptions");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.SharedFile", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ContentType");
+
+                    b.Property<byte[]>("FileContents");
+
+                    b.Property<string>("FileName");
+
+                    b.Property<string>("OrganizationID");
+
+                    b.Property<DateTime>("Timestamp");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("SharedFiles");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.RemotelyUser", b =>
                 {
                     b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
 
@@ -428,70 +429,21 @@ namespace Remotely_Server.Migrations
 
                     b.Property<string>("OrganizationID");
 
-                    b.Property<string>("PermissionGroups");
+                    b.Property<string>("PermissionGroupID");
 
-                    b.Property<string>("UserOptions");
+                    b.Property<string>("UserOptionsID");
 
                     b.HasIndex("OrganizationID");
 
+                    b.HasIndex("PermissionGroupID");
+
+                    b.HasIndex("UserOptionsID");
+
                     b.ToTable("RemotelyUsers");
 
                     b.HasDiscriminator().HasValue("RemotelyUser");
                 });
 
-            modelBuilder.Entity("Library.Models.CommandContext", b =>
-                {
-                    b.HasOne("Library.Models.Organization", "Organization")
-                        .WithMany("CommandContexts")
-                        .HasForeignKey("OrganizationID");
-                });
-
-            modelBuilder.Entity("Library.Models.Drive", b =>
-                {
-                    b.HasOne("Library.Models.Machine")
-                        .WithMany("Drives")
-                        .HasForeignKey("MachineID");
-                });
-
-            modelBuilder.Entity("Library.Models.EventLog", b =>
-                {
-                    b.HasOne("Library.Models.Organization", "Organization")
-                        .WithMany("EventLogs")
-                        .HasForeignKey("OrganizationID");
-                });
-
-            modelBuilder.Entity("Library.Models.InviteLink", b =>
-                {
-                    b.HasOne("Library.Models.Organization", "Organization")
-                        .WithMany("InviteLinks")
-                        .HasForeignKey("OrganizationID");
-                });
-
-            modelBuilder.Entity("Library.Models.Machine", b =>
-                {
-                    b.HasOne("Library.Models.Organization", "Organization")
-                        .WithMany("Machines")
-                        .HasForeignKey("OrganizationID");
-                });
-
-            modelBuilder.Entity("Library.Models.PermissionGroup", b =>
-                {
-                    b.HasOne("Library.Models.Machine")
-                        .WithMany("PermissionGroups")
-                        .HasForeignKey("MachineID");
-
-                    b.HasOne("Library.Models.Organization", "Organization")
-                        .WithMany("PermissionGroups")
-                        .HasForeignKey("OrganizationID");
-                });
-
-            modelBuilder.Entity("Library.Models.SharedFile", b =>
-                {
-                    b.HasOne("Library.Models.Organization", "Organization")
-                        .WithMany("SharedFiles")
-                        .HasForeignKey("OrganizationID");
-                });
-
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
                 {
                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
@@ -537,11 +489,80 @@ namespace Remotely_Server.Migrations
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("Library.Models.RemotelyUser", b =>
+            modelBuilder.Entity("Remotely_Library.Models.CommandContext", b =>
                 {
-                    b.HasOne("Library.Models.Organization", "Organization")
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
+                        .WithMany("CommandContexts")
+                        .HasForeignKey("OrganizationID");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.Device", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
+                        .WithMany("Devices")
+                        .HasForeignKey("OrganizationID");
+
+                    b.HasOne("Remotely_Library.Models.PermissionGroup")
+                        .WithMany("Devices")
+                        .HasForeignKey("PermissionGroupID");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.Drive", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Device")
+                        .WithMany("Drives")
+                        .HasForeignKey("DeviceID");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.EventLog", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
+                        .WithMany("EventLogs")
+                        .HasForeignKey("OrganizationID");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.InviteLink", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
+                        .WithMany("InviteLinks")
+                        .HasForeignKey("OrganizationID");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.PermissionGroup", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Device")
+                        .WithMany("PermissionGroups")
+                        .HasForeignKey("DeviceID");
+
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
+                        .WithMany("PermissionGroups")
+                        .HasForeignKey("OrganizationID");
+
+                    b.HasOne("Remotely_Library.Models.RemotelyUser")
+                        .WithMany("PermissionGroups")
+                        .HasForeignKey("RemotelyUserId");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.SharedFile", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
+                        .WithMany("SharedFiles")
+                        .HasForeignKey("OrganizationID");
+                });
+
+            modelBuilder.Entity("Remotely_Library.Models.RemotelyUser", b =>
+                {
+                    b.HasOne("Remotely_Library.Models.Organization", "Organization")
                         .WithMany("RemotelyUsers")
                         .HasForeignKey("OrganizationID");
+
+                    b.HasOne("Remotely_Library.Models.PermissionGroup")
+                        .WithMany("RemotelyUsers")
+                        .HasForeignKey("PermissionGroupID");
+
+                    b.HasOne("Remotely_Library.Models.RemotelyUserOptions", "UserOptions")
+                        .WithMany()
+                        .HasForeignKey("UserOptionsID");
                 });
 #pragma warning restore 612, 618
         }
diff --git a/Remotely_Server/Pages/Clients.cshtml b/Remotely_Server/Pages/Clients.cshtml
index e1792a72..9378d09f 100644
--- a/Remotely_Server/Pages/Clients.cshtml
+++ b/Remotely_Server/Pages/Clients.cshtml
@@ -159,7 +159,7 @@
             <div class="modal-body">
                 <p>
                     By default, the install scripts will download the client files from the server before installing them.
-                    This is fine for one or two machines, but it wouldn't be ideal to have a large number of computers
+                    This is fine for one or two devices, but it wouldn't be ideal to have a large number of computers
                     downloading over the WAN simultaneously.
                     <br /><br />
                     To reduce bandwidth usage, you can download separately the ZIP file containing the client files and put
diff --git a/Remotely_Server/Pages/Privacy.cshtml b/Remotely_Server/Pages/Privacy.cshtml
index ac798d11..3f771bd8 100644
--- a/Remotely_Server/Pages/Privacy.cshtml
+++ b/Remotely_Server/Pages/Privacy.cshtml
@@ -30,7 +30,7 @@
             as the original password used to create the account.  The password itself cannot be
             retrieved, though.
             <br /><br />
-            You can learn more about Identity on <a href="https://docs.microsoft.com/en-us/aspnet/core/security/authentication/identity?view=aspnetcore-2.1">Microsoft Docs.</a>
+            You can learn more about Identity on <a href="https://docs.microsoft.com/en-us/aspnet/core/security/authentication/identity?view=aspnetcore-2.2">Microsoft Docs.</a>
             <br /><br />
             Data pertaining to computers using the Remotely service is only kept for three months, then it
             is permanently deleted.  No information about the computers, commands sent, or results are
diff --git a/Remotely_Server/Pages/RemoteControl.cshtml b/Remotely_Server/Pages/RemoteControl.cshtml
index 7963d5df..c2dd302c 100644
--- a/Remotely_Server/Pages/RemoteControl.cshtml
+++ b/Remotely_Server/Pages/RemoteControl.cshtml
@@ -80,7 +80,7 @@
     </div>
 
     <div class="center-aligned">
-        <video id="screenViewer" hidden="hidden" muted></video>
+        <canvas id="screenViewer" hidden="hidden"></canvas>
         <input id="fileTransferInput" hidden="hidden" type="file" />
         <input id="touchKeyboardInput" type="text" />
     </div>
diff --git a/Remotely_Server/Pages/_DataGrid.cshtml b/Remotely_Server/Pages/_DataGrid.cshtml
index c93f35c4..e9128420 100644
--- a/Remotely_Server/Pages/_DataGrid.cshtml
+++ b/Remotely_Server/Pages/_DataGrid.cshtml
@@ -1,16 +1,16 @@
 <div id="dataGridFrame" class="tab-pane fade">
-    <div id="machineGridWrapper">
+    <div id="deviceGridWrapper">
         <div id="gridControlsWrapper">
             <button id="startRemoteControlButton" class="btn btn-xs btn-secondary">Remote Control</button>
-            <button id="toggleAllMachines" class="btn btn-xs btn-secondary">Select All</button>
+            <button id="toggleAllDevices" class="btn btn-xs btn-secondary">Select All</button>
             <span>Filter:</span>
             <input id="gridFilter" />
         </div>
-        <table id="machineGrid" class="table table-responsive table-hover table-striped">
+        <table id="deviceGrid" class="table table-responsive table-hover table-striped">
             <thead>
                 <tr>
                     <th>Online</th>
-                    <th>Machine Name</th>
+                    <th>Device Name</th>
                     <th>Current User</th>
                     <th>Last Online</th>
                     <th>Platform</th>
diff --git a/Remotely_Server/Pages/_IndexLoggedIn.cshtml b/Remotely_Server/Pages/_IndexLoggedIn.cshtml
index 0232b2eb..a28362b8 100644
--- a/Remotely_Server/Pages/_IndexLoggedIn.cshtml
+++ b/Remotely_Server/Pages/_IndexLoggedIn.cshtml
@@ -51,26 +51,26 @@
         </div>
         <div class="col-sm-6">
             <span>
-                Machines Selected:
+                Devices Selected:
             </span>
-            <span id="machinesSelectedSpan" class="console-status-value">
+            <span id="devicesSelectedSpan" class="console-status-value">
                 0
             </span>
         </div>
         <div class="clearfix"></div>
         <div class="col-sm-6">
             <span>
-                Online Machines:
+                Online Devices:
             </span>
-            <span id="onlineMachinesSpan" class="console-status-value">
+            <span id="onlineDevicesSpan" class="console-status-value">
                 0
             </span>
         </div>
         <div class="col-sm-6">
             <span>
-                Total Machines:
+                Total Devices:
             </span>
-            <span id="totalMachinesSpan" class="console-status-value">
+            <span id="totalDevicesSpan" class="console-status-value">
                 0
             </span>
         </div>
diff --git a/Remotely_Server/Remotely_Server.csproj b/Remotely_Server/Remotely_Server.csproj
index 1f4f06b1..75c3ae45 100644
--- a/Remotely_Server/Remotely_Server.csproj
+++ b/Remotely_Server/Remotely_Server.csproj
@@ -33,8 +33,8 @@
     <Content Remove="wwwroot\scripts\Models\CommandContext.ts" />
     <Content Remove="wwwroot\scripts\Models\CommandLineParameter.ts" />
     <Content Remove="wwwroot\scripts\Models\ConsoleCommand.ts" />
+    <Content Remove="wwwroot\scripts\Models\Device.ts" />
     <Content Remove="wwwroot\scripts\Models\GenericCommandResult.ts" />
-    <Content Remove="wwwroot\scripts\Models\Machine.ts" />
     <Content Remove="wwwroot\scripts\Models\Parameter.ts" />
     <Content Remove="wwwroot\scripts\Models\UserOptions.ts" />
     <Content Remove="wwwroot\scripts\Pages\OrganizationManagement.ts" />
@@ -1661,7 +1661,7 @@
     <TypeScriptCompile Include="wwwroot\scripts\Models\CommandLineParameter.ts" />
     <TypeScriptCompile Include="wwwroot\scripts\Models\ConsoleCommand.ts" />
     <TypeScriptCompile Include="wwwroot\scripts\Models\UserOptions.ts" />
-    <TypeScriptCompile Include="wwwroot\scripts\Models\Machine.ts" />
+    <TypeScriptCompile Include="wwwroot\scripts\Models\Device.ts" />
     <TypeScriptCompile Include="wwwroot\scripts\Models\Parameter.ts" />
     <TypeScriptCompile Include="wwwroot\scripts\Pages\OrganizationManagement.ts" />
     <TypeScriptCompile Include="wwwroot\scripts\RemoteControl\RemoteControl.ts" />
diff --git a/Remotely_Server/Services/BrowserSocketHub.cs b/Remotely_Server/Services/BrowserSocketHub.cs
index 45ffc316..c22b8b12 100644
--- a/Remotely_Server/Services/BrowserSocketHub.cs
+++ b/Remotely_Server/Services/BrowserSocketHub.cs
@@ -32,8 +32,9 @@ namespace Remotely_Server.Services
             AppConfig = appConfig;
         }
 
-        private DataService DataService { get; }
-        private IHubContext<DeviceSocketHub> DeviceHub { get; }
+		private ApplicationConfig AppConfig { get; }
+		private DataService DataService { get; }
+		private IHubContext<DeviceSocketHub> DeviceHub { get; }
         private RemotelyUser RemotelyUser
         {
             get
@@ -46,125 +47,124 @@ namespace Remotely_Server.Services
             }
         }
         private SignInManager<RemotelyUser> SignInManager { get; }
-        private ApplicationConfig AppConfig { get; }
-
-
-        public async Task AddGroup(string[] machineIDs, string groupName)
+        public async Task AddGroup(string[] deviceIDs, string groupName)
         {
             groupName = groupName.Trim();
-            machineIDs = DataService.FilterMachineIDsByUserPermission(machineIDs, RemotelyUser);
+            deviceIDs = DataService.FilterDeviceIDsByUserPermission(deviceIDs, RemotelyUser);
             if (!DataService.DoesGroupExist(RemotelyUser.Id, groupName))
             {
                 await Clients.Caller.SendAsync("DisplayConsoleMessage", "Permission group does not exist.");
                 return;
             }
-            DataService.AddPermissionToMachines(RemotelyUser.Id, machineIDs, groupName);
+            DataService.AddPermissionToDevices(RemotelyUser.Id, deviceIDs, groupName);
             await Clients.Caller.SendAsync("DisplayConsoleMessage", "Group added.");
         }
-        public async Task RemoveGroup(string[] machineIDs, string groupName)
-        {
+		public async Task DeployScript(string fileID, string mode, string[] deviceIDs)
+		{
+			deviceIDs = DataService.FilterDeviceIDsByUserPermission(deviceIDs, RemotelyUser);
+			var connections = GetActiveClientConnections(deviceIDs);
+			var commandContext = new CommandContext()
+			{
+				CommandMode = mode,
+				CommandText = Encoding.UTF8.GetString(DataService.GetSharedFiled(fileID).FileContents),
+				SenderConnectionID = Context.ConnectionId,
+				SenderUserID = Context.UserIdentifier,
+				TargetDeviceIDs = connections.Select(x => x.Value.ID).ToArray(),
+				OrganizationID = RemotelyUser.OrganizationID
+			};
+			DataService.AddOrUpdateCommandContext(commandContext);
+			await Clients.Caller.SendAsync("CommandContextCreated", commandContext);
+			foreach (var connection in connections)
+			{
+				await DeviceHub.Clients.Client(connection.Key).SendAsync("DeployScript", mode, fileID, commandContext.ID, Context.ConnectionId);
+			}
+		}
+
+		public async Task ExecuteCommandOnClient(string mode, string command, string[] deviceIDs)
+		{
+			deviceIDs = DataService.FilterDeviceIDsByUserPermission(deviceIDs, RemotelyUser);
+			var connections = GetActiveClientConnections(deviceIDs);
+
+			var commandContext = new CommandContext()
+			{
+				CommandMode = mode,
+				CommandText = command,
+				SenderConnectionID = Context.ConnectionId,
+				SenderUserID = Context.UserIdentifier,
+				TargetDeviceIDs = connections.Select(x => x.Value.ID).ToArray(),
+				OrganizationID = RemotelyUser.Organization.ID
+			};
+			DataService.AddOrUpdateCommandContext(commandContext);
+			await Clients.Caller.SendAsync("CommandContextCreated", commandContext);
+			foreach (var connection in connections)
+			{
+				await DeviceHub.Clients.Client(connection.Key).SendAsync("ExecuteCommand", mode, command, commandContext.ID, Context.ConnectionId);
+			}
+		}
+
+		public override async Task OnConnectedAsync()
+		{
+			RemotelyUser = DataService.GetUserByID(Context?.UserIdentifier);
+			if (IsConnectionValid()?.Result == false)
+			{
+				return;
+			}
+			await Groups.AddToGroupAsync(Context.ConnectionId, RemotelyUser.Organization.ID);
+			await Clients.Caller.SendAsync("UserOptions", RemotelyUser.UserOptions);
+			if (AppConfig.ShowMessageOfTheDay)
+			{
+				try
+				{
+					var wc = new WebClient();
+					var message = await wc.DownloadStringTaskAsync(new Uri("https://remotely.lucency.co/api/messageoftheday"));
+					await Clients.Caller.SendAsync("DisplayConsoleHTML", message);
+				}
+				catch { }
+			}
+			await base.OnConnectedAsync();
+		}
+
+		public override async Task OnDisconnectedAsync(Exception exception)
+		{
+			await Groups.RemoveFromGroupAsync(Context.ConnectionId, RemotelyUser.Organization.ID);
+			await base.OnDisconnectedAsync(exception);
+		}
+
+		public async Task RemoteControl(string deviceID)
+		{
+			if (DataService.DoesUserHaveAccessToDevice(deviceID, RemotelyUser))
+			{
+				var targetDevice = DeviceSocketHub.ServiceConnections.FirstOrDefault(x => x.Value.ID == deviceID);
+				var currentUsers = RCBrowserSocketHub.OrganizationConnectionList.Count(x => x.Value.OrganizationID == RemotelyUser.OrganizationID);
+				if (currentUsers >= AppConfig.RemoteControlSessionLimit)
+				{
+					await Clients.Caller.SendAsync("DisplayConsoleMessage", $"There are already the maximum amount of active remote control sessions for your organization.");
+					return;
+				}
+				await this.Clients.Caller.SendAsync("ServiceID", targetDevice.Key);
+				await DeviceHub.Clients.Client(targetDevice.Key).SendAsync("RemoteControl", Context.ConnectionId, targetDevice.Key);
+			}
+		}
+
+		public async Task RemoveGroup(string[] deviceIDs, string groupName)
+		{
             groupName = groupName.Trim();
-            machineIDs = DataService.FilterMachineIDsByUserPermission(machineIDs, RemotelyUser);
+            deviceIDs = DataService.FilterDeviceIDsByUserPermission(deviceIDs, RemotelyUser);
             if (!DataService.DoesGroupExist(RemotelyUser.Id, groupName))
             {
                 await Clients.Caller.SendAsync("DisplayConsoleMessage", "Permission group does not exist.");
                 return;
             }
-            DataService.RemovePermissionFromMachines(RemotelyUser.Id, machineIDs, groupName);
+            DataService.RemovePermissionFromDevices(RemotelyUser.Id, deviceIDs, groupName);
             await Clients.Caller.SendAsync("DisplayConsoleMessage", "Group removed.");
         }
-        public async Task DeployScript(string fileID, string mode, string[] machineIDs)
+        public async Task RemoveDevices(string[] deviceIDs)
         {
-            machineIDs = DataService.FilterMachineIDsByUserPermission(machineIDs, RemotelyUser);
-            var connections = GetActiveClientConnections(machineIDs);
-            var commandContext = new CommandContext()
-            {
-                CommandMode = mode,
-                CommandText = Encoding.UTF8.GetString(DataService.GetSharedFiled(fileID).FileContents),
-                SenderConnectionID = Context.ConnectionId,
-                SenderUserID = Context.UserIdentifier,
-                TargetMachineIDs = connections.Select(x => x.Value.ID).ToArray(),
-                OrganizationID = RemotelyUser.OrganizationID
-            };
-            DataService.AddOrUpdateCommandContext(commandContext);
-            await Clients.Caller.SendAsync("CommandContextCreated", commandContext);
-            foreach (var connection in connections)
-            {
-                await DeviceHub.Clients.Client(connection.Key).SendAsync("DeployScript", mode, fileID, commandContext.ID, Context.ConnectionId);
-            }
+            var filterDevices = DataService.FilterDeviceIDsByUserPermission(deviceIDs, RemotelyUser);
+            DataService.RemoveDevices(filterDevices);
+            await Clients.Caller.SendAsync("RefreshDeviceList");
         }
-        public async Task ExecuteCommandOnClient(string mode, string command, string[] machineIDs)
-        {
-            machineIDs = DataService.FilterMachineIDsByUserPermission(machineIDs, RemotelyUser);
-            var connections = GetActiveClientConnections(machineIDs);
-
-            var commandContext = new CommandContext()
-            {
-                CommandMode = mode,
-                CommandText = command,
-                SenderConnectionID = Context.ConnectionId,
-                SenderUserID = Context.UserIdentifier,
-                TargetMachineIDs = connections.Select(x => x.Value.ID).ToArray(),
-                OrganizationID = RemotelyUser.Organization.ID
-            };
-            DataService.AddOrUpdateCommandContext(commandContext);
-            await Clients.Caller.SendAsync("CommandContextCreated", commandContext);
-            foreach (var connection in connections)
-            {
-                await DeviceHub.Clients.Client(connection.Key).SendAsync("ExecuteCommand", mode, command, commandContext.ID, Context.ConnectionId);
-            }
-        }
-        public override async Task OnConnectedAsync()
-        {
-            RemotelyUser = DataService.GetUserByID(Context?.UserIdentifier);
-            if (IsConnectionValid()?.Result == false)
-            {
-                return;
-            }
-            await Groups.AddToGroupAsync(Context.ConnectionId, RemotelyUser.Organization.ID);
-            await Clients.Caller.SendAsync("UserOptions", RemotelyUser.UserOptions);
-            if (AppConfig.ShowMessageOfTheDay)
-            {
-                try
-                {
-                    var wc = new WebClient();
-                    var message = await wc.DownloadStringTaskAsync(new Uri("https://remotely.lucency.co/api/messageoftheday"));
-                    await Clients.Caller.SendAsync("DisplayConsoleHTML", message);
-                }
-                catch { }
-            }
-            await base.OnConnectedAsync();
-        }
-
-        public override async Task OnDisconnectedAsync(Exception exception)
-        {
-            await Groups.RemoveFromGroupAsync(Context.ConnectionId, RemotelyUser.Organization.ID);
-            await base.OnDisconnectedAsync(exception);
-        }
-
-        public async Task RemoteControl(string machineID)
-        {
-            if (DataService.DoesUserHaveAccessToMachine(machineID, RemotelyUser))
-            {
-                var targetMachine = DeviceSocketHub.ServiceConnections.FirstOrDefault(x => x.Value.ID == machineID);
-                var currentUsers = RCBrowserSocketHub.OrganizationConnectionList.Count(x => x.Value.OrganizationID == RemotelyUser.OrganizationID);
-                if (currentUsers >= AppConfig.RemoteControlSessionLimit)
-                {
-                    await Clients.Caller.SendAsync("DisplayConsoleMessage", $"There are already the maximum amount of active remote control sessions for your organization.");
-                    return;
-                }
-                await this.Clients.Caller.SendAsync("ServiceID", targetMachine.Key);
-                await DeviceHub.Clients.Client(targetMachine.Key).SendAsync("RemoteControl", Context.ConnectionId, targetMachine.Key);
-            }
-        }
-
-        public async Task RemoveMachines(string[] machineIDs)
-        {
-            var filterMachines = DataService.FilterMachineIDsByUserPermission(machineIDs, RemotelyUser);
-            DataService.RemoveMachines(filterMachines);
-            await Clients.Caller.SendAsync("RefreshMachineList");
-        }
-        public async Task TransferFiles(List<string> fileIDs, string transferID, string[] machineIDs)
+        public async Task TransferFiles(List<string> fileIDs, string transferID, string[] deviceIDs)
         {
             DataService.WriteEvent(new EventLog()
             {
@@ -173,43 +173,43 @@ namespace Remotely_Server.Services
                 TimeStamp = DateTime.Now,
                 OrganizationID = RemotelyUser.OrganizationID
             });
-            machineIDs = DataService.FilterMachineIDsByUserPermission(machineIDs, RemotelyUser);
-            var connections = GetActiveClientConnections(machineIDs);
+            deviceIDs = DataService.FilterDeviceIDsByUserPermission(deviceIDs, RemotelyUser);
+            var connections = GetActiveClientConnections(deviceIDs);
             foreach (var connection in connections)
             {
                 await DeviceHub.Clients.Client(connection.Key).SendAsync("TransferFiles", transferID, fileIDs, Context.ConnectionId);
             }
         }
-        public async Task UninstallClients(string[] machineIDs)
+        public async Task UninstallClients(string[] deviceIDs)
         {
-            machineIDs = DataService.FilterMachineIDsByUserPermission(machineIDs, RemotelyUser);
-            var connections = GetActiveClientConnections(machineIDs);
+            deviceIDs = DataService.FilterDeviceIDsByUserPermission(deviceIDs, RemotelyUser);
+            var connections = GetActiveClientConnections(deviceIDs);
             foreach (var connection in connections)
             {
                 await DeviceHub.Clients.Client(connection.Key).SendAsync("UninstallClient");
             }
-            DataService.RemoveMachines(machineIDs);
-            await Clients.Caller.SendAsync("RefreshMachineList");
+            DataService.RemoveDevices(deviceIDs);
+            await Clients.Caller.SendAsync("RefreshDeviceList");
         }
-        public async Task UpdateTags(string machineID, string tag)
+        public async Task UpdateTags(string deviceID, string tag)
         {
-            if (DataService.DoesUserHaveAccessToMachine(machineID, RemotelyUser))
+            if (DataService.DoesUserHaveAccessToDevice(deviceID, RemotelyUser))
             {
                 if (tag.Length > 200)
                 {
                     await Clients.Caller.SendAsync("DisplayConsoleMessage", $"Tag must be 200 characters or less. Supplied length is {tag.Length}.");
                     return;
                 }
-                DataService.UpdateTags(machineID, tag);
+                DataService.UpdateTags(deviceID, tag);
                 await Clients.Caller.SendAsync("DisplayConsoleMessage", "Tag updated successfully.");
             }
         }
 
-        private IEnumerable<KeyValuePair<string, Machine>> GetActiveClientConnections(string[] machineIDs)
+        private IEnumerable<KeyValuePair<string, Device>> GetActiveClientConnections(string[] deviceIDs)
         {
             return DeviceSocketHub.ServiceConnections.Where(x =>
                 x.Value.OrganizationID == RemotelyUser.Organization.ID &&
-                machineIDs.Contains(x.Value.ID)
+                deviceIDs.Contains(x.Value.ID)
             );
         }
         private async Task<bool> IsConnectionValid()
diff --git a/Remotely_Server/Services/DeviceSocketHub.cs b/Remotely_Server/Services/DeviceSocketHub.cs
index 58b67089..df0b2ad9 100644
--- a/Remotely_Server/Services/DeviceSocketHub.cs
+++ b/Remotely_Server/Services/DeviceSocketHub.cs
@@ -20,25 +20,109 @@ namespace Remotely_Server.Services
             DataService = dataService;
             BrowserHub = browserHub;
         }
-        
-        private DataService DataService { get; }
-        private IHubContext<BrowserSocketHub> BrowserHub { get; }
-        
-        public static ConcurrentDictionary<string, Machine> ServiceConnections { get; set; } = new ConcurrentDictionary<string, Machine>();
 
-        public override Task OnConnectedAsync()
-        {
+		public static ConcurrentDictionary<string, Device> ServiceConnections { get; set; } = new ConcurrentDictionary<string, Device>();
+		private IHubContext<BrowserSocketHub> BrowserHub { get; }
+		private DataService DataService { get; }
+		private Device Device
+		{
+			get
+			{
+				return this.Context.Items["Device"] as Device;
+			}
+			set
+			{
+				this.Context.Items["Device"] = value;
+			}
+		}
+
+		public async void BashResultViaAjax(string commandID)
+		{
+			var commandContext = DataService.GetCommandContext(commandID);
+			await BrowserHub.Clients.Client(commandContext.SenderConnectionID).SendAsync("BashResultViaAjax", commandID, Device.ID);
+		}
+
+		public async void CMDResultViaAjax(string commandID)
+		{
+			var commandContext = DataService.GetCommandContext(commandID);
+			await BrowserHub.Clients.Client(commandContext.SenderConnectionID).SendAsync("CMDResultViaAjax", commandID, Device.ID);
+		}
+
+		public async Task CommandResult(GenericCommandResult result)
+		{
+			result.DeviceID = Device.ID;
+			var commandContext = DataService.GetCommandContext(result.CommandContextID);
+			commandContext.CommandResults.Add(result);
+			DataService.AddOrUpdateCommandContext(commandContext);
+			await BrowserHub.Clients.Client(commandContext.SenderConnectionID).SendAsync("CommandResult", result);
+		}
+
+		public async Task DisplayConsoleMessage(string message, string requesterID)
+		{
+			await BrowserHub.Clients.Client(requesterID).SendAsync("DisplayConsoleMessage", message);
+		}
+
+		public async Task DeviceCameOnline(Device device)
+		{
+			if (ServiceConnections.Any(x => x.Value.ID == device.ID))
+			{
+				DataService.WriteEvent(new EventLog()
+				{
+					EventType = EventTypes.Info,
+					OrganizationID = Device.OrganizationID,
+					Message = $"Device connection for {device.DeviceName} was denied because it is already connected."
+				});
+				Context.Abort();
+				return;
+			}
+			device.IsOnline = true;
+			device.LastOnline = DateTime.Now;
+			Device = device;
+			if (DataService.AddOrUpdateDevice(device))
+			{
+				var failCount = 0;
+				while (!ServiceConnections.TryAdd(Context.ConnectionId, device))
+				{
+					if (failCount > 3)
+					{
+						Context.Abort();
+						return;
+					}
+					failCount++;
+					await Task.Delay(1000);
+				}
+				await this.Groups.AddToGroupAsync(this.Context.ConnectionId, device.OrganizationID);
+				await BrowserHub.Clients.Group(Device.OrganizationID).SendAsync("DeviceCameOnline", Device);
+			}
+			else
+			{
+				// Organization wasn't found.
+				await Clients.Caller.SendAsync("UninstallClient");
+			}
+		}
+
+		public async Task DeviceHeartbeat(Device device)
+		{
+			device.IsOnline = true;
+			device.LastOnline = DateTime.Now;
+			Device = device;
+			DataService.AddOrUpdateDevice(device);
+			await BrowserHub.Clients.Group(Device.OrganizationID).SendAsync("DeviceHeartbeat", Device);
+		}
+
+		public override Task OnConnectedAsync()
+		{
             return base.OnConnectedAsync();
         }
         public override async Task OnDisconnectedAsync(Exception exception)
         {
-            if (Machine != null)
+            if (Device != null)
             {
-                DataService.MachineDisconnected(Machine.ID);
-                await this.Groups.RemoveFromGroupAsync(this.Context.ConnectionId, Machine.OrganizationID);
-                Machine.IsOnline = false;
-                await BrowserHub.Clients.Group(Machine.OrganizationID).SendAsync("MachineWentOffline", Machine);
-                while (!ServiceConnections.TryRemove(Context.ConnectionId, out var machine))
+                DataService.DeviceDisconnected(Device.ID);
+                await this.Groups.RemoveFromGroupAsync(this.Context.ConnectionId, Device.OrganizationID);
+                Device.IsOnline = false;
+                await BrowserHub.Clients.Group(Device.OrganizationID).SendAsync("DeviceWentOffline", Device);
+                while (!ServiceConnections.TryRemove(Context.ConnectionId, out var device))
                 {
                     await Task.Delay(1000);
                 }
@@ -46,120 +130,38 @@ namespace Remotely_Server.Services
             
             await base.OnDisconnectedAsync(exception);
         }
-        public async Task MachineCameOnline(Machine machine)
-        {
-            if (ServiceConnections.Any(x=>x.Value.ID == machine.ID))
-            {
-                DataService.WriteEvent(new EventLog()
-                {
-                    EventType = EventTypes.Info,
-                    OrganizationID = Machine.OrganizationID,
-                    Message = $"Machine connection for {machine.MachineName} was denied because it is already connected."
-                });
-                Context.Abort();
-                return;
-            }
-            machine.IsOnline = true;
-            machine.LastOnline = DateTime.Now;
-            Machine = machine;
-            if (DataService.AddOrUpdateMachine(machine))
-            {
-                var failCount = 0;
-                while (!ServiceConnections.TryAdd(Context.ConnectionId, machine))
-                {
-                    if (failCount > 3)
-                    {
-                        Context.Abort();
-                        return;
-                    }
-                    failCount++;
-                    await Task.Delay(1000);
-                }
-                await this.Groups.AddToGroupAsync(this.Context.ConnectionId, machine.OrganizationID);
-                await BrowserHub.Clients.Group(Machine.OrganizationID).SendAsync("MachineCameOnline", Machine);
-            }
-            else
-            {
-                // Organization wasn't found.
-                await Clients.Caller.SendAsync("UninstallClient");
-            }
-        }
-        
-        public async Task MachineHeartbeat(Machine machine)
-        {
-            machine.IsOnline = true;
-            machine.LastOnline = DateTime.Now;
-            Machine = machine;
-            DataService.AddOrUpdateMachine(machine);
-            await BrowserHub.Clients.Group(Machine.OrganizationID).SendAsync("MachineHeartbeat", Machine);
-        }
         public async Task PSCoreResult(PSCoreCommandResult result)
         {
-            result.MachineID = Machine.ID;
+            result.DeviceID = Device.ID;
             var commandContext = DataService.GetCommandContext(result.CommandContextID);
             commandContext.PSCoreResults.Add(result);
             DataService.AddOrUpdateCommandContext(commandContext);
             await BrowserHub.Clients.Client(commandContext.SenderConnectionID).SendAsync("PSCoreResult", result);
         }
-        public async Task CommandResult(GenericCommandResult result)
-        {
-            result.MachineID = Machine.ID;
-            var commandContext = DataService.GetCommandContext(result.CommandContextID);
-            commandContext.CommandResults.Add(result);
-            DataService.AddOrUpdateCommandContext(commandContext);
-            await BrowserHub.Clients.Client(commandContext.SenderConnectionID).SendAsync("CommandResult", result);
-        }
-        public async Task DisplayConsoleMessage(string message, string requesterID)
-        {
-            await BrowserHub.Clients.Client(requesterID).SendAsync("DisplayConsoleMessage", message);
-        }
-       
-        public async Task SendServerVerificationToken()
-        {
-            await Clients.Caller.SendAsync("ServerVerificationToken", Machine.ServerVerificationToken);
+		public async void PSCoreResultViaAjax(string commandID)
+		{
+			var commandContext = DataService.GetCommandContext(commandID);
+			await BrowserHub.Clients.Client(commandContext.SenderConnectionID).SendAsync("PSCoreResultViaAjax", commandID, Device.ID);
+		}
+
+		public async Task SendServerVerificationToken()
+		{
+            await Clients.Caller.SendAsync("ServerVerificationToken", Device.ServerVerificationToken);
         }
         public void SetServerVerificationToken(string verificationToken)
         {
-            Machine.ServerVerificationToken = verificationToken;
-            DataService.SetServerVerificationToken(Machine.ID, verificationToken);
+            Device.ServerVerificationToken = verificationToken;
+            DataService.SetServerVerificationToken(Device.ID, verificationToken);
         }
 
         public async void TransferCompleted(string transferID, string requesterID)
         {
             await BrowserHub.Clients.Client(requesterID).SendAsync("TransferCompleted", transferID);
         }
-        public async void PSCoreResultViaAjax(string commandID)
-        {
-            var commandContext = DataService.GetCommandContext(commandID);
-            await BrowserHub.Clients.Client(commandContext.SenderConnectionID).SendAsync("PSCoreResultViaAjax", commandID, Machine.ID);
-        }
-        public async void CMDResultViaAjax(string commandID)
-        {
-            var commandContext = DataService.GetCommandContext(commandID);
-            await BrowserHub.Clients.Client(commandContext.SenderConnectionID).SendAsync("CMDResultViaAjax", commandID, Machine.ID);
-        }
         public async void WinPSResultViaAjax(string commandID)
         {
             var commandContext = DataService.GetCommandContext(commandID);
-            await BrowserHub.Clients.Client(commandContext.SenderConnectionID).SendAsync("WinPSResultViaAjax", commandID, Machine.ID);
+            await BrowserHub.Clients.Client(commandContext.SenderConnectionID).SendAsync("WinPSResultViaAjax", commandID, Device.ID);
         }
-        public async void BashResultViaAjax(string commandID)
-        {
-            var commandContext = DataService.GetCommandContext(commandID);
-            await BrowserHub.Clients.Client(commandContext.SenderConnectionID).SendAsync("BashResultViaAjax", commandID, Machine.ID);
-        }
-        private Machine Machine
-        {
-            get
-            {
-                return this.Context.Items["Machine"] as Machine;
-            }
-            set
-            {
-                this.Context.Items["Machine"] = value;
-            }
-        }
-
-      
     }
 }
diff --git a/Remotely_Server/Services/RCDeviceSocketHub.cs b/Remotely_Server/Services/RCDeviceSocketHub.cs
index 8fe60aa5..781d8273 100644
--- a/Remotely_Server/Services/RCDeviceSocketHub.cs
+++ b/Remotely_Server/Services/RCDeviceSocketHub.cs
@@ -55,14 +55,12 @@ namespace Remotely_Server.Services
         {
             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);
+            await RCBrowserHub.Clients.Client(rcBrowserHubConnectionID).SendAsync("ScreenCapture", captureBytes);
         }
+
         public async Task NotifyRequesterUnattendedReady(string browserHubConnectionID)
         {
             await BrowserHub.Clients.Client(browserHubConnectionID).SendAsync("UnattendedSessionReady", Context.ConnectionId);
diff --git a/Remotely_Server/Startup.cs b/Remotely_Server/Startup.cs
index fe0611ec..a0703309 100644
--- a/Remotely_Server/Startup.cs
+++ b/Remotely_Server/Startup.cs
@@ -136,11 +136,19 @@ namespace Remotely_Server
                     options.ApplicationMaxBufferSize = 500000;
                     options.TransportMaxBufferSize = 500000;
                 });
-                routes.MapHub<RCDeviceSocketHub>("/RCDeviceHub");
-                routes.MapHub<RCBrowserSocketHub>("/RCBrowserHub");
+                routes.MapHub<RCDeviceSocketHub>("/RCDeviceHub", options =>
+                {
+                    options.ApplicationMaxBufferSize = 1000000;
+                    options.TransportMaxBufferSize = 1000000;
+                });
+                routes.MapHub<RCBrowserSocketHub>("/RCBrowserHub", options =>
+                {
+                    options.ApplicationMaxBufferSize = 1000000;
+                    options.TransportMaxBufferSize = 1000000;
+                });
             });
             app.UseMvcWithDefaultRoute();
-            dataService.SetAllMachinesNotOnline();
+            dataService.SetAllDevicesNotOnline();
             dataService.CleanupEmptyOrganizations();
             dataService.CleanupOldRecords();
         }
diff --git a/Remotely_Server/wwwroot/Downloads/Install-Linux-x64.sh b/Remotely_Server/wwwroot/Downloads/Install-Linux-x64.sh
index b2929d96..d0133e16 100644
--- a/Remotely_Server/wwwroot/Downloads/Install-Linux-x64.sh
+++ b/Remotely_Server/wwwroot/Downloads/Install-Linux-x64.sh
@@ -29,7 +29,7 @@ chmod +x ./Remotely_Agent
 
 cat > ./ConnectionInfo.json << EOL
 {
-	"MachineID":"$GUID", 
+	"DeviceID":"$GUID", 
 	"Host":"$HostName",
 	"OrganizationID": "$Organization",
 	"ServerVerificationToken":""
diff --git a/Remotely_Server/wwwroot/Downloads/Install-Win10-x64.ps1 b/Remotely_Server/wwwroot/Downloads/Install-Win10-x64.ps1
index d77440d2..ea20686e 100644
--- a/Remotely_Server/wwwroot/Downloads/Install-Win10-x64.ps1
+++ b/Remotely_Server/wwwroot/Downloads/Install-Win10-x64.ps1
@@ -35,7 +35,7 @@ function Is-Administrator() {
 
 function Run-StartupChecks {
 	if ([System.Environment]::Is64BitOperatingSystem -eq $false){
-		Write-Log -Message "This script is for 64-bit operating systems.  Use the x86 (32-bit) install script on this machine."
+		Write-Log -Message "This script is for 64-bit operating systems.  Use the x86 (32-bit) install script on this device."
 		Do-Exit
 	}
 	if ([System.Environment]::Is64BitProcess -eq $false) {
@@ -83,7 +83,7 @@ function Install-Remotely {
 
 	if ($ConnectionInfo -eq $null) {
 		$ConnectionInfo = @{
-			MachineID = (New-Guid).ToString();
+			DeviceID = (New-Guid).ToString();
 			Host = $HostName;
 			OrganizationID = $Organization;
 			ServerVerificationToken = "";
diff --git a/Remotely_Server/wwwroot/Downloads/Install-Win10-x86.ps1 b/Remotely_Server/wwwroot/Downloads/Install-Win10-x86.ps1
index f7661a93..95a563b6 100644
--- a/Remotely_Server/wwwroot/Downloads/Install-Win10-x86.ps1
+++ b/Remotely_Server/wwwroot/Downloads/Install-Win10-x86.ps1
@@ -35,7 +35,7 @@ function Is-Administrator() {
 
 function Run-StartupChecks {
 	if ([System.Environment]::Is64BitOperatingSystem -eq $true){
-		Write-Log -Message "This script is for 32-bit operating systems.  Use the x64 (64-bit) install script on this machine."
+		Write-Log -Message "This script is for 32-bit operating systems.  Use the x64 (64-bit) install script on this device."
 		Do-Exit
 	}
 
@@ -80,7 +80,7 @@ function Install-Remotely {
 
 	if ($ConnectionInfo -eq $null) {
 		$ConnectionInfo = @{
-			MachineID = (New-Guid).ToString();
+			DeviceID = (New-Guid).ToString();
 			Host = $HostName;
 			OrganizationID = $Organization;
 			ServerVerificationToken = "";
diff --git a/Remotely_Server/wwwroot/css/Themes/cyborg.custom.css b/Remotely_Server/wwwroot/css/Themes/cyborg.custom.css
index f25da4f6..a5d3a6eb 100644
--- a/Remotely_Server/wwwroot/css/Themes/cyborg.custom.css
+++ b/Remotely_Server/wwwroot/css/Themes/cyborg.custom.css
@@ -75,14 +75,10 @@ button.navbar-toggler:hover {
 .echo-input {
     color:gray;
 }
-.machine-tag {
+.device-tag {
     color: black;
 }
 
-.console-output table.console-machine-table {
-    color: limegreen;
-}
-
 #commandCompletionDiv {
     color: white;
     background-color: rgb(25, 25, 25);
diff --git a/Remotely_Server/wwwroot/scripts/BrowserSockets.js b/Remotely_Server/wwwroot/scripts/BrowserSockets.js
index f2f02f90..e4900eef 100644
--- a/Remotely_Server/wwwroot/scripts/BrowserSockets.js
+++ b/Remotely_Server/wwwroot/scripts/BrowserSockets.js
@@ -42,16 +42,16 @@ function applyMessageHandlers(hubConnection) {
     hubConnection.on("LockedOut", (args) => {
         location.assign("/Identity/Account/Lockout");
     });
-    hubConnection.on("MachineCameOnline", (machine) => {
-        DataGrid.AddOrUpdateMachine(machine);
+    hubConnection.on("DeviceCameOnline", (device) => {
+        DataGrid.AddOrUpdateDevice(device);
     });
-    hubConnection.on("MachineWentOffline", (machine) => {
-        DataGrid.AddOrUpdateMachine(machine);
+    hubConnection.on("DeviceWentOffline", (device) => {
+        DataGrid.AddOrUpdateDevice(device);
     });
-    hubConnection.on("MachineHeartbeat", (machine) => {
-        DataGrid.AddOrUpdateMachine(machine);
+    hubConnection.on("DeviceHeartbeat", (device) => {
+        DataGrid.AddOrUpdateDevice(device);
     });
-    hubConnection.on("RefreshMachineList", () => {
+    hubConnection.on("RefreshDeviceList", () => {
         DataGrid.RefreshGrid();
     });
     hubConnection.on("PSCoreResult", (result) => {
@@ -73,8 +73,8 @@ function applyMessageHandlers(hubConnection) {
         var count = parseInt(completedWrapper.innerHTML);
         completedWrapper.innerHTML = (count + 1).toString();
     });
-    hubConnection.on("PSCoreResultViaAjax", (commandID, machineID) => {
-        var targetURL = `${location.origin}/API/Commands/PSCoreResult/${commandID}/${machineID}`;
+    hubConnection.on("PSCoreResultViaAjax", (commandID, deviceID) => {
+        var targetURL = `${location.origin}/API/Commands/PSCoreResult/${commandID}/${deviceID}`;
         var xhr = new XMLHttpRequest();
         xhr.open("get", targetURL);
         xhr.onload = function () {
@@ -85,8 +85,8 @@ function applyMessageHandlers(hubConnection) {
         };
         xhr.send();
     });
-    hubConnection.on("WinPSResultViaAjax", (commandID, machineID) => {
-        var targetURL = `${location.origin}/API/Commands/WinPSResult/${commandID}/${machineID}`;
+    hubConnection.on("WinPSResultViaAjax", (commandID, deviceID) => {
+        var targetURL = `${location.origin}/API/Commands/WinPSResult/${commandID}/${deviceID}`;
         var xhr = new XMLHttpRequest();
         xhr.open("get", targetURL);
         xhr.onload = function () {
@@ -97,8 +97,8 @@ function applyMessageHandlers(hubConnection) {
         };
         xhr.send();
     });
-    hubConnection.on("CMDResultViaAjax", (commandID, machineID) => {
-        var targetURL = `${location.origin}/API/Commands/PSCoreResult/${commandID}/${machineID}`;
+    hubConnection.on("CMDResultViaAjax", (commandID, deviceID) => {
+        var targetURL = `${location.origin}/API/Commands/PSCoreResult/${commandID}/${deviceID}`;
         var xhr = new XMLHttpRequest();
         xhr.open("get", targetURL);
         xhr.onload = function () {
@@ -109,8 +109,8 @@ function applyMessageHandlers(hubConnection) {
         };
         xhr.send();
     });
-    hubConnection.on("BashResultViaAjax", (commandID, machineID) => {
-        var targetURL = `${location.origin}/API/Commands/PSCoreResult/${commandID}/${machineID}`;
+    hubConnection.on("BashResultViaAjax", (commandID, deviceID) => {
+        var targetURL = `${location.origin}/API/Commands/PSCoreResult/${commandID}/${deviceID}`;
         var xhr = new XMLHttpRequest();
         xhr.open("get", targetURL);
         xhr.onload = function () {
diff --git a/Remotely_Server/wwwroot/scripts/BrowserSockets.js.map b/Remotely_Server/wwwroot/scripts/BrowserSockets.js.map
index 196f6199..c2c65ba5 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 013c56de..6b0feb2c 100644
--- a/Remotely_Server/wwwroot/scripts/BrowserSockets.ts
+++ b/Remotely_Server/wwwroot/scripts/BrowserSockets.ts
@@ -1,6 +1,6 @@
 import * as UI from "./UI.js";
 import * as DataGrid from "./DataGrid.js";
-import { Machine } from "./Models/Machine.js";
+import { Device } from "./Models/Device.js";
 import { PSCoreCommandResult } from "./Models/PSCoreCommandResult.js";
 import { GenericCommandResult } from "./Models/GenericCommandResult.js";
 import { CommandContext } from "./Models/CommandContext.js";
@@ -53,17 +53,17 @@ function applyMessageHandlers(hubConnection) {
         location.assign("/Identity/Account/Lockout");
     });
 
-    hubConnection.on("MachineCameOnline", (machine:Machine) => {
-        DataGrid.AddOrUpdateMachine(machine);
+    hubConnection.on("DeviceCameOnline", (device:Device) => {
+        DataGrid.AddOrUpdateDevice(device);
     });
-    hubConnection.on("MachineWentOffline", (machine: Machine) => {
-        DataGrid.AddOrUpdateMachine(machine);
+    hubConnection.on("DeviceWentOffline", (device: Device) => {
+        DataGrid.AddOrUpdateDevice(device);
     });
-    hubConnection.on("MachineHeartbeat", (machine: Machine) => {
-        DataGrid.AddOrUpdateMachine(machine);
+    hubConnection.on("DeviceHeartbeat", (device: Device) => {
+        DataGrid.AddOrUpdateDevice(device);
     });
 
-    hubConnection.on("RefreshMachineList", () => {
+    hubConnection.on("RefreshDeviceList", () => {
         DataGrid.RefreshGrid();
     });
 
@@ -86,8 +86,8 @@ function applyMessageHandlers(hubConnection) {
         var count = parseInt(completedWrapper.innerHTML);
         completedWrapper.innerHTML = (count + 1).toString();
     })
-    hubConnection.on("PSCoreResultViaAjax", (commandID: string, machineID: string) => {
-        var targetURL = `${location.origin}/API/Commands/PSCoreResult/${commandID}/${machineID}`;
+    hubConnection.on("PSCoreResultViaAjax", (commandID: string, deviceID: string) => {
+        var targetURL = `${location.origin}/API/Commands/PSCoreResult/${commandID}/${deviceID}`;
         var xhr = new XMLHttpRequest();
         xhr.open("get", targetURL);
         xhr.onload = function () {
@@ -98,8 +98,8 @@ function applyMessageHandlers(hubConnection) {
         };
         xhr.send();
     });
-    hubConnection.on("WinPSResultViaAjax", (commandID: string, machineID: string) => {
-        var targetURL = `${location.origin}/API/Commands/WinPSResult/${commandID}/${machineID}`;
+    hubConnection.on("WinPSResultViaAjax", (commandID: string, deviceID: string) => {
+        var targetURL = `${location.origin}/API/Commands/WinPSResult/${commandID}/${deviceID}`;
         var xhr = new XMLHttpRequest();
         xhr.open("get", targetURL);
         xhr.onload = function () {
@@ -110,8 +110,8 @@ function applyMessageHandlers(hubConnection) {
         };
         xhr.send();
     });
-    hubConnection.on("CMDResultViaAjax", (commandID: string, machineID: string) => {
-        var targetURL = `${location.origin}/API/Commands/PSCoreResult/${commandID}/${machineID}`;
+    hubConnection.on("CMDResultViaAjax", (commandID: string, deviceID: string) => {
+        var targetURL = `${location.origin}/API/Commands/PSCoreResult/${commandID}/${deviceID}`;
         var xhr = new XMLHttpRequest();
         xhr.open("get", targetURL);
         xhr.onload = function () {
@@ -122,8 +122,8 @@ function applyMessageHandlers(hubConnection) {
         };
         xhr.send();
     });
-    hubConnection.on("BashResultViaAjax", (commandID: string, machineID: string) => {
-        var targetURL = `${location.origin}/API/Commands/PSCoreResult/${commandID}/${machineID}`;
+    hubConnection.on("BashResultViaAjax", (commandID: string, deviceID: string) => {
+        var targetURL = `${location.origin}/API/Commands/PSCoreResult/${commandID}/${deviceID}`;
         var xhr = new XMLHttpRequest();
         xhr.open("get", targetURL);
         xhr.onload = function () {
diff --git a/Remotely_Server/wwwroot/scripts/CommandCompletion.js b/Remotely_Server/wwwroot/scripts/CommandCompletion.js
index 3d3fa3c3..8c8368f3 100644
--- a/Remotely_Server/wwwroot/scripts/CommandCompletion.js
+++ b/Remotely_Server/wwwroot/scripts/CommandCompletion.js
@@ -124,7 +124,7 @@ export function PositionCommandCompletionWindow() {
     var computedStyle = window.getComputedStyle(UI.ConsoleTextArea);
     UI.MeasurementContext.font = computedStyle.fontSize + " " + computedStyle.fontFamily;
     var width = UI.MeasurementContext.measureText(UI.ConsoleTextArea.value).width;
-    UI.CommandCompletionDiv.style.marginLeft = String(width) + "px";
+    UI.CommandCompletionDiv.style.marginLeft = String(width + 10) + "px";
     var wrapper = document.querySelector("#commandCompletionWrapper");
     var inputRect = UI.ConsoleTextArea.getBoundingClientRect();
     wrapper.style.left = String(inputRect.left) + "px";
diff --git a/Remotely_Server/wwwroot/scripts/CommandCompletion.js.map b/Remotely_Server/wwwroot/scripts/CommandCompletion.js.map
index 35d13fea..dd076074 100644
--- a/Remotely_Server/wwwroot/scripts/CommandCompletion.js.map
+++ b/Remotely_Server/wwwroot/scripts/CommandCompletion.js.map
@@ -1 +1 @@
-{"version":3,"file":"CommandCompletion.js","sourceRoot":"","sources":["CommandCompletion.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"CommandCompletion.js","sourceRoot":"","sources":["CommandCompletion.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/CommandCompletion.ts b/Remotely_Server/wwwroot/scripts/CommandCompletion.ts
index 32d69bc1..8432b28a 100644
--- a/Remotely_Server/wwwroot/scripts/CommandCompletion.ts
+++ b/Remotely_Server/wwwroot/scripts/CommandCompletion.ts
@@ -142,7 +142,7 @@ export function PositionCommandCompletionWindow() {
     var computedStyle = window.getComputedStyle(UI.ConsoleTextArea);
     UI.MeasurementContext.font = computedStyle.fontSize + " " + computedStyle.fontFamily;
     var width = UI.MeasurementContext.measureText(UI.ConsoleTextArea.value).width;
-    UI.CommandCompletionDiv.style.marginLeft = String(width) + "px";
+    UI.CommandCompletionDiv.style.marginLeft = String(width + 10) + "px";
 
     var wrapper = document.querySelector("#commandCompletionWrapper") as HTMLDivElement;
     var inputRect = UI.ConsoleTextArea.getBoundingClientRect();
diff --git a/Remotely_Server/wwwroot/scripts/CommandProcessor.js b/Remotely_Server/wwwroot/scripts/CommandProcessor.js
index 069ca9d4..43d10466 100644
--- a/Remotely_Server/wwwroot/scripts/CommandProcessor.js
+++ b/Remotely_Server/wwwroot/scripts/CommandProcessor.js
@@ -33,7 +33,7 @@ export function EvaluateCurrentCommandText() {
         switch (UI.CommandModeSelect.value) {
             case "PSCore":
             case "WinPS":
-            case "Remotely":
+            case "Web":
                 var parameters = ExtractParameters(UI.ConsoleTextArea.value);
                 DisplayParameterCompletions(matchingCommands[0], parameters, relevantText);
                 break;
@@ -132,23 +132,23 @@ export function ProcessCommand() {
         case "WinPS":
         case "CMD":
         case "Bash":
-            var allMachines = Main.DataGrid.GetSelectedMachines();
-            var windowsMachines = allMachines.filter(x => x.Platform.toLowerCase() == "windows");
-            var linuxMachines = allMachines.filter(x => x.Platform.toLowerCase() == "linux");
-            if (commandMode == "CMD" && linuxMachines.length > 0) {
-                UI.AddConsoleOutput("Linux machines will be excluded from CMD command.");
-                allMachines = windowsMachines;
+            var allDevices = Main.DataGrid.GetSelectedDevices();
+            var windowsDevices = allDevices.filter(x => x.Platform.toLowerCase() == "windows");
+            var linuxDevices = allDevices.filter(x => x.Platform.toLowerCase() == "linux");
+            if (commandMode == "CMD" && linuxDevices.length > 0) {
+                UI.AddConsoleOutput("Linux devices will be excluded from CMD command.");
+                allDevices = windowsDevices;
             }
-            if (commandMode == "Bash" && windowsMachines.length > 0) {
-                UI.AddConsoleOutput("Windows machines will be excluded from Bash command.");
-                allMachines = linuxMachines;
+            if (commandMode == "Bash" && windowsDevices.length > 0) {
+                UI.AddConsoleOutput("Windows devices will be excluded from Bash command.");
+                allDevices = linuxDevices;
             }
-            if (allMachines.length == 0) {
-                UI.AddConsoleOutput("At least one machine must be selected to send commands.");
+            if (allDevices.length == 0) {
+                UI.AddConsoleOutput("At least one device must be selected to send commands.");
                 return;
             }
-            var machineIDs = allMachines.map(value => value.ID);
-            Connection.invoke("ExecuteCommandOnClient", commandMode, commandText, machineIDs);
+            var deviceIDs = allDevices.map(value => value.ID);
+            Connection.invoke("ExecuteCommandOnClient", commandMode, commandText, deviceIDs);
             break;
         default:
             break;
diff --git a/Remotely_Server/wwwroot/scripts/CommandProcessor.js.map b/Remotely_Server/wwwroot/scripts/CommandProcessor.js.map
index 42e27672..ec8730cf 100644
--- a/Remotely_Server/wwwroot/scripts/CommandProcessor.js.map
+++ b/Remotely_Server/wwwroot/scripts/CommandProcessor.js.map
@@ -1 +1 @@
-{"version":3,"file":"CommandProcessor.js","sourceRoot":"","sources":["CommandProcessor.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"CommandProcessor.js","sourceRoot":"","sources":["CommandProcessor.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/CommandProcessor.ts b/Remotely_Server/wwwroot/scripts/CommandProcessor.ts
index c1c640f0..99e85c74 100644
--- a/Remotely_Server/wwwroot/scripts/CommandProcessor.ts
+++ b/Remotely_Server/wwwroot/scripts/CommandProcessor.ts
@@ -38,7 +38,7 @@ export function EvaluateCurrentCommandText() {
         switch (UI.CommandModeSelect.value) {
             case "PSCore":
             case "WinPS":
-            case "Remotely":
+            case "Web":
                 var parameters = ExtractParameters(UI.ConsoleTextArea.value);
                 DisplayParameterCompletions(matchingCommands[0], parameters, relevantText);
                 break;
@@ -141,25 +141,25 @@ export function ProcessCommand() {
         case "WinPS":
         case "CMD":
         case "Bash":
-            var allMachines = Main.DataGrid.GetSelectedMachines();
-            var windowsMachines = allMachines.filter(x => x.Platform.toLowerCase() == "windows");
-            var linuxMachines = allMachines.filter(x => x.Platform.toLowerCase() == "linux");
+            var allDevices = Main.DataGrid.GetSelectedDevices();
+            var windowsDevices = allDevices.filter(x => x.Platform.toLowerCase() == "windows");
+            var linuxDevices = allDevices.filter(x => x.Platform.toLowerCase() == "linux");
 
-            if (commandMode == "CMD" && linuxMachines.length > 0) {
-                UI.AddConsoleOutput("Linux machines will be excluded from CMD command.");
-                allMachines = windowsMachines;
+            if (commandMode == "CMD" && linuxDevices.length > 0) {
+                UI.AddConsoleOutput("Linux devices will be excluded from CMD command.");
+                allDevices = windowsDevices;
             }
-            if (commandMode == "Bash" && windowsMachines.length > 0) {
-                UI.AddConsoleOutput("Windows machines will be excluded from Bash command.");
-                allMachines = linuxMachines;
+            if (commandMode == "Bash" && windowsDevices.length > 0) {
+                UI.AddConsoleOutput("Windows devices will be excluded from Bash command.");
+                allDevices = linuxDevices;
             }
 
-            if (allMachines.length == 0) {
-                UI.AddConsoleOutput("At least one machine must be selected to send commands.");
+            if (allDevices.length == 0) {
+                UI.AddConsoleOutput("At least one device must be selected to send commands.");
                 return;
             }
-            var machineIDs = allMachines.map(value => value.ID);
-            Connection.invoke("ExecuteCommandOnClient", commandMode, commandText, machineIDs );
+            var deviceIDs = allDevices.map(value => value.ID);
+            Connection.invoke("ExecuteCommandOnClient", commandMode, commandText, deviceIDs );
             break;
         default:
             break;
diff --git a/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js b/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js
index 7067bf7e..e3923456 100644
--- a/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js
+++ b/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js
@@ -5,14 +5,14 @@ import * as BrowserSockets from "../BrowserSockets.js";
 import { Main } from "../Main.js";
 import * as DataGrid from "../DataGrid.js";
 import { AddConsoleOutput } from "../UI.js";
-import { GetSelectedMachines } from "../DataGrid.js";
+import { GetSelectedDevices } from "../DataGrid.js";
 var commands = [
     new ConsoleCommand("AddGroup", [
         new Parameter("group", "The group name to add.", "String")
-    ], "Adds a permission group to the selected computer(s).", "AddGroup -group Lab Machines", "", (parameters, paramDictionary) => {
-        var selectedMachines = Main.DataGrid.GetSelectedMachines();
-        if (selectedMachines.length == 0) {
-            AddConsoleOutput("No machines are selected.");
+    ], "Adds a permission group to the selected computer(s).", "AddGroup -group Lab Devices", "", (parameters, paramDictionary) => {
+        var selectedDevices = Main.DataGrid.GetSelectedDevices();
+        if (selectedDevices.length == 0) {
+            AddConsoleOutput("No devices are selected.");
             return;
         }
         ;
@@ -20,21 +20,21 @@ var commands = [
             AddConsoleOutput("A group name is required.");
             return;
         }
-        BrowserSockets.Connection.invoke("AddGroup", selectedMachines.map(x => x.ID), paramDictionary["group"]);
+        BrowserSockets.Connection.invoke("AddGroup", selectedDevices.map(x => x.ID), paramDictionary["group"]);
     }),
     new ConsoleCommand("DeployScript", [
         new Parameter("pscore", "Indicates that script should be run with PowerShell Core.", "Switch"),
         new Parameter("winps", "Indicates that script should be run with Windows PowerShell.", "Switch"),
         new Parameter("cmd", "Indicates that script should be run with Windows CMD.", "Switch"),
         new Parameter("bash", "Indicates that script should be run with Bash.", "Switch")
-    ], "Deploy and run a script on the selected machine(s).  Note: Only one switch argument can be used.", "deployscript -pscore", "", (parameters, parameterDict) => {
+    ], "Deploy and run a script on the selected device(s).  Note: Only one switch argument can be used.", "deployscript -pscore", "", (parameters, parameterDict) => {
         if (parameters.length != 1) {
             AddConsoleOutput("There should be exactly 1 argument to indicate the script type.");
             return;
         }
-        var selectedMachines = Main.DataGrid.GetSelectedMachines();
-        if (selectedMachines.length == 0) {
-            AddConsoleOutput("No machines are selected.");
+        var selectedDevices = Main.DataGrid.GetSelectedDevices();
+        if (selectedDevices.length == 0) {
+            AddConsoleOutput("No devices are selected.");
             return;
         }
         var fileInput = document.createElement("input");
@@ -43,7 +43,7 @@ var commands = [
         document.body.appendChild(fileInput);
         fileInput.onchange = () => {
             uploadFiles(fileInput.files).then(value => {
-                BrowserSockets.Connection.invoke("DeployScript", value[0], parameters[0].Name, selectedMachines.map(x => x.ID));
+                BrowserSockets.Connection.invoke("DeployScript", value[0], parameters[0].Name, selectedDevices.map(x => x.ID));
                 fileInput.remove();
             });
         };
@@ -51,10 +51,10 @@ var commands = [
     }),
     new ConsoleCommand("RemoveGroup", [
         new Parameter("group", "The group name to remove.", "String")
-    ], "Removes a permission group to the selected computer(s).", "RemoveGroup -group Lab Machines", "", (parameters, paramDictionary) => {
-        var selectedMachines = Main.DataGrid.GetSelectedMachines();
-        if (selectedMachines.length == 0) {
-            AddConsoleOutput("No machines are selected.");
+    ], "Removes a permission group to the selected computer(s).", "RemoveGroup -group Lab Devices", "", (parameters, paramDictionary) => {
+        var selectedDevices = Main.DataGrid.GetSelectedDevices();
+        if (selectedDevices.length == 0) {
+            AddConsoleOutput("No devices are selected.");
             return;
         }
         ;
@@ -62,7 +62,7 @@ var commands = [
             AddConsoleOutput("A group name is required.");
             return;
         }
-        BrowserSockets.Connection.invoke("RemoveGroup", selectedMachines.map(x => x.ID), paramDictionary["group"]);
+        BrowserSockets.Connection.invoke("RemoveGroup", selectedDevices.map(x => x.ID), paramDictionary["group"]);
     }),
     new ConsoleCommand("Clear", [], "Clears the output window of text.", "clear", "", (parameters, paramDictionary) => { UI.ConsoleOutputDiv.innerHTML = ""; }),
     new ConsoleCommand("Connect", [], "Connect or reconnect to the server.", "connect", "", (parameters, paramDictionary) => { BrowserSockets.Connect(); }),
@@ -107,23 +107,23 @@ var commands = [
             UI.AddConsoleHTML(outputText);
         }
     }),
-    new ConsoleCommand("List", [], "Displays a list of the currently-selected machines.", "list", "", () => {
-        var selectedMachines = Main.DataGrid.GetSelectedMachines();
-        if (selectedMachines.length == 0) {
-            UI.AddConsoleOutput("No machines selected.");
+    new ConsoleCommand("List", [], "Displays a list of the currently-selected devices.", "list", "", () => {
+        var selectedDevices = Main.DataGrid.GetSelectedDevices();
+        if (selectedDevices.length == 0) {
+            UI.AddConsoleOutput("No devices are selected.");
             return;
         }
-        var output = `<div>Selected Machines:</div>
-                            <table class="console-machine-table table table-responsive">
+        var output = `<div>Selected Devices:</div>
+                            <table class="console-device-table table table-responsive">
                             <thead><tr>
-                            <th>Online</th><th>Machine Name</th><th>Current User</th><th>Last Online</th><th>Platform</th><th>OS Description</th><th>Free Storage</th><th>Total Storage (GB)</th><th>Free Memory</th><th>Total Memory (GB)</th><th>Tags</th>
+                            <th>Online</th><th>Device Name</th><th>Current User</th><th>Last Online</th><th>Platform</th><th>OS Description</th><th>Free Storage</th><th>Total Storage (GB)</th><th>Free Memory</th><th>Total Memory (GB)</th><th>Tags</th>
                             </tr></thead>`;
-        var machineList = selectedMachines.map(x => {
+        var deviceList = selectedDevices.map(x => {
             return `<tr>
                         <td>${String(x.IsOnline)
                 .replace("true", "<span class='fa fa-check-circle'></span>")
                 .replace("false", "<span class='fa fa-times'></span>")}</td>
-                        <td>${x.MachineName}</td>
+                        <td>${x.DeviceName}</td>
                         <td>${x.CurrentUser}</td>
                         <td>${new Date(x.LastOnline).toLocaleString()}</td>
                         <td>${x.Platform}</td>
@@ -135,29 +135,29 @@ var commands = [
                         <td>${x.Tags}</td>
                         </tr>`;
         });
-        output += machineList.join("");
+        output += deviceList.join("");
         UI.AddConsoleOutput(output);
     }),
-    new ConsoleCommand("Remove", [], "Removes the selected machines from the database.  (Note: This does not attempt to uninstall the client.  Use Uninstall.)", "remove", "", (parameters) => {
-        var machines = DataGrid.GetSelectedMachines();
-        if (machines.length == 0) {
-            UI.AddConsoleOutput("No machines selected.");
+    new ConsoleCommand("Remove", [], "Removes the selected devices from the database.  (Note: This does not attempt to uninstall the client.  Use Uninstall.)", "remove", "", (parameters) => {
+        var devices = DataGrid.GetSelectedDevices();
+        if (devices.length == 0) {
+            UI.AddConsoleOutput("No devices are selected.");
         }
         else {
-            BrowserSockets.Connection.invoke("RemoveMachines", machines.map(x => x.ID));
+            BrowserSockets.Connection.invoke("RemoveDevices", devices.map(x => x.ID));
         }
     }),
     new ConsoleCommand("Select", [
-        new Parameter("all", "If specified, all machines will be selected.", "Switch"),
-        new Parameter("none", "If specified, no machines will be selected.", "Switch"),
-        new Parameter("online", "If specified, selects the machines that are currently online.", "Switch"),
+        new Parameter("all", "If specified, all devices will be selected.", "Switch"),
+        new Parameter("none", "If specified, no devices will be selected.", "Switch"),
+        new Parameter("online", "If specified, selects the devices that are currently online.", "Switch"),
         new Parameter("filter", "A comma-separated list of search filters (spaces are optional).  See the help article for more details.", "String"),
-        new Parameter("append", "If specified, selected machines will be added list of computers already selected (if any).", "Switch"),
-    ], "Selects machines based on a supplied filter.", "select -filter isonline=true, machinename*Rig, freestorage<50", `The filter contains a comma-separated list of fields to search, and machines that match all filters will be selected.
+        new Parameter("append", "If specified, selected devices will be added list of computers already selected (if any).", "Switch"),
+    ], "Selects devices based on a supplied filter.", "select -filter isonline=true, devicename*Rig, freestorage<50", `The filter contains a comma-separated list of fields to search, and devices that match all filters will be selected.
             There are multiple operator types, and they can be used on any of the fields on the grid (plus some extra hidden ones).<br><br>
             Operators:<br>
             <ul style="list-style:none">
-                <li>=&nbsp;&nbsp;&nbsp;  Exactly equal to. "machinename=myrig" would match "MyRig", but not "MyRig2"</li>
+                <li>=&nbsp;&nbsp;&nbsp;  Exactly equal to. "devicename=myrig" would match "MyRig", but not "MyRig2"</li>
                 <li>*&nbsp;&nbsp;&nbsp;  Like. "currentuser*bus" would match "Business" and "A_Busy_User"</li>
                 <li>!=&nbsp;&nbsp;       Not equal to. "currentuser!=jon" would match every user except "Jon"</li>
                 <li>!*&nbsp;&nbsp;       Not like. "currentuser!*jon" would match "Jon", "Jonathan", and "SuperJon"</li>
@@ -168,7 +168,7 @@ var commands = [
             Fields:<br>
                 <ul style="list-style:none">
                     <li>IsOnline (true or false)</li>
-                    <li>MachineName (text)</li>
+                    <li>DeviceName (text)</li>
                     <li>CurrentUser (text)</li>
                     <li>LastOnline (date or date+time</li>
                     <li>Is64Bit (true or false)</li>
@@ -184,19 +184,19 @@ var commands = [
             Main.DataGrid.DataSource.forEach(x => {
                 document.getElementById(x.ID).classList.add("row-selected");
             });
-            UI.AddConsoleOutput(`${GetSelectedMachines().length} machines selected.`);
+            UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`);
         }
         if (typeof paramDictionary["none"] != "undefined") {
-            Main.UI.MachineGrid.querySelectorAll(".row-selected").forEach(x => {
+            Main.UI.DeviceGrid.querySelectorAll(".row-selected").forEach(x => {
                 x.classList.remove("row-selected");
             });
-            UI.AddConsoleOutput(`${GetSelectedMachines().length} machines selected.`);
+            UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`);
         }
         if (typeof paramDictionary["online"] != "undefined") {
             Main.DataGrid.DataSource.filter(x => x.IsOnline).forEach(x => {
                 document.getElementById(x.ID).classList.add("row-selected");
             });
-            UI.AddConsoleOutput(`${GetSelectedMachines().length} machines selected.`);
+            UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`);
         }
         if (typeof paramDictionary["filter"] != "undefined") {
             try {
@@ -260,62 +260,62 @@ var commands = [
             }
             lambda = lambda.slice(0, lambda.lastIndexOf(" &&"));
             if (paramDictionary["append"] != "true") {
-                Main.UI.MachineGrid.querySelectorAll(".row-selected").forEach(x => {
+                Main.UI.DeviceGrid.querySelectorAll(".row-selected").forEach(x => {
                     x.classList.remove("row-selected");
                 });
             }
-            var selectedMachines = Main.DataGrid.DataSource.filter(x => eval(lambda));
-            selectedMachines.forEach(x => {
+            var selectedDevices = Main.DataGrid.DataSource.filter(x => eval(lambda));
+            selectedDevices.forEach(x => {
                 document.getElementById(x.ID).classList.add("row-selected");
             });
-            UI.AddConsoleOutput(`${GetSelectedMachines().length} machines selected.`);
+            UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`);
         }
-        Main.DataGrid.UpdateMachineCounts();
+        Main.DataGrid.UpdateDeviceCounts();
     }),
     new ConsoleCommand("RemoteControl", [], "Connect to a computer with Remotely Remote Control.", "list", "", () => {
-        var selectedMachines = Main.DataGrid.GetSelectedMachines();
-        if (selectedMachines.length == 0) {
-            UI.AddConsoleOutput("You must select a machine first.");
+        var selectedDevices = Main.DataGrid.GetSelectedDevices();
+        if (selectedDevices.length == 0) {
+            UI.AddConsoleOutput("You must select a device first.");
             return;
         }
-        if (selectedMachines.length > 1) {
-            UI.AddConsoleOutput("You can only initiate remote control on one machine at a time.");
+        if (selectedDevices.length > 1) {
+            UI.AddConsoleOutput("You can only initiate remote control on one device at a time.");
             return;
         }
-        UI.AddConsoleOutput("Launching remote control on client machine...");
-        BrowserSockets.Connection.invoke("RemoteControl", selectedMachines[0].ID);
+        UI.AddConsoleOutput("Launching remote control on client device...");
+        BrowserSockets.Connection.invoke("RemoteControl", selectedDevices[0].ID);
     }),
-    new ConsoleCommand("Uninstall", [], "Uninstalls the Remotely client from the selected machines.  Warning: This can't be undone from the web portal.  You would need to redeploy the client.", "uninstall", "", (parameters, parameterDict) => {
-        var selectedMachines = DataGrid.GetSelectedMachines();
-        BrowserSockets.Connection.invoke("UninstallClients", selectedMachines.map(x => x.ID));
+    new ConsoleCommand("Uninstall", [], "Uninstalls the Remotely client from the selected devices.  Warning: This can't be undone from the web portal.  You would need to redeploy the client.", "uninstall", "", (parameters, parameterDict) => {
+        var selectedDevices = DataGrid.GetSelectedDevices();
+        BrowserSockets.Connection.invoke("UninstallClients", selectedDevices.map(x => x.ID));
     }),
     new ConsoleCommand("SetTags", [
-        new Parameter("Tags", "The tags to set for the machine. Max length is 200 characters.", "String"),
+        new Parameter("Tags", "The tags to set for the device. Max length is 200 characters.", "String"),
         new Parameter("Append", "Append the tags to any existing ones.", "Switch")
-    ], "Set the tag/description for the selected machines.  Max length is 200 characters.", "SetTags -tags John's computer, Portland office, desktop", "", (parameters, parameterDict) => {
-        var selectedMachines = Main.DataGrid.GetSelectedMachines();
-        if (selectedMachines.length == 0) {
-            AddConsoleOutput("No machines are selected.");
+    ], "Set the tag/description for the selected devices.  Max length is 200 characters.", "SetTags -tags John's computer, Portland office, desktop", "", (parameters, parameterDict) => {
+        var selectedDevices = Main.DataGrid.GetSelectedDevices();
+        if (selectedDevices.length == 0) {
+            AddConsoleOutput("No devices are selected.");
             return;
         }
-        selectedMachines.forEach(x => {
+        selectedDevices.forEach(x => {
             if (typeof parameterDict["append"] != 'undefined') {
                 var separator = x.Tags.trim().endsWith(",") ? " " : ", ";
                 parameterDict["tags"] = x.Tags.trim() + separator + parameterDict["tags"];
             }
             DataGrid.DataSource.find(y => y.ID == x.ID).Tags = parameterDict["tags"];
-            document.getElementById(x.ID).querySelector(".machine-tag").value = parameterDict["tags"];
+            document.getElementById(x.ID).querySelector(".device-tag").value = parameterDict["tags"];
             BrowserSockets.Connection.invoke("UpdateTags", x.ID, parameterDict["tags"]);
         });
     }),
-    new ConsoleCommand("TransferFiles", [], "Transfer file(s) to the selected machines.", "transferfiles", "", (parameters, parameterDict) => {
-        var selectedMachines = Main.DataGrid.GetSelectedMachines();
-        if (selectedMachines.length == 0) {
-            AddConsoleOutput("No machines are selected.");
+    new ConsoleCommand("TransferFiles", [], "Transfer file(s) to the selected devices.", "transferfiles", "", (parameters, parameterDict) => {
+        var selectedDevices = Main.DataGrid.GetSelectedDevices();
+        if (selectedDevices.length == 0) {
+            AddConsoleOutput("No devices are selected.");
             return;
         }
         var transferID = Main.Utilities.CreateGUID();
-        UI.AddTransferHarness(transferID, selectedMachines.length);
+        UI.AddTransferHarness(transferID, selectedDevices.length);
         var fileInput = document.createElement("input");
         fileInput.type = "file";
         fileInput.hidden = true;
@@ -323,7 +323,7 @@ var commands = [
         document.body.appendChild(fileInput);
         fileInput.onchange = () => {
             uploadFiles(fileInput.files).then(value => {
-                BrowserSockets.Connection.invoke("TransferFiles", value, transferID, selectedMachines.map(x => x.ID));
+                BrowserSockets.Connection.invoke("TransferFiles", value, transferID, selectedDevices.map(x => x.ID));
                 fileInput.remove();
             });
         };
diff --git a/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js.map b/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js.map
index 851c656e..82314150 100644
--- a/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js.map
+++ b/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js.map
@@ -1 +1 @@
-{"version":3,"file":"WebCommands.js","sourceRoot":"","sources":["WebCommands.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"WebCommands.js","sourceRoot":"","sources":["WebCommands.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/Commands/WebCommands.ts b/Remotely_Server/wwwroot/scripts/Commands/WebCommands.ts
index e01e7f9d..e19699cf 100644
--- a/Remotely_Server/wwwroot/scripts/Commands/WebCommands.ts
+++ b/Remotely_Server/wwwroot/scripts/Commands/WebCommands.ts
@@ -1,13 +1,13 @@
 import { ConsoleCommand } from "../Models/ConsoleCommand.js"
 import { Parameter } from "../Models/Parameter.js";
-import { Machine } from "../Models/Machine.js";
+import { Device } from "../Models/Device.js";
 import * as UI from "../UI.js";
 import * as BrowserSockets from "../BrowserSockets.js";
 import { CommandLineParameter } from "../Models/CommandLineParameter.js";
 import { Main } from "../Main.js";
 import * as DataGrid from "../DataGrid.js";
 import { AddConsoleHTML, AddConsoleOutput } from "../UI.js";
-import { GetSelectedMachines } from "../DataGrid.js";
+import { GetSelectedDevices } from "../DataGrid.js";
 
 
 var commands: Array<ConsoleCommand> = [
@@ -17,19 +17,19 @@ var commands: Array<ConsoleCommand> = [
             new Parameter("group", "The group name to add.", "String")
         ],
         "Adds a permission group to the selected computer(s).",
-        "AddGroup -group Lab Machines",
+        "AddGroup -group Lab Devices",
         "",
         (parameters, paramDictionary) => {
-            var selectedMachines = Main.DataGrid.GetSelectedMachines();
-            if (selectedMachines.length == 0) {
-                AddConsoleOutput("No machines are selected.");
+            var selectedDevices = Main.DataGrid.GetSelectedDevices();
+            if (selectedDevices.length == 0) {
+                AddConsoleOutput("No devices are selected.");
                 return;
             };
             if (!paramDictionary["group"]) {
                 AddConsoleOutput("A group name is required.");
                 return;
             }
-            BrowserSockets.Connection.invoke("AddGroup", selectedMachines.map(x=>x.ID), paramDictionary["group"]);
+            BrowserSockets.Connection.invoke("AddGroup", selectedDevices.map(x=>x.ID), paramDictionary["group"]);
         }
     ),
     new ConsoleCommand(
@@ -40,7 +40,7 @@ var commands: Array<ConsoleCommand> = [
             new Parameter("cmd", "Indicates that script should be run with Windows CMD.", "Switch"),
             new Parameter("bash", "Indicates that script should be run with Bash.", "Switch")
         ],
-        "Deploy and run a script on the selected machine(s).  Note: Only one switch argument can be used.",
+        "Deploy and run a script on the selected device(s).  Note: Only one switch argument can be used.",
         "deployscript -pscore",
         "",
         (parameters, parameterDict) => {
@@ -48,9 +48,9 @@ var commands: Array<ConsoleCommand> = [
                 AddConsoleOutput("There should be exactly 1 argument to indicate the script type.");
                 return;
             }
-            var selectedMachines = Main.DataGrid.GetSelectedMachines();
-            if (selectedMachines.length == 0) {
-                AddConsoleOutput("No machines are selected.");
+            var selectedDevices = Main.DataGrid.GetSelectedDevices();
+            if (selectedDevices.length == 0) {
+                AddConsoleOutput("No devices are selected.");
                 return;
             }
             var fileInput = document.createElement("input");
@@ -59,7 +59,7 @@ var commands: Array<ConsoleCommand> = [
             document.body.appendChild(fileInput);
             fileInput.onchange = () => {
                 uploadFiles(fileInput.files).then(value => {
-                    BrowserSockets.Connection.invoke("DeployScript", value[0], parameters[0].Name, selectedMachines.map(x => x.ID));
+                    BrowserSockets.Connection.invoke("DeployScript", value[0], parameters[0].Name, selectedDevices.map(x => x.ID));
                     fileInput.remove();
                 });
             }
@@ -72,19 +72,19 @@ var commands: Array<ConsoleCommand> = [
             new Parameter("group", "The group name to remove.", "String")
         ],
         "Removes a permission group to the selected computer(s).",
-        "RemoveGroup -group Lab Machines",
+        "RemoveGroup -group Lab Devices",
         "",
         (parameters, paramDictionary) => {
-            var selectedMachines = Main.DataGrid.GetSelectedMachines();
-            if (selectedMachines.length == 0) {
-                AddConsoleOutput("No machines are selected.");
+            var selectedDevices = Main.DataGrid.GetSelectedDevices();
+            if (selectedDevices.length == 0) {
+                AddConsoleOutput("No devices are selected.");
                 return;
             };
             if (!paramDictionary["group"]) {
                 AddConsoleOutput("A group name is required.");
                 return;
             }
-            BrowserSockets.Connection.invoke("RemoveGroup", selectedMachines.map(x => x.ID), paramDictionary["group"]);
+            BrowserSockets.Connection.invoke("RemoveGroup", selectedDevices.map(x => x.ID), paramDictionary["group"]);
         }
     ),
     new ConsoleCommand(
@@ -181,28 +181,28 @@ var commands: Array<ConsoleCommand> = [
     new ConsoleCommand(
         "List",
         [],
-        "Displays a list of the currently-selected machines.",
+        "Displays a list of the currently-selected devices.",
         "list",
         "",
         () => {
-            var selectedMachines = Main.DataGrid.GetSelectedMachines();
+            var selectedDevices = Main.DataGrid.GetSelectedDevices();
 
-            if (selectedMachines.length == 0) {
-                UI.AddConsoleOutput("No machines selected.");
+            if (selectedDevices.length == 0) {
+                UI.AddConsoleOutput("No devices are selected.");
                 return;
             }
-            var output = `<div>Selected Machines:</div>
-                            <table class="console-machine-table table table-responsive">
+            var output = `<div>Selected Devices:</div>
+                            <table class="console-device-table table table-responsive">
                             <thead><tr>
-                            <th>Online</th><th>Machine Name</th><th>Current User</th><th>Last Online</th><th>Platform</th><th>OS Description</th><th>Free Storage</th><th>Total Storage (GB)</th><th>Free Memory</th><th>Total Memory (GB)</th><th>Tags</th>
+                            <th>Online</th><th>Device Name</th><th>Current User</th><th>Last Online</th><th>Platform</th><th>OS Description</th><th>Free Storage</th><th>Total Storage (GB)</th><th>Free Memory</th><th>Total Memory (GB)</th><th>Tags</th>
                             </tr></thead>`;
             
-            var machineList = selectedMachines.map(x => {
+            var deviceList = selectedDevices.map(x => {
                 return `<tr>
                         <td>${String(x.IsOnline)
                                 .replace("true", "<span class='fa fa-check-circle'></span>")
                                 .replace("false", "<span class='fa fa-times'></span>")}</td>
-                        <td>${x.MachineName}</td>
+                        <td>${x.DeviceName}</td>
                         <td>${x.CurrentUser}</td>
                         <td>${new Date(x.LastOnline).toLocaleString()}</td>
                         <td>${x.Platform}</td>
@@ -214,7 +214,7 @@ var commands: Array<ConsoleCommand> = [
                         <td>${x.Tags}</td>
                         </tr>`
             });
-            output += machineList.join("");
+            output += deviceList.join("");
             UI.AddConsoleOutput(output);
         }
     ),
@@ -223,35 +223,35 @@ var commands: Array<ConsoleCommand> = [
         [
 
         ],
-        "Removes the selected machines from the database.  (Note: This does not attempt to uninstall the client.  Use Uninstall.)",
+        "Removes the selected devices from the database.  (Note: This does not attempt to uninstall the client.  Use Uninstall.)",
         "remove",
         "",
         (parameters) => {
-            var machines = DataGrid.GetSelectedMachines();
-            if (machines.length == 0) {
-                UI.AddConsoleOutput("No machines selected.");
+            var devices = DataGrid.GetSelectedDevices();
+            if (devices.length == 0) {
+                UI.AddConsoleOutput("No devices are selected.");
             }
             else {
-                BrowserSockets.Connection.invoke("RemoveMachines", machines.map(x=>x.ID));
+                BrowserSockets.Connection.invoke("RemoveDevices", devices.map(x=>x.ID));
             }
         }
     ),
     new ConsoleCommand(
         "Select",
         [
-            new Parameter("all", "If specified, all machines will be selected.", "Switch"),
-            new Parameter("none", "If specified, no machines will be selected.", "Switch"),
-            new Parameter("online", "If specified, selects the machines that are currently online.", "Switch"),
+            new Parameter("all", "If specified, all devices will be selected.", "Switch"),
+            new Parameter("none", "If specified, no devices will be selected.", "Switch"),
+            new Parameter("online", "If specified, selects the devices that are currently online.", "Switch"),
             new Parameter("filter", "A comma-separated list of search filters (spaces are optional).  See the help article for more details.", "String"),
-            new Parameter("append", "If specified, selected machines will be added list of computers already selected (if any).", "Switch"),
+            new Parameter("append", "If specified, selected devices will be added list of computers already selected (if any).", "Switch"),
         ],
-        "Selects machines based on a supplied filter.",
-        "select -filter isonline=true, machinename*Rig, freestorage<50",
-        `The filter contains a comma-separated list of fields to search, and machines that match all filters will be selected.
+        "Selects devices based on a supplied filter.",
+        "select -filter isonline=true, devicename*Rig, freestorage<50",
+        `The filter contains a comma-separated list of fields to search, and devices that match all filters will be selected.
             There are multiple operator types, and they can be used on any of the fields on the grid (plus some extra hidden ones).<br><br>
             Operators:<br>
             <ul style="list-style:none">
-                <li>=&nbsp;&nbsp;&nbsp;  Exactly equal to. "machinename=myrig" would match "MyRig", but not "MyRig2"</li>
+                <li>=&nbsp;&nbsp;&nbsp;  Exactly equal to. "devicename=myrig" would match "MyRig", but not "MyRig2"</li>
                 <li>*&nbsp;&nbsp;&nbsp;  Like. "currentuser*bus" would match "Business" and "A_Busy_User"</li>
                 <li>!=&nbsp;&nbsp;       Not equal to. "currentuser!=jon" would match every user except "Jon"</li>
                 <li>!*&nbsp;&nbsp;       Not like. "currentuser!*jon" would match "Jon", "Jonathan", and "SuperJon"</li>
@@ -262,7 +262,7 @@ var commands: Array<ConsoleCommand> = [
             Fields:<br>
                 <ul style="list-style:none">
                     <li>IsOnline (true or false)</li>
-                    <li>MachineName (text)</li>
+                    <li>DeviceName (text)</li>
                     <li>CurrentUser (text)</li>
                     <li>LastOnline (date or date+time</li>
                     <li>Is64Bit (true or false)</li>
@@ -280,19 +280,19 @@ var commands: Array<ConsoleCommand> = [
                 Main.DataGrid.DataSource.forEach(x => {
                     document.getElementById(x.ID).classList.add("row-selected");
                 })
-                UI.AddConsoleOutput(`${GetSelectedMachines().length} machines selected.`);
+                UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`);
             }
             if (typeof paramDictionary["none"] != "undefined") {
-                Main.UI.MachineGrid.querySelectorAll(".row-selected").forEach(x => {
+                Main.UI.DeviceGrid.querySelectorAll(".row-selected").forEach(x => {
                     x.classList.remove("row-selected");
                 });
-                UI.AddConsoleOutput(`${GetSelectedMachines().length} machines selected.`);
+                UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`);
             }
             if (typeof paramDictionary["online"] != "undefined") {
                 Main.DataGrid.DataSource.filter(x => x.IsOnline).forEach(x => {
                     document.getElementById(x.ID).classList.add("row-selected");
                 });
-                UI.AddConsoleOutput(`${GetSelectedMachines().length} machines selected.`);
+                UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`);
             }
             if (typeof paramDictionary["filter"] != "undefined") {
                 try {
@@ -358,18 +358,18 @@ var commands: Array<ConsoleCommand> = [
                 }
                 lambda = lambda.slice(0, lambda.lastIndexOf(" &&"));
                 if (paramDictionary["append"] != "true") {
-                    Main.UI.MachineGrid.querySelectorAll(".row-selected").forEach(x => {
+                    Main.UI.DeviceGrid.querySelectorAll(".row-selected").forEach(x => {
                         x.classList.remove("row-selected");
                     });
                 }
-                var selectedMachines = Main.DataGrid.DataSource.filter(x => eval(lambda));
-                selectedMachines.forEach(x => {
+                var selectedDevices = Main.DataGrid.DataSource.filter(x => eval(lambda));
+                selectedDevices.forEach(x => {
                     document.getElementById(x.ID).classList.add("row-selected");
                 });
-                UI.AddConsoleOutput(`${GetSelectedMachines().length} machines selected.`);
+                UI.AddConsoleOutput(`${GetSelectedDevices().length} devices selected.`);
             }
 
-            Main.DataGrid.UpdateMachineCounts();
+            Main.DataGrid.UpdateDeviceCounts();
         }
     ),
     new ConsoleCommand(
@@ -379,51 +379,51 @@ var commands: Array<ConsoleCommand> = [
         "list",
         "",
         () => {
-            var selectedMachines = Main.DataGrid.GetSelectedMachines();
-            if (selectedMachines.length == 0) {
-                UI.AddConsoleOutput("You must select a machine first.");
+            var selectedDevices = Main.DataGrid.GetSelectedDevices();
+            if (selectedDevices.length == 0) {
+                UI.AddConsoleOutput("You must select a device first.");
                 return;
             }
-            if (selectedMachines.length > 1) {
-                UI.AddConsoleOutput("You can only initiate remote control on one machine at a time.");
+            if (selectedDevices.length > 1) {
+                UI.AddConsoleOutput("You can only initiate remote control on one device at a time.");
                 return;
             }
-            UI.AddConsoleOutput("Launching remote control on client machine...");
-            BrowserSockets.Connection.invoke("RemoteControl", selectedMachines[0].ID);
+            UI.AddConsoleOutput("Launching remote control on client device...");
+            BrowserSockets.Connection.invoke("RemoteControl", selectedDevices[0].ID);
         }
     ),
     new ConsoleCommand("Uninstall",
         [],
-        "Uninstalls the Remotely client from the selected machines.  Warning: This can't be undone from the web portal.  You would need to redeploy the client.",
+        "Uninstalls the Remotely client from the selected devices.  Warning: This can't be undone from the web portal.  You would need to redeploy the client.",
         "uninstall",
         "",
         (parameters, parameterDict) => {
-            var selectedMachines = DataGrid.GetSelectedMachines();
-            BrowserSockets.Connection.invoke("UninstallClients", selectedMachines.map(x=>x.ID));
+            var selectedDevices = DataGrid.GetSelectedDevices();
+            BrowserSockets.Connection.invoke("UninstallClients", selectedDevices.map(x=>x.ID));
         }
     ),
     new ConsoleCommand(
         "SetTags",
         [
-            new Parameter("Tags", "The tags to set for the machine. Max length is 200 characters.", "String"),
+            new Parameter("Tags", "The tags to set for the device. Max length is 200 characters.", "String"),
             new Parameter("Append", "Append the tags to any existing ones.", "Switch")   
         ],
-        "Set the tag/description for the selected machines.  Max length is 200 characters.",
+        "Set the tag/description for the selected devices.  Max length is 200 characters.",
         "SetTags -tags John's computer, Portland office, desktop",
         "",
         (parameters, parameterDict) => {
-            var selectedMachines = Main.DataGrid.GetSelectedMachines();
-            if (selectedMachines.length == 0) {
-                AddConsoleOutput("No machines are selected.");
+            var selectedDevices = Main.DataGrid.GetSelectedDevices();
+            if (selectedDevices.length == 0) {
+                AddConsoleOutput("No devices are selected.");
                 return;
             }
-            selectedMachines.forEach(x => {
+            selectedDevices.forEach(x => {
                 if (typeof parameterDict["append"] != 'undefined') {
                     var separator = x.Tags.trim().endsWith(",") ? " " : ", ";
                     parameterDict["tags"] = x.Tags.trim() + separator + parameterDict["tags"]
                 }
                 DataGrid.DataSource.find(y => y.ID == x.ID).Tags = parameterDict["tags"];
-                (document.getElementById(x.ID).querySelector(".machine-tag") as HTMLInputElement).value = parameterDict["tags"];
+                (document.getElementById(x.ID).querySelector(".device-tag") as HTMLInputElement).value = parameterDict["tags"];
                 BrowserSockets.Connection.invoke("UpdateTags", x.ID, parameterDict["tags"]);
             });
         }
@@ -432,17 +432,17 @@ var commands: Array<ConsoleCommand> = [
         "TransferFiles",
         [
         ],
-        "Transfer file(s) to the selected machines.",
+        "Transfer file(s) to the selected devices.",
         "transferfiles",
         "",
         (parameters, parameterDict) => {
-            var selectedMachines = Main.DataGrid.GetSelectedMachines();
-            if (selectedMachines.length == 0) {
-                AddConsoleOutput("No machines are selected.");
+            var selectedDevices = Main.DataGrid.GetSelectedDevices();
+            if (selectedDevices.length == 0) {
+                AddConsoleOutput("No devices are selected.");
                 return;
             }
             var transferID = Main.Utilities.CreateGUID();
-            UI.AddTransferHarness(transferID, selectedMachines.length);
+            UI.AddTransferHarness(transferID, selectedDevices.length);
             var fileInput = document.createElement("input");
             fileInput.type = "file";
             fileInput.hidden = true;
@@ -450,7 +450,7 @@ var commands: Array<ConsoleCommand> = [
             document.body.appendChild(fileInput);
             fileInput.onchange = () => {
                 uploadFiles(fileInput.files).then(value => {
-                    BrowserSockets.Connection.invoke("TransferFiles", value, transferID, selectedMachines.map(x => x.ID));
+                    BrowserSockets.Connection.invoke("TransferFiles", value, transferID, selectedDevices.map(x => x.ID));
                     fileInput.remove();
                 });
             }
diff --git a/Remotely_Server/wwwroot/scripts/DataGrid.js b/Remotely_Server/wwwroot/scripts/DataGrid.js
index 3dce266f..77b9d1ed 100644
--- a/Remotely_Server/wwwroot/scripts/DataGrid.js
+++ b/Remotely_Server/wwwroot/scripts/DataGrid.js
@@ -1,110 +1,110 @@
 import * as UI from "./UI.js";
 import { Main } from "./Main.js";
-import { MachineGrid } from "./UI.js";
+import { DeviceGrid } from "./UI.js";
 import * as BrowserSockets from "./BrowserSockets.js";
 export var DataSource = new Array();
-export function AddOrUpdateMachines(machines) {
-    machines.forEach(x => {
-        AddOrUpdateMachine(x);
+export function AddOrUpdateDevices(devices) {
+    devices.forEach(x => {
+        AddOrUpdateDevice(x);
     });
 }
-export function AddOrUpdateMachine(machine) {
-    var existingIndex = DataSource.findIndex(x => x.ID == machine.ID);
+export function AddOrUpdateDevice(device) {
+    var existingIndex = DataSource.findIndex(x => x.ID == device.ID);
     if (existingIndex > -1) {
-        DataSource[existingIndex] = machine;
+        DataSource[existingIndex] = device;
     }
     else {
-        DataSource.push(machine);
+        DataSource.push(device);
     }
-    var tableBody = document.querySelector("#" + Main.UI.MachineGrid.id + " tbody");
-    var recordRow = document.getElementById(machine.ID);
+    var tableBody = document.querySelector("#" + Main.UI.DeviceGrid.id + " tbody");
+    var recordRow = document.getElementById(device.ID);
     if (recordRow == null) {
         recordRow = document.createElement("tr");
         recordRow.classList.add("record-row");
-        recordRow.id = machine.ID;
+        recordRow.id = device.ID;
         tableBody.appendChild(recordRow);
         recordRow.addEventListener("click", (e) => {
             e.currentTarget.classList.toggle("row-selected");
-            UpdateMachineCounts();
+            UpdateDeviceCounts();
         });
     }
     recordRow.innerHTML = `
-                    <td>${String(machine.IsOnline)
+                    <td>${String(device.IsOnline)
         .replace("true", "<span class='fa fa-check-circle'></span>")
         .replace("false", "<span class='fa fa-times'></span>")}</td>
-                    <td>${machine.MachineName}</td>
-                    <td>${machine.CurrentUser}</td>
-                    <td>${new Date(machine.LastOnline).toLocaleString()}</td>
-                    <td>${machine.Platform}</td>
-                    <td>${machine.OSDescription}</td>
-                    <td>${Math.round(machine.FreeStorage * 100)}%</td>
-                    <td>${machine.TotalStorage.toLocaleString()}</td>
-                    <td>${Math.round(machine.FreeMemory * 100)}%</td>
-                    <td>${machine.TotalMemory.toLocaleString()}</td>
-                    <td><input type="text" class="machine-tag" value="${machine.Tags}" /></td>`;
-    recordRow.querySelector(".machine-tag").onchange = (ev) => {
+                    <td>${device.DeviceName}</td>
+                    <td>${device.CurrentUser}</td>
+                    <td>${new Date(device.LastOnline).toLocaleString()}</td>
+                    <td>${device.Platform}</td>
+                    <td>${device.OSDescription}</td>
+                    <td>${Math.round(device.FreeStorage * 100)}%</td>
+                    <td>${device.TotalStorage.toLocaleString()}</td>
+                    <td>${Math.round(device.FreeMemory * 100)}%</td>
+                    <td>${device.TotalMemory.toLocaleString()}</td>
+                    <td><input type="text" class="device-tag" value="${device.Tags}" /></td>`;
+    recordRow.querySelector(".device-tag").onchange = (ev) => {
         var newTag = ev.currentTarget.value;
-        DataSource.find(x => x.ID == machine.ID).Tags = newTag;
-        BrowserSockets.Connection.invoke("UpdateTags", machine.ID, newTag);
+        DataSource.find(x => x.ID == device.ID).Tags = newTag;
+        BrowserSockets.Connection.invoke("UpdateTags", device.ID, newTag);
     };
-    UpdateMachineCounts();
+    UpdateDeviceCounts();
 }
-export function GetSelectedMachines() {
-    var machines = new Array();
-    MachineGrid.querySelectorAll(".row-selected").forEach(row => {
-        machines.push(DataSource.find(x => x.ID == row.id));
+export function GetSelectedDevices() {
+    var devices = new Array();
+    DeviceGrid.querySelectorAll(".row-selected").forEach(row => {
+        devices.push(DataSource.find(x => x.ID == row.id));
     });
-    return machines;
+    return devices;
 }
 ;
 export function ClearAllData() {
     DataSource.splice(0, DataSource.length);
-    UI.MachineGrid.querySelectorAll(".record-row").forEach(row => {
+    UI.DeviceGrid.querySelectorAll(".record-row").forEach(row => {
         row.remove();
     });
-    UpdateMachineCounts();
+    UpdateDeviceCounts();
 }
 export function RefreshGrid() {
     ClearAllData();
     var xhr = new XMLHttpRequest();
-    xhr.open("get", "/API/Machines");
+    xhr.open("get", "/API/Devices");
     xhr.onerror = () => {
-        UI.ShowModal("Request Failure", "Failed to retrieve machine data.  Please refresh your connection or contact support.");
+        UI.ShowModal("Request Failure", "Failed to retrieve device data.  Please refresh your connection or contact support.");
     };
     xhr.onload = (e) => {
         if (xhr.status == 200) {
-            var machines = JSON.parse(xhr.responseText);
-            if (machines.length == 0) {
-                UI.AddConsoleOutput("It looks like you don't have the Remotely service installed on any machines.  You can get the install script from the Client Downloads page.");
+            var devices = JSON.parse(xhr.responseText);
+            if (devices.length == 0) {
+                UI.AddConsoleOutput("It looks like you don't have the Remotely service installed on any devices.  You can get the install script from the Client Downloads page.");
             }
             else {
             }
-            AddOrUpdateMachines(machines);
+            AddOrUpdateDevices(devices);
         }
         else {
-            UI.ShowModal("Request Failure", "Failed to retrieve machine data.  Please refresh your connection or contact support.");
+            UI.ShowModal("Request Failure", "Failed to retrieve device data.  Please refresh your connection or contact support.");
         }
     };
     xhr.send();
 }
 export function ToggleSelectAll() {
-    var currentlySelected = MachineGrid.querySelectorAll(".row-selected:not(.hidden)");
+    var currentlySelected = DeviceGrid.querySelectorAll(".row-selected:not(.hidden)");
     if (currentlySelected.length > 0) {
         currentlySelected.forEach(elem => {
             elem.classList.remove("row-selected");
         });
     }
     else {
-        MachineGrid.querySelectorAll(".record-row:not(.hidden)").forEach(elem => {
+        DeviceGrid.querySelectorAll(".record-row:not(.hidden)").forEach(elem => {
             elem.classList.add("row-selected");
         });
     }
-    UpdateMachineCounts();
+    UpdateDeviceCounts();
 }
-export function UpdateMachineCounts() {
-    UI.MachinesSelectedCount.innerText = UI.MachineGrid.querySelectorAll(".row-selected").length.toString();
-    UI.OnlineMachinesCount.innerText = DataSource.filter(x => x.IsOnline).length.toString();
-    UI.TotalMachinesCount.innerText = DataSource.length.toString();
+export function UpdateDeviceCounts() {
+    UI.DevicesSelectedCount.innerText = UI.DeviceGrid.querySelectorAll(".row-selected").length.toString();
+    UI.OnlineDevicesCount.innerText = DataSource.filter(x => x.IsOnline).length.toString();
+    UI.TotalDevicesCount.innerText = DataSource.length.toString();
     if (DataSource.some(x => x.IsOnline == false &&
         document.getElementById(x.ID).classList.contains("row-selected"))) {
         UI.AddConsoleOutput(`Your selection contains offline computers.  Your commands will only be sent to those that are online.`);
diff --git a/Remotely_Server/wwwroot/scripts/DataGrid.js.map b/Remotely_Server/wwwroot/scripts/DataGrid.js.map
index ca853b5c..36a4a62e 100644
--- a/Remotely_Server/wwwroot/scripts/DataGrid.js.map
+++ b/Remotely_Server/wwwroot/scripts/DataGrid.js.map
@@ -1 +1 @@
-{"version":3,"file":"DataGrid.js","sourceRoot":"","sources":["DataGrid.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"DataGrid.js","sourceRoot":"","sources":["DataGrid.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/DataGrid.ts b/Remotely_Server/wwwroot/scripts/DataGrid.ts
index 09516a0f..daca757f 100644
--- a/Remotely_Server/wwwroot/scripts/DataGrid.ts
+++ b/Remotely_Server/wwwroot/scripts/DataGrid.ts
@@ -1,116 +1,116 @@
 import * as UI from "./UI.js";
-import { Machine } from "./Models/Machine.js";
+import { Device } from "./Models/Device.js";
 import { Main } from "./Main.js";
-import { MachineGrid } from "./UI.js";
+import { DeviceGrid } from "./UI.js";
 import * as BrowserSockets from "./BrowserSockets.js";
 
-export var DataSource: Array<Machine> = new Array<Machine>();
+export var DataSource: Array<Device> = new Array<Device>();
 
-export function AddOrUpdateMachines(machines: Array<Machine>) {
-    machines.forEach(x => {
-        AddOrUpdateMachine(x);
+export function AddOrUpdateDevices(devices: Array<Device>) {
+    devices.forEach(x => {
+        AddOrUpdateDevice(x);
     });
 }
-export function AddOrUpdateMachine(machine: Machine) {
-    var existingIndex = DataSource.findIndex(x => x.ID == machine.ID);
+export function AddOrUpdateDevice(device: Device) {
+    var existingIndex = DataSource.findIndex(x => x.ID == device.ID);
     if (existingIndex > -1) {
-        DataSource[existingIndex] = machine;
+        DataSource[existingIndex] = device;
     }
     else {
-        DataSource.push(machine);
+        DataSource.push(device);
     }
 
-    var tableBody = document.querySelector("#" + Main.UI.MachineGrid.id + " tbody");
-    var recordRow = document.getElementById(machine.ID);
+    var tableBody = document.querySelector("#" + Main.UI.DeviceGrid.id + " tbody");
+    var recordRow = document.getElementById(device.ID);
     if (recordRow == null) {
         recordRow = document.createElement("tr");
         recordRow.classList.add("record-row");
-        recordRow.id = machine.ID;
+        recordRow.id = device.ID;
         tableBody.appendChild(recordRow);
         recordRow.addEventListener("click", (e) => {
             (e.currentTarget as HTMLElement).classList.toggle("row-selected");
-            UpdateMachineCounts();
+            UpdateDeviceCounts();
         });
     }
     recordRow.innerHTML = `
-                    <td>${String(machine.IsOnline)
+                    <td>${String(device.IsOnline)
                             .replace("true", "<span class='fa fa-check-circle'></span>")
                             .replace("false", "<span class='fa fa-times'></span>")}</td>
-                    <td>${machine.MachineName}</td>
-                    <td>${machine.CurrentUser}</td>
-                    <td>${new Date(machine.LastOnline).toLocaleString()}</td>
-                    <td>${machine.Platform}</td>
-                    <td>${machine.OSDescription}</td>
-                    <td>${Math.round(machine.FreeStorage * 100)}%</td>
-                    <td>${machine.TotalStorage.toLocaleString()}</td>
-                    <td>${Math.round(machine.FreeMemory * 100)}%</td>
-                    <td>${machine.TotalMemory.toLocaleString()}</td>
-                    <td><input type="text" class="machine-tag" value="${machine.Tags}" /></td>`;
+                    <td>${device.DeviceName}</td>
+                    <td>${device.CurrentUser}</td>
+                    <td>${new Date(device.LastOnline).toLocaleString()}</td>
+                    <td>${device.Platform}</td>
+                    <td>${device.OSDescription}</td>
+                    <td>${Math.round(device.FreeStorage * 100)}%</td>
+                    <td>${device.TotalStorage.toLocaleString()}</td>
+                    <td>${Math.round(device.FreeMemory * 100)}%</td>
+                    <td>${device.TotalMemory.toLocaleString()}</td>
+                    <td><input type="text" class="device-tag" value="${device.Tags}" /></td>`;
 
 
-    (recordRow.querySelector(".machine-tag") as HTMLInputElement).onchange = (ev) => {
+    (recordRow.querySelector(".device-tag") as HTMLInputElement).onchange = (ev) => {
         var newTag = (ev.currentTarget as HTMLInputElement).value;
-        DataSource.find(x => x.ID == machine.ID).Tags = newTag;
-        BrowserSockets.Connection.invoke("UpdateTags", machine.ID, newTag);
+        DataSource.find(x => x.ID == device.ID).Tags = newTag;
+        BrowserSockets.Connection.invoke("UpdateTags", device.ID, newTag);
     };
-    UpdateMachineCounts();
+    UpdateDeviceCounts();
 }
-export function GetSelectedMachines(): Machine[] {
-    var machines = new Array<Machine>();
-    MachineGrid.querySelectorAll(".row-selected").forEach(row => {
-        machines.push(DataSource.find(x => x.ID == row.id));
+export function GetSelectedDevices(): Device[] {
+    var devices = new Array<Device>();
+    DeviceGrid.querySelectorAll(".row-selected").forEach(row => {
+        devices.push(DataSource.find(x => x.ID == row.id));
     });
-    return machines;
+    return devices;
 };
 export function ClearAllData() {
     DataSource.splice(0, DataSource.length);
-    UI.MachineGrid.querySelectorAll(".record-row").forEach(row => {
+    UI.DeviceGrid.querySelectorAll(".record-row").forEach(row => {
         row.remove();
     });
-    UpdateMachineCounts();
+    UpdateDeviceCounts();
 }
 export function RefreshGrid() {
     ClearAllData();
     var xhr = new XMLHttpRequest();
-    xhr.open("get", "/API/Machines");
+    xhr.open("get", "/API/Devices");
     xhr.onerror = () => {
-        UI.ShowModal("Request Failure", "Failed to retrieve machine data.  Please refresh your connection or contact support.");
+        UI.ShowModal("Request Failure", "Failed to retrieve device data.  Please refresh your connection or contact support.");
     };
     xhr.onload = (e) => {
         if (xhr.status == 200) {
-            var machines = JSON.parse(xhr.responseText);
-            if (machines.length == 0) {
-                UI.AddConsoleOutput("It looks like you don't have the Remotely service installed on any machines.  You can get the install script from the Client Downloads page.");
+            var devices = JSON.parse(xhr.responseText);
+            if (devices.length == 0) {
+                UI.AddConsoleOutput("It looks like you don't have the Remotely service installed on any devices.  You can get the install script from the Client Downloads page.");
             }
             else {
 
             }
-            AddOrUpdateMachines(machines);
+            AddOrUpdateDevices(devices);
         }
         else {
-            UI.ShowModal("Request Failure", "Failed to retrieve machine data.  Please refresh your connection or contact support.");
+            UI.ShowModal("Request Failure", "Failed to retrieve device data.  Please refresh your connection or contact support.");
         }
     }
     xhr.send();
 }
 export function ToggleSelectAll() {
-    var currentlySelected = MachineGrid.querySelectorAll(".row-selected:not(.hidden)");
+    var currentlySelected = DeviceGrid.querySelectorAll(".row-selected:not(.hidden)");
     if (currentlySelected.length > 0) {
         currentlySelected.forEach(elem => {
             elem.classList.remove("row-selected");
         });
     }
     else {
-        MachineGrid.querySelectorAll(".record-row:not(.hidden)").forEach(elem => {
+        DeviceGrid.querySelectorAll(".record-row:not(.hidden)").forEach(elem => {
             elem.classList.add("row-selected");
         })
     }
-    UpdateMachineCounts();
+    UpdateDeviceCounts();
 }
-export function UpdateMachineCounts() {
-    UI.MachinesSelectedCount.innerText = UI.MachineGrid.querySelectorAll(".row-selected").length.toString();
-    UI.OnlineMachinesCount.innerText = DataSource.filter(x => x.IsOnline).length.toString();
-    UI.TotalMachinesCount.innerText = DataSource.length.toString();
+export function UpdateDeviceCounts() {
+    UI.DevicesSelectedCount.innerText = UI.DeviceGrid.querySelectorAll(".row-selected").length.toString();
+    UI.OnlineDevicesCount.innerText = DataSource.filter(x => x.IsOnline).length.toString();
+    UI.TotalDevicesCount.innerText = DataSource.length.toString();
     if (
         DataSource.some(x =>
         x.IsOnline == false &&
diff --git a/Remotely_Server/wwwroot/scripts/InputEventHandlers.js b/Remotely_Server/wwwroot/scripts/InputEventHandlers.js
index e187c1e2..f5458af9 100644
--- a/Remotely_Server/wwwroot/scripts/InputEventHandlers.js
+++ b/Remotely_Server/wwwroot/scripts/InputEventHandlers.js
@@ -10,7 +10,7 @@ export function ApplyInputEventHandlers() {
     keyDownOnInputTextArea();
     inputOnCommandTextArea();
     inputOnFilterTextBox();
-    clickToggleAllMachines();
+    clickToggleAllDevices();
     clickStartRemoteControlButton();
     window.addEventListener("resize", ev => {
         PositionCommandCompletionWindow();
@@ -139,7 +139,7 @@ function inputOnCommandTextArea() {
 function inputOnFilterTextBox() {
     document.querySelector("#gridFilter").addEventListener("input", (e) => {
         var currentText = e.currentTarget.value.toLowerCase();
-        UI.MachineGrid.querySelectorAll("tbody tr").forEach((row) => {
+        UI.DeviceGrid.querySelectorAll("tbody tr").forEach((row) => {
             if (row.innerHTML.toLowerCase().indexOf(currentText) == -1) {
                 row.classList.add("hidden");
             }
@@ -149,19 +149,19 @@ function inputOnFilterTextBox() {
         });
     });
 }
-function clickToggleAllMachines() {
-    document.getElementById("toggleAllMachines").addEventListener("click", function (e) {
+function clickToggleAllDevices() {
+    document.getElementById("toggleAllDevices").addEventListener("click", function (e) {
         DataGrid.ToggleSelectAll();
     });
 }
 function clickStartRemoteControlButton() {
     document.getElementById("startRemoteControlButton").addEventListener("click", function (e) {
-        var selectedMachines = DataGrid.GetSelectedMachines();
-        if (selectedMachines.length == 0) {
-            UI.FloatMessage("You must select a machine first.");
+        var selectedDevices = DataGrid.GetSelectedDevices();
+        if (selectedDevices.length == 0) {
+            UI.FloatMessage("You must select a device first.");
         }
-        else if (selectedMachines.length > 1) {
-            UI.FloatMessage("You must select only one machine to control.");
+        else if (selectedDevices.length > 1) {
+            UI.FloatMessage("You must select only one device to control.");
         }
         else {
             UI.FloatMessage("Starting remote control...");
diff --git a/Remotely_Server/wwwroot/scripts/InputEventHandlers.js.map b/Remotely_Server/wwwroot/scripts/InputEventHandlers.js.map
index a023997e..15bba69c 100644
--- a/Remotely_Server/wwwroot/scripts/InputEventHandlers.js.map
+++ b/Remotely_Server/wwwroot/scripts/InputEventHandlers.js.map
@@ -1 +1 @@
-{"version":3,"file":"InputEventHandlers.js","sourceRoot":"","sources":["InputEventHandlers.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"InputEventHandlers.js","sourceRoot":"","sources":["InputEventHandlers.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/InputEventHandlers.ts b/Remotely_Server/wwwroot/scripts/InputEventHandlers.ts
index 7038c1af..ad3206b4 100644
--- a/Remotely_Server/wwwroot/scripts/InputEventHandlers.ts
+++ b/Remotely_Server/wwwroot/scripts/InputEventHandlers.ts
@@ -12,7 +12,7 @@ export function ApplyInputEventHandlers() {
     keyDownOnInputTextArea();
     inputOnCommandTextArea();
     inputOnFilterTextBox();
-    clickToggleAllMachines();
+    clickToggleAllDevices();
     clickStartRemoteControlButton();
 
     window.addEventListener("resize", ev => {
@@ -146,7 +146,7 @@ function inputOnCommandTextArea() {
 function inputOnFilterTextBox() {
     document.querySelector("#gridFilter").addEventListener("input", (e) => {
         var currentText = (e.currentTarget as HTMLInputElement).value.toLowerCase();
-        UI.MachineGrid.querySelectorAll("tbody tr").forEach((row: HTMLTableRowElement) => {
+        UI.DeviceGrid.querySelectorAll("tbody tr").forEach((row: HTMLTableRowElement) => {
             if (row.innerHTML.toLowerCase().indexOf(currentText) == -1) {
                 row.classList.add("hidden");
             }
@@ -156,20 +156,20 @@ function inputOnFilterTextBox() {
         })
     })
 }
-function clickToggleAllMachines() {
-    document.getElementById("toggleAllMachines").addEventListener("click", function (e) {
+function clickToggleAllDevices() {
+    document.getElementById("toggleAllDevices").addEventListener("click", function (e) {
         DataGrid.ToggleSelectAll();
     })
 }
 
 function clickStartRemoteControlButton() {
     document.getElementById("startRemoteControlButton").addEventListener("click", function (e) {
-        var selectedMachines = DataGrid.GetSelectedMachines();
-        if (selectedMachines.length == 0) {
-            UI.FloatMessage("You must select a machine first.");
+        var selectedDevices = DataGrid.GetSelectedDevices();
+        if (selectedDevices.length == 0) {
+            UI.FloatMessage("You must select a device first.");
         }
-        else if (selectedMachines.length > 1) {
-            UI.FloatMessage("You must select only one machine to control.");
+        else if (selectedDevices.length > 1) {
+            UI.FloatMessage("You must select only one device to control.");
         }
         else {
             UI.FloatMessage("Starting remote control...");
diff --git a/Remotely_Server/wwwroot/scripts/Models/CommandContext.ts b/Remotely_Server/wwwroot/scripts/Models/CommandContext.ts
index 742626da..8f60a63f 100644
--- a/Remotely_Server/wwwroot/scripts/Models/CommandContext.ts
+++ b/Remotely_Server/wwwroot/scripts/Models/CommandContext.ts
@@ -4,7 +4,7 @@ export interface CommandContext {
     CommandText: string;
     SenderUserID: string;
     SenderConnectionID: string;
-    TargetMachineIDs: string[];
+    TargetDeviceIDs: string[];
     PSCoreResults: any[];
     CMDResults: any[];
     WinPSResults: any[];
diff --git a/Remotely_Server/wwwroot/scripts/Models/Device.js b/Remotely_Server/wwwroot/scripts/Models/Device.js
new file mode 100644
index 00000000..0b8b847b
--- /dev/null
+++ b/Remotely_Server/wwwroot/scripts/Models/Device.js
@@ -0,0 +1 @@
+//# sourceMappingURL=Device.js.map
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/Models/Device.js.map b/Remotely_Server/wwwroot/scripts/Models/Device.js.map
new file mode 100644
index 00000000..358dac6c
--- /dev/null
+++ b/Remotely_Server/wwwroot/scripts/Models/Device.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"Device.js","sourceRoot":"","sources":["Device.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/Models/Machine.ts b/Remotely_Server/wwwroot/scripts/Models/Device.ts
similarity index 87%
rename from Remotely_Server/wwwroot/scripts/Models/Machine.ts
rename to Remotely_Server/wwwroot/scripts/Models/Device.ts
index bffd74df..b2b49942 100644
--- a/Remotely_Server/wwwroot/scripts/Models/Machine.ts
+++ b/Remotely_Server/wwwroot/scripts/Models/Device.ts
@@ -1,10 +1,10 @@
-export interface Machine {
+export interface Device {
     Drives: any[];
     ID: string;
     Is64Bit: boolean;
     IsOnline: boolean;
     LastOnline: Date;
-    MachineName: string;
+    DeviceName: string;
     OrganizationID: string;
     OSArchitecture: any;
     OSDescription: string;
diff --git a/Remotely_Server/wwwroot/scripts/Models/GenericCommandResult.ts b/Remotely_Server/wwwroot/scripts/Models/GenericCommandResult.ts
index 047e6844..457d51a5 100644
--- a/Remotely_Server/wwwroot/scripts/Models/GenericCommandResult.ts
+++ b/Remotely_Server/wwwroot/scripts/Models/GenericCommandResult.ts
@@ -1,5 +1,5 @@
 export interface GenericCommandResult {
-    MachineID: string;
+    DeviceID: string;
     CommandContextID: string;
     CommandType: string;
     StandardOutput: string;
diff --git a/Remotely_Server/wwwroot/scripts/Models/Machine.js b/Remotely_Server/wwwroot/scripts/Models/Machine.js
deleted file mode 100644
index eba89f50..00000000
--- a/Remotely_Server/wwwroot/scripts/Models/Machine.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=Machine.js.map
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/Models/Machine.js.map b/Remotely_Server/wwwroot/scripts/Models/Machine.js.map
deleted file mode 100644
index 3ebc7275..00000000
--- a/Remotely_Server/wwwroot/scripts/Models/Machine.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"Machine.js","sourceRoot":"","sources":["Machine.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/Models/PSCoreCommandResult.ts b/Remotely_Server/wwwroot/scripts/Models/PSCoreCommandResult.ts
index f8992b72..1a421c37 100644
--- a/Remotely_Server/wwwroot/scripts/Models/PSCoreCommandResult.ts
+++ b/Remotely_Server/wwwroot/scripts/Models/PSCoreCommandResult.ts
@@ -1,5 +1,5 @@
 export interface PSCoreCommandResult {
-    MachineID: string;
+    DeviceID: string;
     CommandContextID: string;
     VerboseOutput: string[];
     DebugOutput: string[];
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/BrowserRTC.js b/Remotely_Server/wwwroot/scripts/RemoteControl/BrowserRTC.js
index 69fb1d78..66810d61 100644
--- a/Remotely_Server/wwwroot/scripts/RemoteControl/BrowserRTC.js
+++ b/Remotely_Server/wwwroot/scripts/RemoteControl/BrowserRTC.js
@@ -5,11 +5,11 @@ export class BrowserRTC {
     Init() {
         this.PeerConnection = new RTCPeerConnection(this.IceConfiguration);
         UI.ScreenViewer.onloadedmetadata = (ev) => {
-            UI.ScreenViewer.play();
+            //UI.ScreenViewer.play();
         };
         this.PeerConnection.ontrack = (event) => {
             event.streams.forEach(x => {
-                UI.ScreenViewer.srcObject = x;
+                //UI.ScreenViewer.srcObject = x;
             });
         };
         this.PeerConnection.onconnectionstatechange = function (ev) {
@@ -19,7 +19,7 @@ export class BrowserRTC {
                 case "failed":
                     UI.ConnectBox.style.removeProperty("display");
                     UI.ConnectButton.removeAttribute("disabled");
-                    UI.ScreenViewer.srcObject = null;
+                    //UI.ScreenViewer.srcObject = null;
                     UI.StatusMessage.innerHTML = "Connection closed.";
                     break;
                 default:
@@ -33,7 +33,7 @@ export class BrowserRTC {
                 case "failed":
                     UI.ConnectBox.style.removeProperty("display");
                     UI.ConnectButton.removeAttribute("disabled");
-                    UI.ScreenViewer.srcObject = null;
+                    UI.Screen2DContext.clearRect(0, 0, UI.ScreenViewer.width, UI.ScreenViewer.height);
                     UI.StatusMessage.innerHTML = "Connection closed.";
                     break;
                 default:
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/BrowserRTC.js.map b/Remotely_Server/wwwroot/scripts/RemoteControl/BrowserRTC.js.map
index 118c0b75..6d99fa3a 100644
--- a/Remotely_Server/wwwroot/scripts/RemoteControl/BrowserRTC.js.map
+++ b/Remotely_Server/wwwroot/scripts/RemoteControl/BrowserRTC.js.map
@@ -1 +1 @@
-{"version":3,"file":"BrowserRTC.js","sourceRoot":"","sources":["BrowserRTC.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"BrowserRTC.js","sourceRoot":"","sources":["BrowserRTC.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/BrowserRTC.ts b/Remotely_Server/wwwroot/scripts/RemoteControl/BrowserRTC.ts
index f885fc2c..3b93fbfc 100644
--- a/Remotely_Server/wwwroot/scripts/RemoteControl/BrowserRTC.ts
+++ b/Remotely_Server/wwwroot/scripts/RemoteControl/BrowserRTC.ts
@@ -10,11 +10,11 @@ export class BrowserRTC {
     Init() {
         this.PeerConnection = new RTCPeerConnection(this.IceConfiguration);
         UI.ScreenViewer.onloadedmetadata = (ev) => {
-            UI.ScreenViewer.play();
+            //UI.ScreenViewer.play();
         }
         this.PeerConnection.ontrack = (event) => {
             event.streams.forEach(x => {
-                UI.ScreenViewer.srcObject = x;
+                //UI.ScreenViewer.srcObject = x;
             });
         };
         this.PeerConnection.onconnectionstatechange = function (ev) {
@@ -24,7 +24,7 @@ export class BrowserRTC {
                 case "failed":
                     UI.ConnectBox.style.removeProperty("display");
                     UI.ConnectButton.removeAttribute("disabled");
-                    UI.ScreenViewer.srcObject = null;
+                    //UI.ScreenViewer.srcObject = null;
                     UI.StatusMessage.innerHTML = "Connection closed.";
                     break;
                 default:
@@ -38,7 +38,7 @@ export class BrowserRTC {
                 case "failed":
                     UI.ConnectBox.style.removeProperty("display");
                     UI.ConnectButton.removeAttribute("disabled");
-                    UI.ScreenViewer.srcObject = null;
+                    UI.Screen2DContext.clearRect(0, 0, UI.ScreenViewer.width, UI.ScreenViewer.height);
                     UI.StatusMessage.innerHTML = "Connection closed.";
                     break;
                 default:
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js b/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js
index 7d148479..eedf7ab9 100644
--- a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js
+++ b/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js
@@ -13,6 +13,10 @@ export class RCBrowserSockets {
             console.log("Connection closed.");
         }).then(() => {
             this.SendScreenCastRequestToDevice();
+            UI.ConnectButton.removeAttribute("disabled");
+            UI.ConnectBox.style.display = "none";
+            UI.ScreenViewer.removeAttribute("hidden");
+            UI.StatusMessage.innerHTML = "";
         });
         this.Connection.closedCallbacks.push((ev) => {
             console.log("Connection closed.");
@@ -77,21 +81,6 @@ export class RCBrowserSockets {
         this.Connection.invoke("SendSharedFileIDs", JSON.parse(fileIDs));
     }
     ApplyMessageHandlers(hubConnection) {
-        hubConnection.on("IceConfiguration", (iceConfiguration) => {
-            RemoteControl.BrowserRTC.IceConfiguration = iceConfiguration;
-            RemoteControl.BrowserRTC.Init();
-            this.SendScreenCastRequestToDevice();
-        });
-        hubConnection.on("RTCSession", (description) => {
-            UI.ConnectButton.removeAttribute("disabled");
-            UI.ConnectBox.style.display = "none";
-            UI.ScreenViewer.removeAttribute("hidden");
-            UI.StatusMessage.innerHTML = "";
-            RemoteControl.BrowserRTC.ReceiveRTCSession(description);
-        });
-        hubConnection.on("IceCandidate", (candidate) => {
-            RemoteControl.BrowserRTC.ReceiveCandidate(candidate);
-        });
         hubConnection.on("ScreenCount", (primaryScreenIndex, screenCount) => {
             document.querySelector("#screenSelectBar").innerHTML = "";
             for (let i = 0; i < screenCount; i++) {
@@ -111,6 +100,23 @@ export class RCBrowserSockets {
                 };
             }
         });
+        hubConnection.on("ScreenSize", (width, height) => {
+            console.log("Screen size received. Width " + width + ".  Height " + height);
+            UI.ScreenViewer.width = width;
+            UI.ScreenViewer.height = height;
+        });
+        hubConnection.on("ScreenCapture", (buffer) => {
+            window["test"] = buffer;
+            window["test2"] = atob(buffer);
+            //UI.Screen2DContext.putImageData(new ImageData(array, UI.ScreenViewer.width, UI.ScreenViewer.height), 0, 0);
+            //var url = window.URL.createObjectURL(new Blob([buffer]));
+            //var img = document.createElement("img");
+            //img.onload = function () {
+            //    UI.Screen2DContext.drawImage(img, 0, 0, UI.ScreenViewer.width, UI.ScreenViewer.height);
+            //    window.URL.revokeObjectURL(url);
+            //};
+            //img.src = url;
+        });
         hubConnection.on("ConnectionFailed", () => {
             UI.ConnectButton.removeAttribute("disabled");
             UI.StatusMessage.innerHTML = "Connection failed or was denied.";
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js.map b/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js.map
index f6fd599d..51b37104 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 89901b95..ca91bc8a 100644
--- a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.ts
+++ b/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.ts
@@ -22,6 +22,10 @@ export class RCBrowserSockets {
             console.log("Connection closed.");
         }).then(() => {
             this.SendScreenCastRequestToDevice();
+            UI.ConnectButton.removeAttribute("disabled");
+            UI.ConnectBox.style.display = "none";
+            UI.ScreenViewer.removeAttribute("hidden");
+            UI.StatusMessage.innerHTML = "";
         })
         this.Connection.closedCallbacks.push((ev) => {
             console.log("Connection closed.");
@@ -86,21 +90,6 @@ export class RCBrowserSockets {
         this.Connection.invoke("SendSharedFileIDs", JSON.parse(fileIDs));
     }
     private ApplyMessageHandlers(hubConnection) {
-        hubConnection.on("IceConfiguration", (iceConfiguration: any) => {
-            RemoteControl.BrowserRTC.IceConfiguration = iceConfiguration;
-            RemoteControl.BrowserRTC.Init();
-            this.SendScreenCastRequestToDevice();
-        });
-        hubConnection.on("RTCSession", (description: RTCSessionDescription) => {
-            UI.ConnectButton.removeAttribute("disabled");
-            UI.ConnectBox.style.display = "none";
-            UI.ScreenViewer.removeAttribute("hidden");
-            UI.StatusMessage.innerHTML = "";
-            RemoteControl.BrowserRTC.ReceiveRTCSession(description);
-        });
-        hubConnection.on("IceCandidate", (candidate: RTCIceCandidate) => {
-            RemoteControl.BrowserRTC.ReceiveCandidate(candidate);
-        });
         hubConnection.on("ScreenCount", (primaryScreenIndex: number, screenCount: number) => {
             document.querySelector("#screenSelectBar").innerHTML = "";
             for (let i = 0; i < screenCount; i++) {
@@ -120,7 +109,21 @@ export class RCBrowserSockets {
                 };
             }
         });
-
+        hubConnection.on("ScreenSize", (width: number, height: number) => {
+            console.log("Screen size received. Width " + width + ".  Height " + height);
+            UI.ScreenViewer.width = width;
+            UI.ScreenViewer.height = height;
+        });
+        hubConnection.on("ScreenCapture", (buffer) => {
+            UI.Screen2DContext.putImageData(new ImageData(, UI.ScreenViewer.width, UI.ScreenViewer.height), 0, 0);
+            //var url = window.URL.createObjectURL(new Blob([buffer]));
+            //var img = document.createElement("img");
+            //img.onload = function () {
+            //    UI.Screen2DContext.drawImage(img, 0, 0, UI.ScreenViewer.width, UI.ScreenViewer.height);
+            //    window.URL.revokeObjectURL(url);
+            //};
+            //img.src = url;
+        });
         hubConnection.on("ConnectionFailed", () => {
             UI.ConnectButton.removeAttribute("disabled");
             UI.StatusMessage.innerHTML = "Connection failed or was denied.";
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/UI.js b/Remotely_Server/wwwroot/scripts/RemoteControl/UI.js
index 679f30a4..adb013d5 100644
--- a/Remotely_Server/wwwroot/scripts/RemoteControl/UI.js
+++ b/Remotely_Server/wwwroot/scripts/RemoteControl/UI.js
@@ -6,6 +6,7 @@ export var ConnectButton = document.querySelector("#connectButton");
 export var RequesterNameInput = document.querySelector("#nameInput");
 export var StatusMessage = document.querySelector("#statusMessage");
 export var ScreenViewer = document.querySelector("#screenViewer");
+export var Screen2DContext = ScreenViewer.getContext("2d");
 export var HorizontalBars = document.querySelectorAll(".horizontal-button-bar");
 export var ConnectBox = document.getElementById("connectBox");
 export var ScreenSelectBar = document.querySelector("#screenSelectBar");
@@ -240,9 +241,6 @@ export function ApplyInputHandlers(sockets, rtc) {
         var key = e.key.toLowerCase();
         sockets.SendKeyUp(key);
     });
-    window.addEventListener("click", function (e) {
-        ScreenViewer.muted = false;
-    });
     window.ondragover = function (e) {
         e.preventDefault();
         e.dataTransfer.dropEffect = "copy";
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/UI.js.map b/Remotely_Server/wwwroot/scripts/RemoteControl/UI.js.map
index 549839a6..3ff94dda 100644
--- a/Remotely_Server/wwwroot/scripts/RemoteControl/UI.js.map
+++ b/Remotely_Server/wwwroot/scripts/RemoteControl/UI.js.map
@@ -1 +1 @@
-{"version":3,"file":"UI.js","sourceRoot":"","sources":["UI.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"UI.js","sourceRoot":"","sources":["UI.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/UI.ts b/Remotely_Server/wwwroot/scripts/RemoteControl/UI.ts
index dd75bd11..0bfb4c61 100644
--- a/Remotely_Server/wwwroot/scripts/RemoteControl/UI.ts
+++ b/Remotely_Server/wwwroot/scripts/RemoteControl/UI.ts
@@ -8,7 +8,8 @@ export var SessionIDInput = document.querySelector("#sessionIDInput") as HTMLInp
 export var ConnectButton = document.querySelector("#connectButton") as HTMLButtonElement;
 export var RequesterNameInput = document.querySelector("#nameInput") as HTMLInputElement;
 export var StatusMessage = document.querySelector("#statusMessage") as HTMLDivElement;
-export var ScreenViewer = document.querySelector("#screenViewer") as HTMLVideoElement;
+export var ScreenViewer = document.querySelector("#screenViewer") as HTMLCanvasElement;
+export var Screen2DContext = ScreenViewer.getContext("2d");
 export var HorizontalBars = document.querySelectorAll(".horizontal-button-bar");
 export var ConnectBox = document.getElementById("connectBox") as HTMLDivElement;
 export var ScreenSelectBar = document.querySelector("#screenSelectBar") as HTMLDivElement;
@@ -255,9 +256,7 @@ export function ApplyInputHandlers(sockets: RCBrowserSockets, rtc: BrowserRTC) {
         var key = e.key.toLowerCase();
         sockets.SendKeyUp(key);
     });
-    window.addEventListener("click", function (e) {
-        ScreenViewer.muted = false;
-    });
+
     window.ondragover = function (e) {
         e.preventDefault();
         e.dataTransfer.dropEffect = "copy";
diff --git a/Remotely_Server/wwwroot/scripts/ResultsParser.js b/Remotely_Server/wwwroot/scripts/ResultsParser.js
index 7647ec80..e5204176 100644
--- a/Remotely_Server/wwwroot/scripts/ResultsParser.js
+++ b/Remotely_Server/wwwroot/scripts/ResultsParser.js
@@ -1,14 +1,14 @@
 import * as DataGrid from "./DataGrid.js";
 import { TabContentWrapper } from "./UI.js";
 export function CreateCommandHarness(context) {
-    var collapseClass = context.TargetMachineIDs.length > 1 ? "collapse" : "collapse in";
+    var collapseClass = context.TargetDeviceIDs.length > 1 ? "collapse" : "collapse in";
     var commandHarness = document.createElement("div");
     commandHarness.id = context.ID;
     commandHarness.classList.add("command-harness");
     commandHarness.innerHTML = `
         <div class="command-harness-title">
             Command Type: ${context.CommandMode}  |  
-            Total Machines: <span id="${context.ID}-totalmachines">${context.TargetMachineIDs.length}</span>  |  
+            Total Devices: <span id="${context.ID}-totaldevices">${context.TargetDeviceIDs.length}</span>  |  
             Completed: <span id="${context.ID}-completed">0%</span>  |
             Errors: <span id="${context.ID}-errors">0</span>  |  
             <button class="btn btn-xs btn-secondary" data-toggle="collapse" data-target="#${context.ID}-results">View</button> 
@@ -20,18 +20,18 @@ export function CreateCommandHarness(context) {
     return commandHarness;
 }
 export function AddPSCoreResultsHarness(result) {
-    var machineName = DataGrid.DataSource.find(x => x.ID == result.MachineID).MachineName;
+    var deviceName = DataGrid.DataSource.find(x => x.ID == result.DeviceID).DeviceName;
     var resultsWrapper = document.getElementById(result.CommandContextID + "-results");
-    var totalMachines = parseInt(document.getElementById(result.CommandContextID + "-totalmachines").innerText);
-    var collapseClass = totalMachines > 1 ? "collapse" : "collapse in";
+    var totalDevices = parseInt(document.getElementById(result.CommandContextID + "-totaldevices").innerText);
+    var collapseClass = totalDevices > 1 ? "collapse" : "collapse in";
     var resultDiv = document.createElement("div");
     resultDiv.innerHTML = `
         <div class="result-header">
-                Machine: ${machineName}  |  
+                Device: ${deviceName}  |  
                 Had Errors: ${result.ErrorOutput.length > 1 ? "Yes" : "No"}  |  
-                <button class="btn btn-xs btn-secondary" data-toggle="collapse" data-target="#${result.CommandContextID + result.MachineID}-result">View</button>
+                <button class="btn btn-xs btn-secondary" data-toggle="collapse" data-target="#${result.CommandContextID + result.DeviceID}-result">View</button>
         </div>
-        <div id="${result.CommandContextID + result.MachineID}-result" class="command-result-output ${collapseClass}">
+        <div id="${result.CommandContextID + result.DeviceID}-result" class="command-result-output ${collapseClass}">
             <div>Host Output:<br>${result.HostOutput.replace(/\n/g, "<br>").replace(/ /g, "&nbsp;")}</div>
             <div>Debug Output:<br>${result.DebugOutput.join("<br>").replace(/ /g, "&nbsp;")}</div>
             <div>Verbose Output:<br>${result.VerboseOutput.join("<br>").replace(/ /g, "&nbsp;")}</div>
@@ -48,18 +48,18 @@ export function AddPSCoreResultsHarness(result) {
     TabContentWrapper.scrollTop = TabContentWrapper.scrollHeight;
 }
 export function AddCommandResultsHarness(result) {
-    var machineName = DataGrid.DataSource.find(x => x.ID == result.MachineID).MachineName;
+    var deviceName = DataGrid.DataSource.find(x => x.ID == result.DeviceID).DeviceName;
     var resultsWrapper = document.getElementById(result.CommandContextID + "-results");
-    var totalMachines = parseInt(document.getElementById(result.CommandContextID + "-totalmachines").innerText);
-    var collapseClass = totalMachines > 1 ? "collapse" : "collapse in";
+    var totalDevices = parseInt(document.getElementById(result.CommandContextID + "-totaldevices").innerText);
+    var collapseClass = totalDevices > 1 ? "collapse" : "collapse in";
     var resultDiv = document.createElement("div");
     resultDiv.innerHTML = `
         <div class="result-header">
-                Machine: ${machineName}  |  
+                Device: ${deviceName}  |  
                 Had Errors: ${result.ErrorOutput.length > 1 ? "Yes" : "No"}  |  
-                <button class="btn btn-xs btn-secondary" data-toggle="collapse" data-target="#${result.CommandContextID + result.MachineID}-result">View</button>
+                <button class="btn btn-xs btn-secondary" data-toggle="collapse" data-target="#${result.CommandContextID + result.DeviceID}-result">View</button>
         </div>
-        <div id="${result.CommandContextID + result.MachineID}-result" class="command-result-output ${collapseClass}">
+        <div id="${result.CommandContextID + result.DeviceID}-result" class="command-result-output ${collapseClass}">
             <div>Standard Output:<br>${result.StandardOutput.replace(/\n/g, "<br>").replace(/ /g, "&nbsp;")}</div>
             <div>Error Output:<br>${result.ErrorOutput.replace(/\n/g, "<br>").replace(/ /g, "&nbsp;")}</div>
         </div>`;
@@ -73,8 +73,8 @@ export function AddCommandResultsHarness(result) {
     TabContentWrapper.scrollTop = TabContentWrapper.scrollHeight;
 }
 export function UpdateResultsCount(commandContextID) {
-    var totalMachines = parseInt(document.getElementById(commandContextID + "-totalmachines").innerText);
-    var percentComplete = Math.round(document.getElementById(commandContextID + "-results").children.length / totalMachines * 100);
+    var totalDevices = parseInt(document.getElementById(commandContextID + "-totaldevices").innerText);
+    var percentComplete = Math.round(document.getElementById(commandContextID + "-results").children.length / totalDevices * 100);
     document.getElementById(commandContextID + "-completed").innerText = String(percentComplete) + "%";
 }
 //# sourceMappingURL=ResultsParser.js.map
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/ResultsParser.js.map b/Remotely_Server/wwwroot/scripts/ResultsParser.js.map
index f2eb858f..38db2b9e 100644
--- a/Remotely_Server/wwwroot/scripts/ResultsParser.js.map
+++ b/Remotely_Server/wwwroot/scripts/ResultsParser.js.map
@@ -1 +1 @@
-{"version":3,"file":"ResultsParser.js","sourceRoot":"","sources":["ResultsParser.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"ResultsParser.js","sourceRoot":"","sources":["ResultsParser.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/ResultsParser.ts b/Remotely_Server/wwwroot/scripts/ResultsParser.ts
index 31ac7db7..fa7ed9c2 100644
--- a/Remotely_Server/wwwroot/scripts/ResultsParser.ts
+++ b/Remotely_Server/wwwroot/scripts/ResultsParser.ts
@@ -5,14 +5,14 @@ import { GenericCommandResult } from "./Models/GenericCommandResult.js";
 import { ConsoleOutputDiv, TabContentWrapper } from "./UI.js";
 
 export function CreateCommandHarness(context: CommandContext): HTMLDivElement {
-    var collapseClass = context.TargetMachineIDs.length > 1 ? "collapse" : "collapse in";
+    var collapseClass = context.TargetDeviceIDs.length > 1 ? "collapse" : "collapse in";
     var commandHarness = document.createElement("div");
     commandHarness.id = context.ID;
     commandHarness.classList.add("command-harness");
     commandHarness.innerHTML = `
         <div class="command-harness-title">
             Command Type: ${context.CommandMode}  |  
-            Total Machines: <span id="${context.ID}-totalmachines">${context.TargetMachineIDs.length}</span>  |  
+            Total Devices: <span id="${context.ID}-totaldevices">${context.TargetDeviceIDs.length}</span>  |  
             Completed: <span id="${context.ID}-completed">0%</span>  |
             Errors: <span id="${context.ID}-errors">0</span>  |  
             <button class="btn btn-xs btn-secondary" data-toggle="collapse" data-target="#${context.ID}-results">View</button> 
@@ -25,19 +25,19 @@ export function CreateCommandHarness(context: CommandContext): HTMLDivElement {
 }
 
 export function AddPSCoreResultsHarness(result: PSCoreCommandResult) {
-    var machineName = DataGrid.DataSource.find(x => x.ID == result.MachineID).MachineName;
+    var deviceName = DataGrid.DataSource.find(x => x.ID == result.DeviceID).DeviceName;
     var resultsWrapper = document.getElementById(result.CommandContextID + "-results");
-    var totalMachines = parseInt(document.getElementById(result.CommandContextID + "-totalmachines").innerText);
-    var collapseClass = totalMachines > 1 ? "collapse" : "collapse in";
+    var totalDevices = parseInt(document.getElementById(result.CommandContextID + "-totaldevices").innerText);
+    var collapseClass = totalDevices > 1 ? "collapse" : "collapse in";
     
     var resultDiv = document.createElement("div");
     resultDiv.innerHTML = `
         <div class="result-header">
-                Machine: ${machineName}  |  
+                Device: ${deviceName}  |  
                 Had Errors: ${result.ErrorOutput.length > 1 ? "Yes": "No"}  |  
-                <button class="btn btn-xs btn-secondary" data-toggle="collapse" data-target="#${result.CommandContextID + result.MachineID}-result">View</button>
+                <button class="btn btn-xs btn-secondary" data-toggle="collapse" data-target="#${result.CommandContextID + result.DeviceID}-result">View</button>
         </div>
-        <div id="${result.CommandContextID + result.MachineID}-result" class="command-result-output ${collapseClass}">
+        <div id="${result.CommandContextID + result.DeviceID}-result" class="command-result-output ${collapseClass}">
             <div>Host Output:<br>${result.HostOutput.replace(/\n/g, "<br>").replace(/ /g, "&nbsp;")}</div>
             <div>Debug Output:<br>${result.DebugOutput.join("<br>").replace(/ /g, "&nbsp;")}</div>
             <div>Verbose Output:<br>${result.VerboseOutput.join("<br>").replace(/ /g, "&nbsp;")}</div>
@@ -54,19 +54,19 @@ export function AddPSCoreResultsHarness(result: PSCoreCommandResult) {
     TabContentWrapper.scrollTop = TabContentWrapper.scrollHeight;
 }
 export function AddCommandResultsHarness(result: GenericCommandResult) {
-    var machineName = DataGrid.DataSource.find(x => x.ID == result.MachineID).MachineName;
+    var deviceName = DataGrid.DataSource.find(x => x.ID == result.DeviceID).DeviceName;
     var resultsWrapper = document.getElementById(result.CommandContextID + "-results");
-    var totalMachines = parseInt(document.getElementById(result.CommandContextID + "-totalmachines").innerText);
-    var collapseClass = totalMachines > 1 ? "collapse" : "collapse in";
+    var totalDevices = parseInt(document.getElementById(result.CommandContextID + "-totaldevices").innerText);
+    var collapseClass = totalDevices > 1 ? "collapse" : "collapse in";
     
     var resultDiv = document.createElement("div");
     resultDiv.innerHTML = `
         <div class="result-header">
-                Machine: ${machineName}  |  
+                Device: ${deviceName}  |  
                 Had Errors: ${result.ErrorOutput.length > 1 ? "Yes" : "No"}  |  
-                <button class="btn btn-xs btn-secondary" data-toggle="collapse" data-target="#${result.CommandContextID + result.MachineID}-result">View</button>
+                <button class="btn btn-xs btn-secondary" data-toggle="collapse" data-target="#${result.CommandContextID + result.DeviceID}-result">View</button>
         </div>
-        <div id="${result.CommandContextID + result.MachineID}-result" class="command-result-output ${collapseClass}">
+        <div id="${result.CommandContextID + result.DeviceID}-result" class="command-result-output ${collapseClass}">
             <div>Standard Output:<br>${result.StandardOutput.replace(/\n/g, "<br>").replace(/ /g, "&nbsp;")}</div>
             <div>Error Output:<br>${result.ErrorOutput.replace(/\n/g, "<br>").replace(/ /g, "&nbsp;")}</div>
         </div>`;
@@ -81,7 +81,7 @@ export function AddCommandResultsHarness(result: GenericCommandResult) {
 }
 
 export function UpdateResultsCount(commandContextID:string) {
-    var totalMachines = parseInt(document.getElementById(commandContextID + "-totalmachines").innerText);
-    var percentComplete = Math.round(document.getElementById(commandContextID + "-results").children.length / totalMachines * 100);
+    var totalDevices = parseInt(document.getElementById(commandContextID + "-totaldevices").innerText);
+    var percentComplete = Math.round(document.getElementById(commandContextID + "-results").children.length / totalDevices * 100);
     document.getElementById(commandContextID + "-completed").innerText = String(percentComplete) + "%";
 }
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/UI.js b/Remotely_Server/wwwroot/scripts/UI.js
index 7c8c8f09..fbf638f5 100644
--- a/Remotely_Server/wwwroot/scripts/UI.js
+++ b/Remotely_Server/wwwroot/scripts/UI.js
@@ -1,15 +1,15 @@
 import { UserSettings } from "./UserSettings.js";
 import * as Utilities from "./Utilities.js";
-import { GetSelectedMachines } from "./DataGrid.js";
+import { GetSelectedDevices } from "./DataGrid.js";
 export var CommandCompletionDiv = document.querySelector("#commandCompletionDiv");
 export var CommandInfoDiv = document.querySelector("#commandInfoDiv");
 export var CommandModeSelect = document.querySelector("#commandModeSelect");
 export var ConsoleOutputDiv = document.querySelector("#consoleOutputDiv");
 export var ConsoleTextArea = document.querySelector("#consoleTextArea");
-export var MachineGrid = document.querySelector("#machineGrid");
-export var MachinesSelectedCount = document.querySelector("#machinesSelectedSpan");
-export var OnlineMachinesCount = document.querySelector("#onlineMachinesSpan");
-export var TotalMachinesCount = document.querySelector("#totalMachinesSpan");
+export var DeviceGrid = document.querySelector("#deviceGrid");
+export var DevicesSelectedCount = document.querySelector("#devicesSelectedSpan");
+export var OnlineDevicesCount = document.querySelector("#onlineDevicesSpan");
+export var TotalDevicesCount = document.querySelector("#totalDevicesSpan");
 export var MeasurementCanvas = document.createElement("canvas");
 export var MeasurementContext = MeasurementCanvas.getContext("2d");
 export var TabContentWrapper = document.getElementById("tabContentWrapper");
@@ -33,15 +33,15 @@ export function AddConsoleHTML(html) {
     ConsoleOutputDiv.appendChild(contentWrapper);
     TabContentWrapper.scrollTop = TabContentWrapper.scrollHeight;
 }
-export function AddTransferHarness(transferID, totalMachines) {
-    GetSelectedMachines();
+export function AddTransferHarness(transferID, totalDevices) {
+    GetSelectedDevices();
     var transferHarness = document.createElement("div");
     transferHarness.id = transferID;
     transferHarness.classList.add("command-harness");
     transferHarness.innerHTML = `
         <div class="command-harness-title">
             File Transfer Status  |  
-            Total Machines: ${totalMachines} |  
+            Total Devices: ${totalDevices} |  
             Completed: <span id="${transferID}-completed">0</span>
         </div>`;
     AddConsoleHTML(transferHarness.outerHTML);
diff --git a/Remotely_Server/wwwroot/scripts/UI.js.map b/Remotely_Server/wwwroot/scripts/UI.js.map
index 6bcf8313..82f69de0 100644
--- a/Remotely_Server/wwwroot/scripts/UI.js.map
+++ b/Remotely_Server/wwwroot/scripts/UI.js.map
@@ -1 +1 @@
-{"version":3,"file":"UI.js","sourceRoot":"","sources":["UI.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"UI.js","sourceRoot":"","sources":["UI.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Remotely_Server/wwwroot/scripts/UI.ts b/Remotely_Server/wwwroot/scripts/UI.ts
index 7bd6c787..78965fc5 100644
--- a/Remotely_Server/wwwroot/scripts/UI.ts
+++ b/Remotely_Server/wwwroot/scripts/UI.ts
@@ -12,7 +12,7 @@ import { CommandContext } from "./Models/CommandContext.js";
 import * as DataGrid from "./DataGrid.js";
 import { CreateCommandHarness, AddPSCoreResultsHarness, UpdateResultsCount, AddCommandResultsHarness } from "./ResultsParser.js";
 import { GenericCommandResult } from "./Models/GenericCommandResult.js";
-import { GetSelectedMachines } from "./DataGrid.js";
+import { GetSelectedDevices } from "./DataGrid.js";
 
 
 export var CommandCompletionDiv = document.querySelector("#commandCompletionDiv") as HTMLDivElement;
@@ -20,10 +20,10 @@ export var CommandInfoDiv = document.querySelector("#commandInfoDiv") as HTMLDiv
 export var CommandModeSelect = document.querySelector("#commandModeSelect") as HTMLSelectElement;
 export var ConsoleOutputDiv = document.querySelector("#consoleOutputDiv") as HTMLDivElement;
 export var ConsoleTextArea = document.querySelector("#consoleTextArea") as HTMLTextAreaElement;
-export var MachineGrid = document.querySelector("#machineGrid") as HTMLTableElement;
-export var MachinesSelectedCount = document.querySelector("#machinesSelectedSpan") as HTMLSpanElement;
-export var OnlineMachinesCount = document.querySelector("#onlineMachinesSpan") as HTMLSpanElement;
-export var TotalMachinesCount = document.querySelector("#totalMachinesSpan") as HTMLSpanElement;
+export var DeviceGrid = document.querySelector("#deviceGrid") as HTMLTableElement;
+export var DevicesSelectedCount = document.querySelector("#devicesSelectedSpan") as HTMLSpanElement;
+export var OnlineDevicesCount = document.querySelector("#onlineDevicesSpan") as HTMLSpanElement;
+export var TotalDevicesCount = document.querySelector("#totalDevicesSpan") as HTMLSpanElement;
 export var MeasurementCanvas = document.createElement("canvas");
 export var MeasurementContext = MeasurementCanvas.getContext("2d");
 export var TabContentWrapper = document.getElementById("tabContentWrapper") as HTMLDivElement;
@@ -55,15 +55,15 @@ export function AddConsoleHTML(html: string) {
 
     TabContentWrapper.scrollTop = TabContentWrapper.scrollHeight;
 }
-export function AddTransferHarness(transferID: string, totalMachines:number) {
-    GetSelectedMachines()
+export function AddTransferHarness(transferID: string, totalDevices:number) {
+    GetSelectedDevices()
     var transferHarness = document.createElement("div");
     transferHarness.id = transferID;
     transferHarness.classList.add("command-harness");
     transferHarness.innerHTML = `
         <div class="command-harness-title">
             File Transfer Status  |  
-            Total Machines: ${totalMachines} |  
+            Total Devices: ${totalDevices} |  
             Completed: <span id="${transferID}-completed">0</span>
         </div>`;
     AddConsoleHTML(transferHarness.outerHTML);