1 files changed, 20 insertions, 5 deletions
diff --git a/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObject.cs b/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObject.cs
index 322f43a4c..9e9c8094a 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObject.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Components/SelectedObject.cs
@@ -25,20 +25,35 @@ namespace Tango.SharedUI.Components
             set { _isEnabled = value; RaisePropertyChangedAuto(); }
         }
 
+        private Object _data;
+        public Object Data
+        {
+            get { return _data; }
+            set { _data = value; RaisePropertyChangedAuto(); }
+        }
+
         public SelectedObject()
         {
             IsEnabled = true;
         }
+
+        public SelectedObject(Object data) : this()
+        {
+            Data = data;
+        }
+
+        public SelectedObject(Object data, bool selected) : this(data)
+        {
+            IsSelected = selected;
+        }
     }
 
     public class SelectedObject<T> : SelectedObject
     {
-        private T _data;
-
-        public T Data
+        new public T Data
         {
-            get { return _data; }
-            set { _data = value; RaisePropertyChangedAuto(); }
+            get { return (T)base.Data; }
+            set { base.Data = (T)value; RaisePropertyChangedAuto(); }
         }
 
         public SelectedObject() : base()