diff --git a/Pepperdash Core/Pepperdash Core/Feedbacks HAS SSP LINKS.cs b/Pepperdash Core/Pepperdash Core/Feedbacks HAS SSP LINKS.cs
deleted file mode 100644
index 4d1d514..0000000
--- a/Pepperdash Core/Pepperdash Core/Feedbacks HAS SSP LINKS.cs	
+++ /dev/null
@@ -1,209 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Linq;
-//using System.Text;
-//using Crestron.SimplSharp;
-
-//namespace PepperDash.Core
-//{
-//    public abstract class Feedback
-//    {
-//        public event EventHandler<EventArgs> OutputChange;
-
-//        public virtual bool BoolValue { get { return false; } }
-//        public virtual int IntValue { get { return 0; } }
-//        public virtual string StringValue { get { return ""; } }
-
-//        public Cue Cue { get; private set; }
-
-//        public abstract eCueType Type { get; }
-
-//        protected Feedback()
-//        {
-//        }
-
-//        protected Feedback(Cue cue)
-//        {
-//            Cue = cue;
-//        }
-
-//        public abstract void FireUpdate();
-
-//        protected void OnOutputChange()
-//        {
-//            if (OutputChange != null) OutputChange(this, EventArgs.Empty);
-//        }
-//    }
-
-//    public class BoolFeedbackLocalStorage
-//    {
-//        public bool BoolValue
-//        {
-//            get { return Output.BoolValue; }
-//            set
-//            {
-
-//            }
-//        }
-//        public BoolFeedback Output { get; private set; }
-
-//        public BoolFeedbackLocalStorage(BoolFeedback bo)
-//        {
-//            Output = bo;
-//        }
-//    }
-
-
-//    public class BoolFeedback : Feedback
-//    {
-//        public override bool BoolValue { get { return ValueFunc.Invoke(); } }
-
-//        public override eCueType Type { get { return eCueType.Bool; } }
-
-//        public Func<bool> ValueFunc { get; private set; }
-//        List<BoolInputSig> LinkedInputSigs = new List<BoolInputSig>();
-//        List<BoolInputSig> LinkedComplementInputSigs = new List<BoolInputSig>();
-
-//        public BoolFeedback(Func<bool> valueFunc)
-//            : this(Cue.DefaultBoolCue, valueFunc)
-//        {
-//        }
-
-//        public BoolFeedback(Cue cue, Func<bool> valueFunc)
-//            : base(cue)
-//        {
-//            if (cue == null) throw new ArgumentNullException("cue");
-//            ValueFunc = valueFunc;
-//        }
-
-//        public override void FireUpdate()
-//        {
-//            LinkedInputSigs.ForEach(s => UpdateSig(s));
-//            LinkedComplementInputSigs.ForEach(s => UpdateComplementSig(s));
-//            OnOutputChange();
-//        }
-
-//        public void LinkInputSig(BoolInputSig sig)
-//        {
-//            LinkedInputSigs.Add(sig);
-//            UpdateSig(sig);
-//        }
-
-//        public void UnlinkInputSig(BoolInputSig sig)
-//        {
-//            LinkedInputSigs.Remove(sig);
-//        }
-
-//        public void LinkComplementInputSig(BoolInputSig sig)
-//        {
-//            LinkedComplementInputSigs.Add(sig);
-//            UpdateComplementSig(sig);
-//        }
-
-//        public void UnlinkComplementInputSig(BoolInputSig sig)
-//        {
-//            LinkedComplementInputSigs.Remove(sig);
-//        }
-
-//        void UpdateSig(BoolInputSig sig)
-//        {
-//            sig.BoolValue = ValueFunc.Invoke();
-//        }
-
-//        void UpdateComplementSig(BoolInputSig sig)
-//        {
-//            sig.BoolValue = !ValueFunc.Invoke();
-//        }
-//    }
-
-//    //******************************************************************************
-//    public class IntFeedback : Feedback
-//    {
-//        public override int IntValue { get { return ValueFunc.Invoke(); } }
-//        public ushort UShortValue { get { return (ushort)ValueFunc.Invoke(); } }
-//        public override eCueType Type { get { return eCueType.Int; } }
-
-//        Func<int> ValueFunc;
-//        List<UShortInputSig> LinkedInputSigs = new List<UShortInputSig>();
-
-//        public IntFeedback(Func<int> valueFunc)
-//            : this(Cue.DefaultIntCue, valueFunc)
-//        {
-//        }
-
-//        public IntFeedback(Cue cue, Func<int> valueFunc)
-//            : base(cue)
-//        {
-//            if (cue == null) throw new ArgumentNullException("cue");
-//            ValueFunc = valueFunc;
-//        }
-
-//        public override void FireUpdate()
-//        {
-//            LinkedInputSigs.ForEach(s => UpdateSig(s));
-//            OnOutputChange();
-//        }
-
-//        public void LinkInputSig(UShortInputSig sig)
-//        {
-//            LinkedInputSigs.Add(sig);
-//            UpdateSig(sig);
-//        }
-
-//        public void UnlinkInputSig(UShortInputSig sig)
-//        {
-//            LinkedInputSigs.Remove(sig);
-//        }
-
-//        void UpdateSig(UShortInputSig sig)
-//        {
-//            sig.UShortValue = this.UShortValue;
-//        }
-//    }
-
-
-//    //******************************************************************************
-//    public class StringFeedback : Feedback
-//    {
-//        public override string StringValue { get { return ValueFunc.Invoke(); } }
-//        public override eCueType Type { get { return eCueType.String; } }
-
-//        public Func<string> ValueFunc { get; private set; }
-//        List<StringInputSig> LinkedInputSigs = new List<StringInputSig>();
-
-//        public StringFeedback(Func<string> valueFunc)
-//            : this(Cue.DefaultStringCue, valueFunc)
-//        {
-//        }
-
-//        public StringFeedback(Cue cue, Func<string> valueFunc)
-//            : base(cue)
-//        {
-//            if (cue == null) throw new ArgumentNullException("cue");
-//            ValueFunc = valueFunc;
-
-//        }
-
-//        public override void FireUpdate()
-//        {
-//            LinkedInputSigs.ForEach(s => UpdateSig(s));
-//            OnOutputChange();
-//        }
-
-//        public void LinkInputSig(StringInputSig sig)
-//        {
-//            LinkedInputSigs.Add(sig);
-//            UpdateSig(sig);
-//        }
-
-//        public void UnlinkInputSig(StringInputSig sig)
-//        {
-//            LinkedInputSigs.Remove(sig);
-//        }
-
-//        void UpdateSig(StringInputSig sig)
-//        {
-//            sig.StringValue = ValueFunc.Invoke();
-//        }
-//    }
-//}
\ No newline at end of file
diff --git a/Pepperdash Core/Pepperdash Core/IHasFeedbacks.cs b/Pepperdash Core/Pepperdash Core/IHasFeedbacks.cs
deleted file mode 100644
index 13b9d56..0000000
--- a/Pepperdash Core/Pepperdash Core/IHasFeedbacks.cs	
+++ /dev/null
@@ -1,53 +0,0 @@
-//using System.Collections.Generic;
-//using System.Linq;
-
-//namespace PepperDash.Core
-//{
-//    public interface IHasFeedback : IKeyed
-//    {
-//        /// <summary>
-//        /// This method shall return a list of all Output objects on a device,
-//        /// including all "aggregate" devices.
-//        /// </summary>
-//        List<Feedback> Feedbacks { get; }
-
-//    }
-
-
-//    public static class IHasFeedbackExtensions
-//    {
-//        public static void DumpFeedbacksToConsole(this IHasFeedback source, bool getCurrentStates)
-//        {
-//            var outputs = source.Feedbacks.OrderBy(x => x.Type);
-//            if (outputs != null)
-//            {
-//                Debug.Console(0, source, "\n\nAvailable outputs:");
-//                foreach (var o in outputs)
-//                {
-//                    string val = "";
-//                    if (getCurrentStates)
-//                    {
-//                        switch (o.Type)
-//                        {
-//                            case eCueType.Bool:
-//                                val = " = " + o.BoolValue;
-//                                break;
-//                            case eCueType.Int:
-//                                val = " = " + o.IntValue;
-//                                break;
-//                            case eCueType.String:
-//                                val = " = " + o.StringValue;
-//                                break;
-//                            //case eOutputType.Other:
-//                            //    break;
-//                        }
-//                    }
-//                    Debug.Console(0, "{0,-8} {1,5} {2}{3}", o.Type, o.Cue.Number,
-//                        (string.IsNullOrEmpty(o.Cue.Name) ? "-none-" : o.Cue.Name), val);
-//                }
-//            }
-//            else
-//                Debug.Console(0, source, "No available outputs:");
-//        }
-//    }
-//}
\ No newline at end of file
diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj
index 087fac6..74c8f3f 100644
--- a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj	
+++ b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj	
@@ -67,9 +67,7 @@
     <Compile Include="Debug.cs" />
     <Compile Include="Device.cs" />
     <Compile Include="EthernetHelper.cs" />
-    <Compile Include="Feedbacks HAS SSP LINKS.cs" />
     <Compile Include="GenericTcpIpClient.cs" />
-    <Compile Include="IHasFeedbacks.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="Properties\ControlSystem.cfg" />
   </ItemGroup>
@@ -80,9 +78,9 @@
         <ProgramIdTag>PepperDash_Core</ProgramIdTag>
         <SystemName>PepperDash_Core</SystemName>
         <Programmer />
-        <ArchiveFilename>C:\Users\hvolm\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\Pepperdash_Core.clz</ArchiveFilename>
+        <ArchiveFilename>C:\Users\hvolm\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.clz</ArchiveFilename>
         <MinFirmwareVersion>1.007.0017</MinFirmwareVersion>
-        <CompiledOn>6/15/2016 10:01:37 AM</CompiledOn>
+        <CompiledOn>6/15/2016 10:08:40 AM</CompiledOn>
         <AdditionalInfo />
         <EmbedSourceArchive>False</EmbedSourceArchive>
         <CopyTo />
diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz
index 83f808f..5a9ea40 100644
Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz differ
diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config
index 2b2dce7..e54e9d2 100644
--- a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config	
+++ b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config	
@@ -10,7 +10,7 @@
     <ArchiveName />
   </RequiredInfo>
   <OptionalInfo>
-    <CompiledOn>6/15/2016 10:01:37 AM</CompiledOn>
-    <CompilerRev>1.0.0.16248</CompilerRev>
+    <CompiledOn>6/15/2016 10:08:40 AM</CompiledOn>
+    <CompilerRev>1.0.0.16459</CompilerRev>
   </OptionalInfo>
 </ProgramInfo>
\ No newline at end of file
diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.info b/Pepperdash Core/Pepperdash Core/bin/manifest.info
index a0ef742..47d8788 100644
--- a/Pepperdash Core/Pepperdash Core/bin/manifest.info	
+++ b/Pepperdash Core/Pepperdash Core/bin/manifest.info	
@@ -1,4 +1,4 @@
-MainAssembly=PepperDash_Core.dll:92b05d53de3375de2f6efeacaf9dd897
+MainAssembly=PepperDash_Core.dll:341f86210304dc5ce6dfd04e0305d074
 MainAssemblyMinFirmwareVersion=1.007.0017
 ü
 DependencySource=Newtonsoft.Json.Compact.dll:ea996aa2ec65aa1878e7c9d09e37a896
diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.ser b/Pepperdash Core/Pepperdash Core/bin/manifest.ser
index ba16104..6ed54b5 100644
Binary files a/Pepperdash Core/Pepperdash Core/bin/manifest.ser and b/Pepperdash Core/Pepperdash Core/bin/manifest.ser differ