diff --git a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
index 35e80c21..5cd2260f 100644
--- a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
+++ b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
@@ -139,6 +139,7 @@
     <Compile Include="VideoCodec\CiscoCodec\CallHistoryDataClasses.cs" />
     <Compile Include="VideoCodec\CiscoCodec\CiscoSparkCodec.cs" />
     <Compile Include="VideoCodec\CiscoCodec\CiscoSparkCodecPropertiesConfig.cs" />
+    <Compile Include="VideoCodec\CiscoCodec\xStatusSparkPlus.cs" />
     <Compile Include="VideoCodec\MockVC\MockVcPropertiesConfig.cs" />
     <Compile Include="VideoCodec\CiscoCodec\PhonebookDataClasses.cs" />
     <Compile Include="VideoCodec\CiscoCodec\xConfiguration.cs" />
diff --git a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/BookingsDataClasses.cs b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/BookingsDataClasses.cs
index 405b5047..9525aa57 100644
--- a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/BookingsDataClasses.cs	
+++ b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/BookingsDataClasses.cs	
@@ -23,7 +23,27 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         public class LastUpdated
         {
-            public DateTime Value { get; set; }
+            string _value;
+
+            public DateTime Value { 
+                get
+                {
+                    DateTime _valueDateTime;
+                    try
+                    {
+                        _valueDateTime = DateTime.Parse(_value);
+                        return _valueDateTime;
+                    }
+                    catch
+                    {
+                        return new DateTime();
+                    }
+                }
+                set
+                {
+                    _value = value.ToString();                                    
+                }
+            }
         }
 
         public class Id
@@ -275,7 +295,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         {
             public string status { get; set; }
             public ResultInfo ResultInfo { get; set; }
-            public LastUpdated LastUpdated { get; set; }
+            //public LastUpdated LastUpdated { get; set; }
             public List<Booking> Booking { get; set; }
         }
 
diff --git a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index 209c6369..9d543a15 100644
--- a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -44,11 +44,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public StringFeedback LocalLayoutFeedback { get; private set; }
 
-		/// <summary>
-		/// An internal pseudo-source that is routable and connected to the osd input
-		/// </summary>
-		public DummyRoutingInputsDevice OsdSource { get; private set; }
-
         private CodecCommandWithLabel CurrentSelfviewPipPosition;
 
         private CodecCommandWithLabel CurrentLocalLayout;
@@ -373,7 +368,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 prefix + "/Status/Video/Selfview" + Delimiter +
                 prefix + "/Status/Video/Layout" + Delimiter +
                 prefix + "/Bookings" + Delimiter +
-                prefix + "/Event/CallDisconnect" + Delimiter;        
+                prefix + "/Event/CallDisconnect" + Delimiter;// + 
+                //prefix + "/Event/Bookings" + Delimiter;
 
             return base.CustomActivate();
         }
@@ -726,7 +722,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                         {
                             var directoryResults = new CodecDirectory();
 
-                            directoryResults = CiscoCodecPhonebook.ConvertCiscoPhonebookToGeneric(codecPhonebookResponse.CommandResponse.PhonebookSearchResult);
+                            if(codecPhonebookResponse.CommandResponse.PhonebookSearchResult.ResultInfo.TotalRows.Value != "0")
+                                directoryResults = CiscoCodecPhonebook.ConvertCiscoPhonebookToGeneric(codecPhonebookResponse.CommandResponse.PhonebookSearchResult);
 
                             PrintPhonebook(directoryResults);
 
@@ -1004,7 +1001,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         public void SelectPresentationSource1()
         {
-            SelectPresentationByConnector(1);
+            SelectPresentationByConnector(2);
         }
 
         /// <summary>
@@ -1012,7 +1009,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         /// </summary>
         public void SelectPresentationSource2()
         {
-            SelectPresentationByConnector(2);
+            SelectPresentationByConnector(3);
         }
 
         /// <summary>
diff --git a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xConfiguration.cs b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xConfiguration.cs
index bdded993..d82dfc3f 100644
--- a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xConfiguration.cs	
+++ b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xConfiguration.cs	
@@ -17,19 +17,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode
-        {
-            public string valueSpaceRef { get; set; }
-            public string Value { get; set; }
-        }
-
         public class Dereverberation
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
         }
 
-        public class Mode2
+        public class Mode
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -44,7 +38,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public class EchoControl
         {
             public Dereverberation Dereverberation { get; set; }
-            public Mode2 Mode { get; set; }
+            public Mode Mode { get; set; }
             public NoiseReduction NoiseReduction { get; set; }
         }
 
@@ -54,12 +48,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
+        public class Mode2
+        {
+            public string valueSpaceRef { get; set; }
+            public string Value { get; set; }
+        }
+
         public class Microphone
         {
             public string id { get; set; }
-            public Mode Mode { get; set; }
             public EchoControl EchoControl { get; set; }
             public Level Level { get; set; }
+            public Mode2 Mode { get; set; }
         }
 
         public class Input
@@ -94,29 +94,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Mode3 Mode { get; set; }
         }
 
-        public class Mode4
-        {
-            public string valueSpaceRef { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class OutputType
-        {
-            public string valueSpaceRef { get; set; }
-            public string Value { get; set; }
-        }
-
-        public class Line
-        {
-            public string id { get; set; }
-            public Mode4 Mode { get; set; }
-            public OutputType OutputType { get; set; }
-        }
-
         public class Output
         {
             public InternalSpeaker InternalSpeaker { get; set; }
-            public List<Line> Line { get; set; }
         }
 
         public class RingTone
@@ -146,38 +126,120 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public SoundsAndAlerts SoundsAndAlerts { get; set; }
         }
 
-        public class Framerate
+        public class DefaultMode
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
         }
 
-        public class Camera
+        public class Backlight
         {
-            public Framerate Framerate { get; set; }
+            public DefaultMode DefaultMode { get; set; }
         }
 
-        public class Closeup
+        public class DefaultLevel
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
         }
 
+        public class Mode4
+        {
+            public string valueSpaceRef { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class Brightness
+        {
+            public DefaultLevel DefaultLevel { get; set; }
+            public Mode4 Mode { get; set; }
+        }
+
         public class Mode5
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
         }
 
+        public class Focus
+        {
+            public Mode5 Mode { get; set; }
+        }
+
+        public class Level2
+        {
+            public string valueSpaceRef { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class Mode6
+        {
+            public string valueSpaceRef { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class Gamma
+        {
+            public Level2 Level { get; set; }
+            public Mode6 Mode { get; set; }
+        }
+
+        public class Mirror
+        {
+            public string valueSpaceRef { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class Level3
+        {
+            public string valueSpaceRef { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class Mode7
+        {
+            public string valueSpaceRef { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class Whitebalance
+        {
+            public Level3 Level { get; set; }
+            public Mode7 Mode { get; set; }
+        }
+
+        public class Camera
+        {
+            public string id { get; set; }
+            public Backlight Backlight { get; set; }
+            public Brightness Brightness { get; set; }
+            public Focus Focus { get; set; }
+            public Gamma Gamma { get; set; }
+            public Mirror Mirror { get; set; }
+            public Whitebalance Whitebalance { get; set; }
+        }
+
+        public class Closeup
+        {
+            public string valueSpaceRef { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class Mode8
+        {
+            public string valueSpaceRef { get; set; }
+            public string Value { get; set; }
+        }
+
         public class SpeakerTrack
         {
             public Closeup Closeup { get; set; }
-            public Mode5 Mode { get; set; }
+            public Mode8 Mode { get; set; }
         }
 
         public class Cameras
         {
-            public Camera Camera { get; set; }
+            public List<Camera> Camera { get; set; }
             public SpeakerTrack SpeakerTrack { get; set; }
         }
 
@@ -187,7 +249,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode6
+        public class Mode9
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -202,7 +264,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public class AutoAnswer
         {
             public Delay Delay { get; set; }
-            public Mode6 Mode { get; set; }
+            public Mode9 Mode { get; set; }
             public Mute2 Mute { get; set; }
         }
 
@@ -235,7 +297,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public DefaultTimeout DefaultTimeout { get; set; }
         }
 
-        public class Mode7
+        public class Mode10
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -243,10 +305,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class Encryption
         {
-            public Mode7 Mode { get; set; }
+            public Mode10 Mode { get; set; }
         }
 
-        public class Mode8
+        public class Mode11
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -254,7 +316,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class FarEndControl
         {
-            public Mode8 Mode { get; set; }
+            public Mode11 Mode { get; set; }
         }
 
         public class MaxReceiveCallRate
@@ -281,7 +343,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode9
+        public class Mode12
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -289,7 +351,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class MultiStream
         {
-            public Mode9 Mode { get; set; }
+            public Mode12 Mode { get; set; }
         }
 
         public class Conference
@@ -312,7 +374,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode10
+        public class Mode13
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -327,11 +389,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public class Authentication
         {
             public LoginName LoginName { get; set; }
-            public Mode10 Mode { get; set; }
+            public Mode13 Mode { get; set; }
             public Password Password { get; set; }
         }
 
-        public class Mode11
+        public class Mode14
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -339,7 +401,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class CallSetup
         {
-            public Mode11 Mode { get; set; }
+            public Mode14 Mode { get; set; }
         }
 
         public class KeySize
@@ -388,7 +450,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode12
+        public class Mode15
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -397,7 +459,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public class NAT
         {
             public Address2 Address { get; set; }
-            public Mode12 Mode { get; set; }
+            public Mode15 Mode { get; set; }
         }
 
         public class H323
@@ -483,7 +545,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode13
+        public class Mode16
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -512,7 +574,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public AnonymousIdentity AnonymousIdentity { get; set; }
             public Eap Eap { get; set; }
             public Identity Identity { get; set; }
-            public Mode13 Mode { get; set; }
+            public Mode16 Mode { get; set; }
             public Password2 Password { get; set; }
             public TlsVerify TlsVerify { get; set; }
             public UseClientCertificate UseClientCertificate { get; set; }
@@ -640,7 +702,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Video Video { get; set; }
         }
 
-        public class Mode14
+        public class Mode17
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -649,7 +711,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public class QoS
         {
             public Diffserv Diffserv { get; set; }
-            public Mode14 Mode { get; set; }
+            public Mode17 Mode { get; set; }
         }
 
         public class Allow
@@ -669,7 +731,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode15
+        public class Mode18
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -683,7 +745,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class Voice
         {
-            public Mode15 Mode { get; set; }
+            public Mode18 Mode { get; set; }
             public VlanId VlanId { get; set; }
         }
 
@@ -707,7 +769,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public VLAN VLAN { get; set; }
         }
 
-        public class Mode16
+        public class Mode19
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -715,10 +777,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class CDP
         {
-            public Mode16 Mode { get; set; }
+            public Mode19 Mode { get; set; }
         }
 
-        public class Mode17
+        public class Mode20
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -726,10 +788,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class H3232
         {
-            public Mode17 Mode { get; set; }
+            public Mode20 Mode { get; set; }
         }
 
-        public class Mode18
+        public class Mode21
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -737,7 +799,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class HTTP
         {
-            public Mode18 Mode { get; set; }
+            public Mode21 Mode { get; set; }
         }
 
         public class MinimumTLSVersion
@@ -777,7 +839,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public VerifyServerCertificate VerifyServerCertificate { get; set; }
         }
 
-        public class Mode19
+        public class Mode22
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -797,11 +859,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class NTP2
         {
-            public Mode19 Mode { get; set; }
+            public Mode22 Mode { get; set; }
             public List<Server3> Server { get; set; }
         }
 
-        public class Mode20
+        public class Mode23
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -809,7 +871,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class SIP
         {
-            public Mode20 Mode { get; set; }
+            public Mode23 Mode { get; set; }
         }
 
         public class CommunityName
@@ -830,7 +892,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Address7 Address { get; set; }
         }
 
-        public class Mode21
+        public class Mode24
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -852,12 +914,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             public CommunityName CommunityName { get; set; }
             public List<Host> Host { get; set; }
-            public Mode21 Mode { get; set; }
+            public Mode24 Mode { get; set; }
             public SystemContact SystemContact { get; set; }
             public SystemLocation SystemLocation { get; set; }
         }
 
-        public class Mode22
+        public class Mode25
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -865,10 +927,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class SSH
         {
-            public Mode22 Mode { get; set; }
+            public Mode25 Mode { get; set; }
         }
 
-        public class Mode23
+        public class Mode26
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -876,7 +938,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class UPnP
         {
-            public Mode23 Mode { get; set; }
+            public Mode26 Mode { get; set; }
         }
 
         public class WelcomeText
@@ -1017,7 +1079,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode24
+        public class Mode27
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -1035,11 +1097,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public ExternalManager ExternalManager { get; set; }
             public HttpMethod HttpMethod { get; set; }
             public LoginName2 LoginName { get; set; }
-            public Mode24 Mode { get; set; }
+            public Mode27 Mode { get; set; }
             public Password3 Password { get; set; }
         }
 
-        public class Mode25
+        public class Mode28
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -1077,7 +1139,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class Proximity
         {
-            public Mode25 Mode { get; set; }
+            public Mode28 Mode { get; set; }
             public Services Services { get; set; }
         }
 
@@ -1135,7 +1197,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode26
+        public class Mode29
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -1144,7 +1206,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public class Ice
         {
             public DefaultCandidate DefaultCandidate { get; set; }
-            public Mode26 Mode { get; set; }
+            public Mode29 Mode { get; set; }
         }
 
         public class ListenPort
@@ -1220,7 +1282,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode27
+        public class Mode30
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -1230,7 +1292,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             public BaudRate BaudRate { get; set; }
             public LoginRequired LoginRequired { get; set; }
-            public Mode27 Mode { get; set; }
+            public Mode30 Mode { get; set; }
         }
 
         public class BootAction
@@ -1319,7 +1381,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Type2 Type { get; set; }
         }
 
-        public class Mode28
+        public class Mode31
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -1327,7 +1389,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class KeyTones
         {
-            public Mode28 Mode { get; set; }
+            public Mode31 Mode { get; set; }
         }
 
         public class Language
@@ -1397,7 +1459,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode29
+        public class Mode32
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -1434,7 +1496,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public BaseDN BaseDN { get; set; }
             public Encryption3 Encryption { get; set; }
             public MinimumTLSVersion2 MinimumTLSVersion { get; set; }
-            public Mode29 Mode { get; set; }
+            public Mode32 Mode { get; set; }
             public Server6 Server { get; set; }
             public VerifyServerCertificate2 VerifyServerCertificate { get; set; }
         }
@@ -1456,7 +1518,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode30
+        public class Mode33
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -1465,7 +1527,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public class CameraControl
         {
             public CameraId CameraId { get; set; }
-            public Mode30 Mode { get; set; }
+            public Mode33 Mode { get; set; }
         }
 
         public class InputSourceType
@@ -1480,12 +1542,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Visibility
-        {
-            public string valueSpaceRef { get; set; }
-            public string Value { get; set; }
-        }
-
         public class PreferredResolution
         {
             public string valueSpaceRef { get; set; }
@@ -1504,16 +1560,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
+        public class Visibility
+        {
+            public string valueSpaceRef { get; set; }
+            public string Value { get; set; }
+        }
+
         public class Connector
         {
             public string id { get; set; }
             public CameraControl CameraControl { get; set; }
             public InputSourceType InputSourceType { get; set; }
             public Name3 Name { get; set; }
-            public Visibility Visibility { get; set; }
             public PreferredResolution PreferredResolution { get; set; }
             public PresentationSelection PresentationSelection { get; set; }
             public Quality Quality { get; set; }
+            public Visibility Visibility { get; set; }
         }
 
         public class Input2
@@ -1527,7 +1589,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode31
+        public class Mode34
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -1535,7 +1597,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class CEC
         {
-            public Mode31 Mode { get; set; }
+            public Mode34 Mode { get; set; }
         }
 
         public class MonitorRole
@@ -1580,7 +1642,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode32
+        public class Mode35
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -1601,7 +1663,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public class Default
         {
             public FullscreenMode FullscreenMode { get; set; }
-            public Mode32 Mode { get; set; }
+            public Mode35 Mode { get; set; }
             public OnMonitorRole OnMonitorRole { get; set; }
             public PIPPosition PIPPosition { get; set; }
         }
@@ -1612,7 +1674,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode33
+        public class Mode36
         {
             public string valueSpaceRef { get; set; }
             public string Value { get; set; }
@@ -1621,7 +1683,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public class OnCall
         {
             public Duration Duration { get; set; }
-            public Mode33 Mode { get; set; }
+            public Mode36 Mode { get; set; }
         }
 
         public class Selfview
diff --git a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs
index e33606f0..4209067d 100644
--- a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs	
+++ b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs	
@@ -31,15 +31,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         }
 
+
         public class ConnectionStatus
         {
             public string Value { get; set; }
         }
 
+        public class EcReferenceDelay
+        {
+            public string Value { get; set; }
+        }
+
         public class Microphone
         {
             public string id { get; set; }
             public ConnectionStatus ConnectionStatus { get; set; }
+            public EcReferenceDelay EcReferenceDelay { get; set; }
         }
 
         public class Connectors
@@ -205,6 +212,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
+        public class Flip
+        {
+            public string Value { get; set; }
+        }
+
+        public class HardwareID
+        {
+            public string Value { get; set; }
+        }
+
         public class Manufacturer
         {
             public string Value { get; set; }
@@ -237,15 +254,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Zoom Zoom { get; set; }
         }
 
+        public class SoftwareID
+        {
+            public string Value { get; set; }
+        }
+
         public class Camera
         {
             public string id { get; set; }
             public Capabilities Capabilities { get; set; }
             public Connected Connected { get; set; }
-            public Framerate Framerate { get; set; }
+            public Flip Flip { get; set; }
+            public HardwareID HardwareID { get; set; }
+            public MacAddress MacAddress { get; set; }
             public Manufacturer Manufacturer { get; set; }
             public Model Model { get; set; }
             public Position Position { get; set; }
+            public SerialNumber SerialNumber { get; set; }
+            public SoftwareID SoftwareID { get; set; }
         }
 
         public class Availability
diff --git a/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatusSparkPlus.cs b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatusSparkPlus.cs
new file mode 100644
index 00000000..014a4e60
--- /dev/null
+++ b/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatusSparkPlus.cs	
@@ -0,0 +1,1552 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.VideoCodec.CiscoCodec
+{
+    public class xStatusSparkPlus
+    {
+        public class ConnectionStatus
+        {
+            public string Value { get; set; }
+        }
+
+        public class EcReferenceDelay
+        {
+            public string Value { get; set; }
+        }
+
+        public class Microphone
+        {
+            public string id { get; set; }
+            public ConnectionStatus ConnectionStatus { get; set; }
+            public EcReferenceDelay EcReferenceDelay { get; set; }
+        }
+
+        public class Connectors
+        {
+            public List<Microphone> Microphone { get; set; }
+        }
+
+        public class Input
+        {
+            public Connectors Connectors { get; set; }
+        }
+
+        public class Mute
+        {
+            public string Value { get; set; }
+        }
+
+        public class Microphones
+        {
+            public Mute Mute { get; set; }
+        }
+
+        public class ConnectionStatus2
+        {
+            public string Value { get; set; }
+        }
+
+        public class DelayMs
+        {
+            public string Value { get; set; }
+        }
+
+        public class Line
+        {
+            public string id { get; set; }
+            public ConnectionStatus2 ConnectionStatus { get; set; }
+            public DelayMs DelayMs { get; set; }
+        }
+
+        public class Connectors2
+        {
+            public List<Line> Line { get; set; }
+        }
+
+        public class Output
+        {
+            public Connectors2 Connectors { get; set; }
+        }
+
+        public class Volume
+        {
+            public string Value { get; set; }
+        }
+
+        public class VolumeMute
+        {
+            public string Value { get; set; }
+        }
+
+        public class Audio
+        {
+            public Input Input { get; set; }
+            public Microphones Microphones { get; set; }
+            public Output Output { get; set; }
+            public Volume Volume { get; set; }
+            public VolumeMute VolumeMute { get; set; }
+        }
+
+        public class Id
+        {
+            public string Value { get; set; }
+        }
+
+        public class Current
+        {
+            public Id Id { get; set; }
+        }
+
+        public class Bookings
+        {
+            public Current Current { get; set; }
+        }
+
+        public class Options
+        {
+            public string Value { get; set; }
+        }
+
+        public class Capabilities
+        {
+            public Options Options { get; set; }
+        }
+
+        public class Connected
+        {
+            public string Value { get; set; }
+        }
+
+        public class Flip
+        {
+            public string Value { get; set; }
+        }
+
+        public class HardwareID
+        {
+            public string Value { get; set; }
+        }
+
+        public class MacAddress
+        {
+            public string Value { get; set; }
+        }
+
+        public class Manufacturer
+        {
+            public string Value { get; set; }
+        }
+
+        public class Model
+        {
+            public string Value { get; set; }
+        }
+
+        public class Pan
+        {
+            public string Value { get; set; }
+        }
+
+        public class Tilt
+        {
+            public string Value { get; set; }
+        }
+
+        public class Zoom
+        {
+            public string Value { get; set; }
+        }
+
+        public class Position
+        {
+            public Pan Pan { get; set; }
+            public Tilt Tilt { get; set; }
+            public Zoom Zoom { get; set; }
+        }
+
+        public class SerialNumber
+        {
+            public string Value { get; set; }
+        }
+
+        public class SoftwareID
+        {
+            public string Value { get; set; }
+        }
+
+        public class Camera
+        {
+            public string id { get; set; }
+            public Capabilities Capabilities { get; set; }
+            public Connected Connected { get; set; }
+            public Flip Flip { get; set; }
+            public HardwareID HardwareID { get; set; }
+            public MacAddress MacAddress { get; set; }
+            public Manufacturer Manufacturer { get; set; }
+            public Model Model { get; set; }
+            public Position Position { get; set; }
+            public SerialNumber SerialNumber { get; set; }
+            public SoftwareID SoftwareID { get; set; }
+        }
+
+        public class Availability
+        {
+            public string Value { get; set; }
+        }
+
+        public class Status2
+        {
+            public string Value { get; set; }
+        }
+
+        public class SpeakerTrack
+        {
+            public Availability Availability { get; set; }
+            public Status2 Status { get; set; }
+        }
+
+        public class Cameras
+        {
+            public List<Camera> Camera { get; set; }
+            public SpeakerTrack SpeakerTrack { get; set; }
+        }
+
+        public class MaxActiveCalls
+        {
+            public string Value { get; set; }
+        }
+
+        public class MaxAudioCalls
+        {
+            public string Value { get; set; }
+        }
+
+        public class MaxCalls
+        {
+            public string Value { get; set; }
+        }
+
+        public class MaxVideoCalls
+        {
+            public string Value { get; set; }
+        }
+
+        public class Conference
+        {
+            public MaxActiveCalls MaxActiveCalls { get; set; }
+            public MaxAudioCalls MaxAudioCalls { get; set; }
+            public MaxCalls MaxCalls { get; set; }
+            public MaxVideoCalls MaxVideoCalls { get; set; }
+        }
+
+        public class Capabilities2
+        {
+            public Conference Conference { get; set; }
+        }
+
+        public class CallId
+        {
+            public string Value { get; set; }
+        }
+
+        public class ActiveSpeaker
+        {
+            public CallId CallId { get; set; }
+        }
+
+        public class DoNotDisturb
+        {
+            public string Value { get; set; }
+        }
+
+        public class Mode
+        {
+            public string Value { get; set; }
+        }
+
+        public class Line2
+        {
+            public string id { get; set; }
+            public Mode Mode { get; set; }
+        }
+
+        public class Mode2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Multipoint
+        {
+            public Mode2 Mode { get; set; }
+        }
+
+        public class CallId2
+        {
+            public string Value { get; set; }
+        }
+
+        public class SendingMode
+        {
+            public string Value { get; set; }
+        }
+
+        public class Source
+        {
+            public string Value { get; set; }
+        }
+
+        public class LocalInstance
+        {
+            public string id { get; set; }
+            public SendingMode SendingMode { get; set; }
+            public Source Source { get; set; }
+        }
+
+        public class Mode3
+        {
+            public string Value { get; set; }
+        }
+
+        public class Mode4
+        {
+            public string Value { get; set; }
+        }
+
+        public class ReleaseFloorAvailability
+        {
+            public string Value { get; set; }
+        }
+
+        public class RequestFloorAvailability
+        {
+            public string Value { get; set; }
+        }
+
+        public class Whiteboard
+        {
+            public Mode4 Mode { get; set; }
+            public ReleaseFloorAvailability ReleaseFloorAvailability { get; set; }
+            public RequestFloorAvailability RequestFloorAvailability { get; set; }
+        }
+
+        public class Presentation
+        {
+            public CallId2 CallId { get; set; }
+            public List<LocalInstance> LocalInstance { get; set; }
+            public Mode3 Mode { get; set; }
+            public Whiteboard Whiteboard { get; set; }
+        }
+
+        public class CallId3
+        {
+            public string Value { get; set; }
+        }
+
+        public class Mode5
+        {
+            public string Value { get; set; }
+        }
+
+        public class SpeakerLock
+        {
+            public CallId3 CallId { get; set; }
+            public Mode5 Mode { get; set; }
+        }
+
+        public class Conference2
+        {
+            public ActiveSpeaker ActiveSpeaker { get; set; }
+            public DoNotDisturb DoNotDisturb { get; set; }
+            public List<Line2> Line { get; set; }
+            public Multipoint Multipoint { get; set; }
+            public Presentation Presentation { get; set; }
+            public SpeakerLock SpeakerLock { get; set; }
+        }
+
+        public class Conference3
+        {
+        }
+
+        public class Experimental
+        {
+            public Conference3 Conference { get; set; }
+        }
+
+        public class Address
+        {
+            public string Value { get; set; }
+        }
+
+        public class Port
+        {
+            public string Value { get; set; }
+        }
+
+        public class Reason
+        {
+            public string Value { get; set; }
+        }
+
+        public class Status3
+        {
+            public string Value { get; set; }
+        }
+
+        public class Gatekeeper
+        {
+            public Address Address { get; set; }
+            public Port Port { get; set; }
+            public Reason Reason { get; set; }
+            public Status3 Status { get; set; }
+        }
+
+        public class Reason2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Status4
+        {
+            public string Value { get; set; }
+        }
+
+        public class Mode6
+        {
+            public Reason2 Reason { get; set; }
+            public Status4 Status { get; set; }
+        }
+
+        public class H323
+        {
+            public Gatekeeper Gatekeeper { get; set; }
+            public Mode6 Mode { get; set; }
+        }
+
+        public class Expression
+        {
+            public string id { get; set; }
+            public string Value { get; set; }
+        }
+
+        public class Format
+        {
+            public string Value { get; set; }
+        }
+
+        public class URL
+        {
+            public string Value { get; set; }
+        }
+
+        public class HttpFeedback
+        {
+            public string id { get; set; }
+            public List<Expression> Expression { get; set; }
+            public Format Format { get; set; }
+            public URL URL { get; set; }
+        }
+
+        public class MediaChannels
+        {
+        }
+
+        public class Address2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Capabilities3
+        {
+            public string Value { get; set; }
+        }
+
+        public class DeviceId
+        {
+            public string Value { get; set; }
+        }
+
+        public class Duplex
+        {
+            public string Value { get; set; }
+        }
+
+        public class Platform
+        {
+            public string Value { get; set; }
+        }
+
+        public class PortID
+        {
+            public string Value { get; set; }
+        }
+
+        public class PrimaryMgmtAddress
+        {
+            public string Value { get; set; }
+        }
+
+        public class SysName
+        {
+            public string Value { get; set; }
+        }
+
+        public class SysObjectID
+        {
+            public string Value { get; set; }
+        }
+
+        public class VTPMgmtDomain
+        {
+            public string Value { get; set; }
+        }
+
+        public class Version
+        {
+            public string Value { get; set; }
+        }
+
+        public class VoIPApplianceVlanID
+        {
+            public string Value { get; set; }
+        }
+
+        public class CDP
+        {
+            public Address2 Address { get; set; }
+            public Capabilities3 Capabilities { get; set; }
+            public DeviceId DeviceId { get; set; }
+            public Duplex Duplex { get; set; }
+            public Platform Platform { get; set; }
+            public PortID PortID { get; set; }
+            public PrimaryMgmtAddress PrimaryMgmtAddress { get; set; }
+            public SysName SysName { get; set; }
+            public SysObjectID SysObjectID { get; set; }
+            public VTPMgmtDomain VTPMgmtDomain { get; set; }
+            public Version Version { get; set; }
+            public VoIPApplianceVlanID VoIPApplianceVlanID { get; set; }
+        }
+
+        public class Name
+        {
+            public string Value { get; set; }
+        }
+
+        public class Domain
+        {
+            public Name Name { get; set; }
+        }
+
+        public class Address3
+        {
+            public string Value { get; set; }
+        }
+
+        public class Server
+        {
+            public string id { get; set; }
+            public Address3 Address { get; set; }
+        }
+
+        public class DNS
+        {
+            public Domain Domain { get; set; }
+            public List<Server> Server { get; set; }
+        }
+
+        public class MacAddress2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Speed
+        {
+            public string Value { get; set; }
+        }
+
+        public class Ethernet
+        {
+            public MacAddress2 MacAddress { get; set; }
+            public Speed Speed { get; set; }
+        }
+
+        public class Address4
+        {
+            public string Value { get; set; }
+        }
+
+        public class Gateway
+        {
+            public string Value { get; set; }
+        }
+
+        public class SubnetMask
+        {
+            public string Value { get; set; }
+        }
+
+        public class IPv4
+        {
+            public Address4 Address { get; set; }
+            public Gateway Gateway { get; set; }
+            public SubnetMask SubnetMask { get; set; }
+        }
+
+        public class Address5
+        {
+            public string Value { get; set; }
+        }
+
+        public class Gateway2
+        {
+            public string Value { get; set; }
+        }
+
+        public class IPv6
+        {
+            public Address5 Address { get; set; }
+            public Gateway2 Gateway { get; set; }
+        }
+
+        public class VlanId
+        {
+            public string Value { get; set; }
+        }
+
+        public class Voice
+        {
+            public VlanId VlanId { get; set; }
+        }
+
+        public class VLAN
+        {
+            public Voice Voice { get; set; }
+        }
+
+        public class Network
+        {
+            public string id { get; set; }
+            public CDP CDP { get; set; }
+            public DNS DNS { get; set; }
+            public Ethernet Ethernet { get; set; }
+            public IPv4 IPv4 { get; set; }
+            public IPv6 IPv6 { get; set; }
+            public VLAN VLAN { get; set; }
+        }
+
+        public class CurrentAddress
+        {
+            public string Value { get; set; }
+        }
+
+        public class Address6
+        {
+            public string Value { get; set; }
+        }
+
+        public class Server2
+        {
+            public string id { get; set; }
+            public Address6 Address { get; set; }
+        }
+
+        public class Status5
+        {
+            public string Value { get; set; }
+        }
+
+        public class NTP
+        {
+            public CurrentAddress CurrentAddress { get; set; }
+            public List<Server2> Server { get; set; }
+            public Status5 Status { get; set; }
+        }
+
+        public class NetworkServices
+        {
+            public NTP NTP { get; set; }
+        }
+
+        public class HardwareInfo
+        {
+            public string Value { get; set; }
+        }
+
+        public class ID2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Name2
+        {
+            public string Value { get; set; }
+        }
+
+        public class SoftwareInfo
+        {
+            public string Value { get; set; }
+        }
+
+        public class Status6
+        {
+            public string Value { get; set; }
+        }
+
+        public class Type
+        {
+            public string Value { get; set; }
+        }
+
+        public class UpgradeStatus
+        {
+            public string Value { get; set; }
+        }
+
+        public class ConnectedDevice
+        {
+            public string id { get; set; }
+            public HardwareInfo HardwareInfo { get; set; }
+            public ID2 ID { get; set; }
+            public Name2 Name { get; set; }
+            public SoftwareInfo SoftwareInfo { get; set; }
+            public Status6 Status { get; set; }
+            public Type Type { get; set; }
+            public UpgradeStatus UpgradeStatus { get; set; }
+        }
+
+        public class Peripherals
+        {
+            public List<ConnectedDevice> ConnectedDevice { get; set; }
+        }
+
+        public class Enabled
+        {
+            public string Value { get; set; }
+        }
+
+        public class LastLoggedInUserId
+        {
+            public string Value { get; set; }
+        }
+
+        public class LoggedIn
+        {
+            public string Value { get; set; }
+        }
+
+        public class ExtensionMobility
+        {
+            public Enabled Enabled { get; set; }
+            public LastLoggedInUserId LastLoggedInUserId { get; set; }
+            public LoggedIn LoggedIn { get; set; }
+        }
+
+        public class CUCM
+        {
+            public ExtensionMobility ExtensionMobility { get; set; }
+        }
+
+        public class CompletedAt
+        {
+            public string Value { get; set; }
+        }
+
+        public class URL2
+        {
+            public string Value { get; set; }
+        }
+
+        public class VersionId
+        {
+            public string Value { get; set; }
+        }
+
+        public class Current2
+        {
+            public CompletedAt CompletedAt { get; set; }
+            public URL2 URL { get; set; }
+            public VersionId VersionId { get; set; }
+        }
+
+        public class LastChange
+        {
+            public string Value { get; set; }
+        }
+
+        public class Message
+        {
+            public string Value { get; set; }
+        }
+
+        public class Phase
+        {
+            public string Value { get; set; }
+        }
+
+        public class SessionId
+        {
+            public string Value { get; set; }
+        }
+
+        public class Status7
+        {
+            public string Value { get; set; }
+        }
+
+        public class URL3
+        {
+            public string Value { get; set; }
+        }
+
+        public class VersionId2
+        {
+            public string Value { get; set; }
+        }
+
+        public class UpgradeStatus2
+        {
+            public LastChange LastChange { get; set; }
+            public Message Message { get; set; }
+            public Phase Phase { get; set; }
+            public SessionId SessionId { get; set; }
+            public Status7 Status { get; set; }
+            public URL3 URL { get; set; }
+            public VersionId2 VersionId { get; set; }
+        }
+
+        public class Software
+        {
+            public Current2 Current { get; set; }
+            public UpgradeStatus2 UpgradeStatus { get; set; }
+        }
+
+        public class Status8
+        {
+            public string Value { get; set; }
+        }
+
+        public class Provisioning
+        {
+            public CUCM CUCM { get; set; }
+            public Software Software { get; set; }
+            public Status8 Status { get; set; }
+        }
+
+        public class Availability2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Services
+        {
+            public Availability2 Availability { get; set; }
+        }
+
+        public class Proximity
+        {
+            public Services Services { get; set; }
+        }
+
+        public class Current3
+        {
+            public string Value { get; set; }
+        }
+
+        public class PeopleCount
+        {
+            public Current3 Current { get; set; }
+        }
+
+        public class PeoplePresence
+        {
+            public string Value { get; set; }
+        }
+
+        public class RoomAnalytics
+        {
+            public PeopleCount PeopleCount { get; set; }
+            public PeoplePresence PeoplePresence { get; set; }
+        }
+
+        public class URI
+        {
+            public string Value { get; set; }
+        }
+
+        public class Primary
+        {
+            public URI URI { get; set; }
+        }
+
+        public class AlternateURI
+        {
+            public Primary Primary { get; set; }
+        }
+
+        public class Authentication
+        {
+            public string Value { get; set; }
+        }
+
+        public class DisplayName
+        {
+            public string Value { get; set; }
+        }
+
+        public class Mode7
+        {
+            public string Value { get; set; }
+        }
+
+        public class URI2
+        {
+            public string Value { get; set; }
+        }
+
+        public class CallForward
+        {
+            public DisplayName DisplayName { get; set; }
+            public Mode7 Mode { get; set; }
+            public URI2 URI { get; set; }
+        }
+
+        public class MessagesWaiting
+        {
+            public string Value { get; set; }
+        }
+
+        public class URI3
+        {
+            public string Value { get; set; }
+        }
+
+        public class Mailbox
+        {
+            public MessagesWaiting MessagesWaiting { get; set; }
+            public URI3 URI { get; set; }
+        }
+
+        public class Address7
+        {
+            public string Value { get; set; }
+        }
+
+        public class Status9
+        {
+            public string Value { get; set; }
+        }
+
+        public class Proxy
+        {
+            public string id { get; set; }
+            public Address7 Address { get; set; }
+            public Status9 Status { get; set; }
+        }
+
+        public class Reason3
+        {
+            public string Value { get; set; }
+        }
+
+        public class Status10
+        {
+            public string Value { get; set; }
+        }
+
+        public class URI4
+        {
+            public string Value { get; set; }
+        }
+
+        public class Registration
+        {
+            public string id { get; set; }
+            public Reason3 Reason { get; set; }
+            public Status10 Status { get; set; }
+            public URI4 URI { get; set; }
+        }
+
+        public class Secure
+        {
+            public string Value { get; set; }
+        }
+
+        public class Verified
+        {
+            public string Value { get; set; }
+        }
+
+        public class SIP
+        {
+            public AlternateURI AlternateURI { get; set; }
+            public Authentication Authentication { get; set; }
+            public CallForward CallForward { get; set; }
+            public Mailbox Mailbox { get; set; }
+            public List<Proxy> Proxy { get; set; }
+            public List<Registration> Registration { get; set; }
+            public Secure Secure { get; set; }
+            public Verified Verified { get; set; }
+        }
+
+        public class Mode8
+        {
+            public string Value { get; set; }
+        }
+
+        public class FIPS
+        {
+            public Mode8 Mode { get; set; }
+        }
+
+        public class CallHistory
+        {
+            public string Value { get; set; }
+        }
+
+        public class Configurations
+        {
+            public string Value { get; set; }
+        }
+
+        public class DHCP
+        {
+            public string Value { get; set; }
+        }
+
+        public class InternalLogging
+        {
+            public string Value { get; set; }
+        }
+
+        public class LocalPhonebook
+        {
+            public string Value { get; set; }
+        }
+
+        public class Persistency
+        {
+            public CallHistory CallHistory { get; set; }
+            public Configurations Configurations { get; set; }
+            public DHCP DHCP { get; set; }
+            public InternalLogging InternalLogging { get; set; }
+            public LocalPhonebook LocalPhonebook { get; set; }
+        }
+
+        public class Security
+        {
+            public FIPS FIPS { get; set; }
+            public Persistency Persistency { get; set; }
+        }
+
+        public class State
+        {
+            public string Value { get; set; }
+        }
+
+        public class Standby
+        {
+            public State State { get; set; }
+        }
+
+        public class CompatibilityLevel
+        {
+            public string Value { get; set; }
+        }
+
+        public class SerialNumber2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Module
+        {
+            public CompatibilityLevel CompatibilityLevel { get; set; }
+            public SerialNumber2 SerialNumber { get; set; }
+        }
+
+        public class Hardware
+        {
+            public Module Module { get; set; }
+        }
+
+        public class ProductId
+        {
+            public string Value { get; set; }
+        }
+
+        public class ProductPlatform
+        {
+            public string Value { get; set; }
+        }
+
+        public class ProductType
+        {
+            public string Value { get; set; }
+        }
+
+        public class DisplayName2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Name3
+        {
+            public string Value { get; set; }
+        }
+
+        public class Encryption
+        {
+            public string Value { get; set; }
+        }
+
+        public class MultiSite
+        {
+            public string Value { get; set; }
+        }
+
+        public class RemoteMonitoring
+        {
+            public string Value { get; set; }
+        }
+
+        public class OptionKeys
+        {
+            public Encryption Encryption { get; set; }
+            public MultiSite MultiSite { get; set; }
+            public RemoteMonitoring RemoteMonitoring { get; set; }
+        }
+
+        public class ReleaseDate
+        {
+            public string Value { get; set; }
+        }
+
+        public class Version2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Software2
+        {
+            public DisplayName2 DisplayName { get; set; }
+            public Name3 Name { get; set; }
+            public OptionKeys OptionKeys { get; set; }
+            public ReleaseDate ReleaseDate { get; set; }
+            public Version2 Version { get; set; }
+        }
+
+        public class NumberOfActiveCalls
+        {
+            public string Value { get; set; }
+        }
+
+        public class NumberOfInProgressCalls
+        {
+            public string Value { get; set; }
+        }
+
+        public class NumberOfSuspendedCalls
+        {
+            public string Value { get; set; }
+        }
+
+        public class State2
+        {
+            public NumberOfActiveCalls NumberOfActiveCalls { get; set; }
+            public NumberOfInProgressCalls NumberOfInProgressCalls { get; set; }
+            public NumberOfSuspendedCalls NumberOfSuspendedCalls { get; set; }
+        }
+
+        public class Uptime
+        {
+            public string Value { get; set; }
+        }
+
+        public class SystemUnit
+        {
+            public Hardware Hardware { get; set; }
+            public ProductId ProductId { get; set; }
+            public ProductPlatform ProductPlatform { get; set; }
+            public ProductType ProductType { get; set; }
+            public Software2 Software { get; set; }
+            public State2 State { get; set; }
+            public Uptime Uptime { get; set; }
+        }
+
+        public class SystemTime
+        {
+            public DateTime Value { get; set; }
+        }
+
+        public class Time
+        {
+            public SystemTime SystemTime { get; set; }
+        }
+
+        public class Number
+        {
+            public string Value { get; set; }
+        }
+
+        public class ContactMethod
+        {
+            public string id { get; set; }
+            public Number Number { get; set; }
+        }
+
+        public class Name4
+        {
+            public string Value { get; set; }
+        }
+
+        public class ContactInfo
+        {
+            public List<ContactMethod> ContactMethod { get; set; }
+            public Name4 Name { get; set; }
+        }
+
+        public class UserInterface
+        {
+            public ContactInfo ContactInfo { get; set; }
+        }
+
+        public class PIPPosition
+        {
+            public string Value { get; set; }
+        }
+
+        public class ActiveSpeaker2
+        {
+            public PIPPosition PIPPosition { get; set; }
+        }
+
+        public class Connected2
+        {
+            public string Value { get; set; }
+        }
+
+        public class DeviceType
+        {
+            public string Value { get; set; }
+        }
+
+        public class Name5
+        {
+            public string Value { get; set; }
+        }
+
+        public class PowerStatus
+        {
+            public string Value { get; set; }
+        }
+
+        public class VendorId
+        {
+            public string Value { get; set; }
+        }
+
+        public class CEC
+        {
+            public string id { get; set; }
+            public DeviceType DeviceType { get; set; }
+            public Name5 Name { get; set; }
+            public PowerStatus PowerStatus { get; set; }
+            public VendorId VendorId { get; set; }
+        }
+
+        public class ConnectedDevice2
+        {
+            public List<CEC> CEC { get; set; }
+        }
+
+        public class SignalState
+        {
+            public string Value { get; set; }
+        }
+
+        public class SourceId
+        {
+            public string Value { get; set; }
+        }
+
+        public class Type2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Connector
+        {
+            public string id { get; set; }
+            public Connected2 Connected { get; set; }
+            public ConnectedDevice2 ConnectedDevice { get; set; }
+            public SignalState SignalState { get; set; }
+            public SourceId SourceId { get; set; }
+            public Type2 Type { get; set; }
+        }
+
+        public class MainVideoSource
+        {
+            public string Value { get; set; }
+        }
+
+        public class ConnectorId
+        {
+            public string Value { get; set; }
+        }
+
+        public class FormatStatus
+        {
+            public string Value { get; set; }
+        }
+
+        public class FormatType
+        {
+            public string Value { get; set; }
+        }
+
+        public class MediaChannelId
+        {
+            public string Value { get; set; }
+        }
+
+        public class Height
+        {
+            public string Value { get; set; }
+        }
+
+        public class RefreshRate
+        {
+            public string Value { get; set; }
+        }
+
+        public class Width
+        {
+            public string Value { get; set; }
+        }
+
+        public class Resolution
+        {
+            public Height Height { get; set; }
+            public RefreshRate RefreshRate { get; set; }
+            public Width Width { get; set; }
+        }
+
+        public class Source2
+        {
+            public string id { get; set; }
+            public ConnectorId ConnectorId { get; set; }
+            public FormatStatus FormatStatus { get; set; }
+            public FormatType FormatType { get; set; }
+            public MediaChannelId MediaChannelId { get; set; }
+            public Resolution Resolution { get; set; }
+        }
+
+        public class Input2
+        {
+            public List<Connector> Connector { get; set; }
+            public MainVideoSource MainVideoSource { get; set; }
+            public List<Source2> Source { get; set; }
+        }
+
+        public class Local
+        {
+            public string Value { get; set; }
+        }
+
+        public class LayoutFamily
+        {
+            public Local Local { get; set; }
+        }
+
+        public class Layout
+        {
+            public LayoutFamily LayoutFamily { get; set; }
+        }
+
+        public class Monitors
+        {
+            public string Value { get; set; }
+        }
+
+        public class Connected3
+        {
+            public string Value { get; set; }
+        }
+
+        public class DeviceType2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Name6
+        {
+            public string Value { get; set; }
+        }
+
+        public class PowerStatus2
+        {
+            public string Value { get; set; }
+        }
+
+        public class VendorId2
+        {
+            public string Value { get; set; }
+        }
+
+        public class CEC2
+        {
+            public string id { get; set; }
+            public DeviceType2 DeviceType { get; set; }
+            public Name6 Name { get; set; }
+            public PowerStatus2 PowerStatus { get; set; }
+            public VendorId2 VendorId { get; set; }
+        }
+
+        public class Name7
+        {
+            public string Value { get; set; }
+        }
+
+        public class PreferredFormat
+        {
+            public string Value { get; set; }
+        }
+
+        public class ConnectedDevice3
+        {
+            public List<CEC2> CEC { get; set; }
+            public Name7 Name { get; set; }
+            public PreferredFormat PreferredFormat { get; set; }
+        }
+
+        public class MonitorRole
+        {
+            public string Value { get; set; }
+        }
+
+        public class Height2
+        {
+            public string Value { get; set; }
+        }
+
+        public class RefreshRate2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Width2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Resolution2
+        {
+            public Height2 Height { get; set; }
+            public RefreshRate2 RefreshRate { get; set; }
+            public Width2 Width { get; set; }
+        }
+
+        public class Type3
+        {
+            public string Value { get; set; }
+        }
+
+        public class Connector2
+        {
+            public string id { get; set; }
+            public Connected3 Connected { get; set; }
+            public ConnectedDevice3 ConnectedDevice { get; set; }
+            public MonitorRole MonitorRole { get; set; }
+            public Resolution2 Resolution { get; set; }
+            public Type3 Type { get; set; }
+        }
+
+        public class Output2
+        {
+            public List<Connector2> Connector { get; set; }
+        }
+
+        public class PIPPosition2
+        {
+            public string Value { get; set; }
+        }
+
+        public class Presentation2
+        {
+            public PIPPosition2 PIPPosition { get; set; }
+        }
+
+        public class FullscreenMode
+        {
+            public string Value { get; set; }
+        }
+
+        public class Mode9
+        {
+            public string Value { get; set; }
+        }
+
+        public class OnMonitorRole
+        {
+            public string Value { get; set; }
+        }
+
+        public class PIPPosition3
+        {
+            public string Value { get; set; }
+        }
+
+        public class Selfview
+        {
+            public FullscreenMode FullscreenMode { get; set; }
+            public Mode9 Mode { get; set; }
+            public OnMonitorRole OnMonitorRole { get; set; }
+            public PIPPosition3 PIPPosition { get; set; }
+        }
+
+        public class Video
+        {
+            public ActiveSpeaker2 ActiveSpeaker { get; set; }
+            public Input2 Input { get; set; }
+            public Layout Layout { get; set; }
+            public Monitors Monitors { get; set; }
+            public Output2 Output { get; set; }
+            public Presentation2 Presentation { get; set; }
+            public Selfview Selfview { get; set; }
+        }
+
+        public class Status
+        {
+            public Audio Audio { get; set; }
+            public Bookings Bookings { get; set; }
+            public Cameras Cameras { get; set; }
+            public Capabilities2 Capabilities { get; set; }
+            public Conference2 Conference { get; set; }
+            public Experimental Experimental { get; set; }
+            public H323 H323 { get; set; }
+            public List<HttpFeedback> HttpFeedback { get; set; }
+            public MediaChannels MediaChannels { get; set; }
+            public List<Network> Network { get; set; }
+            public NetworkServices NetworkServices { get; set; }
+            public Peripherals Peripherals { get; set; }
+            public Provisioning Provisioning { get; set; }
+            public Proximity Proximity { get; set; }
+            public RoomAnalytics RoomAnalytics { get; set; }
+            public SIP SIP { get; set; }
+            public Security Security { get; set; }
+            public Standby Standby { get; set; }
+            public SystemUnit SystemUnit { get; set; }
+            public Time Time { get; set; }
+            public UserInterface UserInterface { get; set; }
+            public Video Video { get; set; }
+        }
+
+        public class RootObject
+        {
+            public Status Status { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 9b97cb81..33eec760 100644
--- a/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -6,6 +6,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common;
 using PepperDash.Essentials.Devices.Common.Codec;
 
@@ -33,6 +34,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         #endregion
 
+        /// <summary>
+        /// An internal pseudo-source that is routable and connected to the osd input
+        /// </summary>
+        public DummyRoutingInputsDevice OsdSource { get; protected set; }
+
         public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
 
         public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
diff --git a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
index 586f2efb..6fe825d4 100644
--- a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
+++ b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
@@ -944,6 +944,8 @@ namespace PepperDash.Essentials
                 if (_CurrentRoom != null)
                     _CurrentRoom.CurrentSingleSourceChange += new SourceInfoChangeHandler(CurrentRoom_CurrentSingleSourceChange);
 
+                TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd"));
+
 				SetupHeaderButtons();
             }
             else
diff --git a/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
index 919911d5..d9be6ec8 100644
--- a/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
+++ b/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
@@ -179,7 +179,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 triList.SetSigHeldAction(UIBoolJoin.VCDirectoryBackspacePress, 500,
                     StartSearchBackspaceRepeat, StopSearchBackspaceRepeat, SearchKeypadBackspacePress);
 
-                triList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, Codec.StopSharing);
             }
             catch (Exception e)
             {