diff --git a/QControlKit/Events/QEventHandlers.cs b/QControlKit/Events/QEventHandlers.cs
index 2b17d19..a427fcb 100644
--- a/QControlKit/Events/QEventHandlers.cs
+++ b/QControlKit/Events/QEventHandlers.cs
@@ -1,4 +1,6 @@
-namespace QControlKit.Events
+using System;
+
+namespace QControlKit.Events
 {
     public delegate void QServerFoundHandler(object source, QServerFoundArgs args);
     public delegate void QServerLostHandler(object source, QServerLostArgs args);
@@ -16,7 +18,6 @@
     public delegate void QWorkspaceConnectionErrorHandler(object source, QWorkspaceConnectionErrorArgs args);
     public delegate void QQLabPreferencesUpdatedHandler(object source, QQLabPreferencesUpdatedArgs args);
 
-
     public delegate void QCueUpdatedHandler(object source, QCueUpdatedArgs args);
     public delegate void QCuePropertiesUpdatedHandler(object source, QCuePropertiesUpdatedArgs args);
     public delegate void QCueListsUpdatesHandler(object source, QCueListsUpdatedArgs args);
diff --git a/QControlKit/QControlKit.csproj b/QControlKit/QControlKit.csproj
index 562a1fa..1250793 100644
--- a/QControlKit/QControlKit.csproj
+++ b/QControlKit/QControlKit.csproj
@@ -6,7 +6,7 @@
     <Authors>Joel Wetzell</Authors>
     <Version>1.0.0-devel</Version>
     <PackOnBuild>true</PackOnBuild>
-    <PackageVersion>0.0.20</PackageVersion>
+    <PackageVersion>0.0.21</PackageVersion>
     <PackageId>QControlKit</PackageId>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Summary>Unofficial C# port of Figure53's QLabKit.objc</Summary>
diff --git a/QControlKit/QMessage.cs b/QControlKit/QMessage.cs
index 7b7c09d..154b17e 100644
--- a/QControlKit/QMessage.cs
+++ b/QControlKit/QMessage.cs
@@ -103,6 +103,7 @@ namespace QControlKit
                 return (parts.Length == 4 && parts[3].Equals("connect"));
             }
         }
+
         #endregion
 
         //host method
diff --git a/QControlKit/QWorkspace.cs b/QControlKit/QWorkspace.cs
index cd856cf..85d607a 100644
--- a/QControlKit/QWorkspace.cs
+++ b/QControlKit/QWorkspace.cs
@@ -24,9 +24,6 @@ namespace QControlKit
 
         private QCue root;
 
-        private Timer heartbeatTimer;
-        private int heartbeatAttempts;
-
         public bool defaultSendUpdatesOSC;
 
         public string version;
@@ -38,7 +35,6 @@ namespace QControlKit
         public event QWorkspaceDisconnectedHandler WorkspaceDisconnected;
         public event QWorkspaceConnectedHandler WorkspaceConnected;
 
-
         private void Init()
         {
             name = "";
@@ -219,8 +215,6 @@ namespace QControlKit
             Log.Information($"[workspace] disconnecting from <{name}>");
             if (!connected)
                 return;
-            if (heartbeatTimer != null)
-                stopHeartbeat();
             stopReceivingUpdates();
             disconnectFromWorkspace();
 
@@ -269,39 +263,7 @@ namespace QControlKit
         #endregion
 
         #region Heartbeat
-        //TODO
-        public void startHeartbeat()
-        {
-            clearHeartbeatTimeout();
-            sendHeartbeat();
-        }
-
-        public void stopHeartbeat()
-        {
-            clearHeartbeatTimeout();
-            heartbeatAttempts = -1;
-        }
-
-        public void clearHeartbeatTimeout()
-        {
-            heartbeatTimer.Stop();
-            heartbeatTimer = null;
-            heartbeatAttempts = 0;
-            //TODO
-        }
-
-        public void sendHeartbeat()
-        {
-            client.sendMessage("/thump");
-            //TODO
-        }
-
-        public void heartbeatTimeout(object sender, ElapsedEventArgs e)
-        {
-            //TODO
-        }
-
-
+        //TODO? Do I even need this if I only allow TCP and just watch for a change in the state of the TCP connection
 
         #endregion
 
diff --git a/QControlKitXamDemo/QControlKitXamDemo.Android/QControlKitXamDemo.Android.csproj b/QControlKitXamDemo/QControlKitXamDemo.Android/QControlKitXamDemo.Android.csproj
index c0c1a3e..466bc0d 100644
--- a/QControlKitXamDemo/QControlKitXamDemo.Android/QControlKitXamDemo.Android.csproj
+++ b/QControlKitXamDemo/QControlKitXamDemo.Android/QControlKitXamDemo.Android.csproj
@@ -57,7 +57,7 @@
     <PackageReference Include="Serilog.Sinks.Xamarin">
       <Version>0.2.0.64</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2244" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2291" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/QControlKitXamDemo/QControlKitXamDemo.iOS/QControlKitXamDemo.iOS.csproj b/QControlKitXamDemo/QControlKitXamDemo.iOS/QControlKitXamDemo.iOS.csproj
index c733ff8..33f7306 100644
--- a/QControlKitXamDemo/QControlKitXamDemo.iOS/QControlKitXamDemo.iOS.csproj
+++ b/QControlKitXamDemo/QControlKitXamDemo.iOS/QControlKitXamDemo.iOS.csproj
@@ -131,7 +131,7 @@
     <PackageReference Include="Serilog.Sinks.Xamarin">
       <Version>0.2.0.64</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2244" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2291" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
diff --git a/QControlKitXamDemo/QControlKitXamDemo/QControlKitXamDemo.csproj b/QControlKitXamDemo/QControlKitXamDemo/QControlKitXamDemo.csproj
index 45ca61d..4eef9fa 100644
--- a/QControlKitXamDemo/QControlKitXamDemo/QControlKitXamDemo.csproj
+++ b/QControlKitXamDemo/QControlKitXamDemo/QControlKitXamDemo.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2244" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2291" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
   </ItemGroup>