Improved Tango Build Engine VS Extension.

Added HardwareSpeedSensor to DB Entities & PMR.
Added progress to proto folder compiler.

56 files changed, 1149 insertions, 98 deletions

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index f97f35cf1..59c1e915e 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index a7cfb3779..739b54a72 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/PMR/Messages/Hardware/HardwareSpeedSensor.proto b/Software/PMR/Messages/Hardware/HardwareSpeedSensor.proto
new file mode 100644
index 000000000..ed43e07ec
--- /dev/null
+++ b/Software/PMR/Messages/Hardware/HardwareSpeedSensor.proto
@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango PMR Generator
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+syntax = "proto3";
+
+import "HardwareSpeedSensorType.proto";
+
+package Tango.PMR.Hardware;
+option java_package = "com.twine.tango.pmr.hardware";
+
+message HardwareSpeedSensor
+{
+
+    HardwareSpeedSensorType HardwareSpeedSensorType = 1;
+
+    int32 ResolutionBits = 2;
+
+    double Perimeter = 3;
+
+}
diff --git a/Software/PMR/Messages/Hardware/HardwareSpeedSensorType.proto b/Software/PMR/Messages/Hardware/HardwareSpeedSensorType.proto
new file mode 100644
index 000000000..061b17ca1
--- /dev/null
+++ b/Software/PMR/Messages/Hardware/HardwareSpeedSensorType.proto
@@ -0,0 +1,22 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango PMR Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+syntax = "proto3";
+
+package Tango.PMR.Hardware;
+option java_package = "com.twine.tango.pmr.hardware";
+
+enum HardwareSpeedSensorType
+{
+
+    //Default Speed Sensor
+    DefaultSpeedSensor = 0;
+
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs
new file mode 100644
index 000000000..07776df85
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensor.cs
@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.BL.Entities
+{
+    [Table("HARDWARE_SPEED_SENSORS")]
+    public partial class HardwareSpeedSensor : ObservableEntity<HardwareSpeedSensor>
+    {
+
+        protected String _hardwarespeedsensortypeguid;
+        /// <summary>
+        /// Gets or sets the hardwarespeedsensor hardware speed sensor type guid.
+        /// </summary>
+        [Column("HARDWARE_SPEED_SENSOR_TYPE_GUID")]
+        [ForeignKey("HardwareSpeedSensorType")]
+
+        public  String HardwareSpeedSensorTypeGuid
+        {
+            get 
+            {
+                return _hardwarespeedsensortypeguid; 
+            }
+
+            set 
+            {
+                _hardwarespeedsensortypeguid = value; RaisePropertyChanged(nameof(HardwareSpeedSensorTypeGuid)); 
+            }
+
+        }
+
+        protected String _hardwareversionguid;
+        /// <summary>
+        /// Gets or sets the hardwarespeedsensor hardware version guid.
+        /// </summary>
+        [Column("HARDWARE_VERSION_GUID")]
+        [ForeignKey("HardwareVersion")]
+
+        public  String HardwareVersionGuid
+        {
+            get 
+            {
+                return _hardwareversionguid; 
+            }
+
+            set 
+            {
+                _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); 
+            }
+
+        }
+
+        protected Int32 _resolutionbits;
+        /// <summary>
+        /// Gets or sets the hardwarespeedsensor resolution bits.
+        /// </summary>
+        [Column("RESOLUTION_BITS")]
+
+        public  Int32 ResolutionBits
+        {
+            get 
+            {
+                return _resolutionbits; 
+            }
+
+            set 
+            {
+                _resolutionbits = value; RaisePropertyChanged(nameof(ResolutionBits)); 
+            }
+
+        }
+
+        protected Double _perimeter;
+        /// <summary>
+        /// Gets or sets the hardwarespeedsensor perimeter.
+        /// </summary>
+        [Column("PERIMETER")]
+
+        public  Double Perimeter
+        {
+            get 
+            {
+                return _perimeter; 
+            }
+
+            set 
+            {
+                _perimeter = value; RaisePropertyChanged(nameof(Perimeter)); 
+            }
+
+        }
+
+        protected HardwareSpeedSensorType _hardwarespeedsensortype;
+        /// <summary>
+        /// Gets or sets the hardwarespeedsensor hardware speed sensor types.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual HardwareSpeedSensorType HardwareSpeedSensorType
+        {
+            get 
+            {
+                return _hardwarespeedsensortype; 
+            }
+
+            set 
+            {
+                _hardwarespeedsensortype = value; RaisePropertyChanged(nameof(HardwareSpeedSensorType)); 
+            }
+
+        }
+
+        protected HardwareVersion _hardwareversion;
+        /// <summary>
+        /// Gets or sets the hardwarespeedsensor hardware versions.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual HardwareVersion HardwareVersion
+        {
+            get 
+            {
+                return _hardwareversion; 
+            }
+
+            set 
+            {
+                _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HardwareSpeedSensor" /> class.
+        /// </summary>
+        public HardwareSpeedSensor() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs
new file mode 100644
index 000000000..950509b53
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorType.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.BL.Entities
+{
+    [Table("HARDWARE_SPEED_SENSOR_TYPES")]
+    public partial class HardwareSpeedSensorType : ObservableEntity<HardwareSpeedSensorType>
+    {
+
+        protected Int32 _code;
+        /// <summary>
+        /// Gets or sets the hardwarespeedsensortype code.
+        /// </summary>
+        [Column("CODE")]
+
+        public  Int32 Code
+        {
+            get 
+            {
+                return _code; 
+            }
+
+            set 
+            {
+                _code = value; RaisePropertyChanged(nameof(Code)); 
+            }
+
+        }
+
+        protected String _name;
+        /// <summary>
+        /// Gets or sets the hardwarespeedsensortype name.
+        /// </summary>
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        protected String _description;
+        /// <summary>
+        /// Gets or sets the hardwarespeedsensortype description.
+        /// </summary>
+        [Column("DESCRIPTION")]
+
+        public  String Description
+        {
+            get 
+            {
+                return _description; 
+            }
+
+            set 
+            {
+                _description = value; RaisePropertyChanged(nameof(Description)); 
+            }
+
+        }
+
+        protected ObservableCollection<HardwareSpeedSensor> _hardwarespeedsensors;
+        /// <summary>
+        /// Gets or sets the hardwarespeedsensortype hardware speed sensors.
+        /// </summary>
+
+        public virtual ObservableCollection<HardwareSpeedSensor> HardwareSpeedSensors
+        {
+            get 
+            {
+                return _hardwarespeedsensors; 
+            }
+
+            set 
+            {
+                _hardwarespeedsensors = value; RaisePropertyChanged(nameof(HardwareSpeedSensors)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HardwareSpeedSensorType" /> class.
+        /// </summary>
+        public HardwareSpeedSensorType() : base()
+        {
+
+            HardwareSpeedSensors = new ObservableCollection<HardwareSpeedSensor>();
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs
index 2b42b68c3..c3d728559 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs
@@ -130,6 +130,25 @@ namespace Tango.BL.Entities
 
         }
 
+        protected ObservableCollection<HardwareSpeedSensor> _hardwarespeedsensors;
+        /// <summary>
+        /// Gets or sets the hardwareversion hardware speed sensors.
+        /// </summary>
+
+        public virtual ObservableCollection<HardwareSpeedSensor> HardwareSpeedSensors
+        {
+            get 
+            {
+                return _hardwarespeedsensors; 
+            }
+
+            set 
+            {
+                _hardwarespeedsensors = value; RaisePropertyChanged(nameof(HardwareSpeedSensors)); 
+            }
+
+        }
+
         protected ObservableCollection<HardwareWinder> _hardwarewinders;
         /// <summary>
         /// Gets or sets the hardwareversion hardware winders.
@@ -163,6 +182,8 @@ namespace Tango.BL.Entities
 
             HardwarePidControls = new ObservableCollection<HardwarePidControl>();
 
+            HardwareSpeedSensors = new ObservableCollection<HardwareSpeedSensor>();
+
             HardwareWinders = new ObservableCollection<HardwareWinder>();
 
         }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareSpeedSensorTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareSpeedSensorTypes.cs
new file mode 100644
index 000000000..5f4df1b9a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareSpeedSensorTypes.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.ComponentModel;
+
+namespace Tango.BL.Enumerations
+{
+    public enum HardwareSpeedSensorTypes
+    {
+
+        /// <summary>
+        /// (Default Speed Sensor)
+        /// </summary>
+        [Description("Default Speed Sensor")]
+        DefaultSpeedSensor = 0,
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
index bad489e0b..fcdfd9f50 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
@@ -245,6 +245,22 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the HardwareSpeedSensorTypes.
+        /// </summary>
+        public DbSet<HardwareSpeedSensorType> HardwareSpeedSensorTypes 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the HardwareSpeedSensors.
+        /// </summary>
+        public DbSet<HardwareSpeedSensor> HardwareSpeedSensors 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// Gets or sets the HardwareVersions.
         /// </summary>
         public DbSet<HardwareVersion> HardwareVersions 
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
index 1687a273e..e4ba90e72 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
@@ -1051,6 +1051,78 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<HardwareSpeedSensorType> _hardwarespeedsensortypes;
+        /// <summary>
+        /// Gets or sets the HardwareSpeedSensorTypes.
+        /// </summary>
+        public ObservableCollection<HardwareSpeedSensorType> HardwareSpeedSensorTypes
+        {
+            get 
+            {
+                return _hardwarespeedsensortypes; 
+            }
+
+            set 
+            {
+                _hardwarespeedsensortypes = value; RaisePropertyChanged(nameof(HardwareSpeedSensorTypes)); 
+            }
+
+        }
+
+        private ICollectionView _hardwarespeedsensortypesViewSource;
+        /// <summary>
+        /// Gets or sets the HardwareSpeedSensorTypes View Source.
+        ///</summary>
+        public ICollectionView HardwareSpeedSensorTypesViewSource
+        {
+            get 
+            {
+                return _hardwarespeedsensortypesViewSource; 
+            }
+
+            set 
+            {
+                _hardwarespeedsensortypesViewSource = value; RaisePropertyChanged(nameof(HardwareSpeedSensorTypesViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<HardwareSpeedSensor> _hardwarespeedsensors;
+        /// <summary>
+        /// Gets or sets the HardwareSpeedSensors.
+        /// </summary>
+        public ObservableCollection<HardwareSpeedSensor> HardwareSpeedSensors
+        {
+            get 
+            {
+                return _hardwarespeedsensors; 
+            }
+
+            set 
+            {
+                _hardwarespeedsensors = value; RaisePropertyChanged(nameof(HardwareSpeedSensors)); 
+            }
+
+        }
+
+        private ICollectionView _hardwarespeedsensorsViewSource;
+        /// <summary>
+        /// Gets or sets the HardwareSpeedSensors View Source.
+        ///</summary>
+        public ICollectionView HardwareSpeedSensorsViewSource
+        {
+            get 
+            {
+                return _hardwarespeedsensorsViewSource; 
+            }
+
+            set 
+            {
+                _hardwarespeedsensorsViewSource = value; RaisePropertyChanged(nameof(HardwareSpeedSensorsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<HardwareVersion> _hardwareversions;
         /// <summary>
         /// Gets or sets the HardwareVersions.
@@ -2555,6 +2627,10 @@ namespace Tango.BL
 
             HardwarePidControlsViewSource = CreateCollectionView(HardwarePidControls);
 
+            HardwareSpeedSensorTypesViewSource = CreateCollectionView(HardwareSpeedSensorTypes);
+
+            HardwareSpeedSensorsViewSource = CreateCollectionView(HardwareSpeedSensors);
+
             HardwareVersionsViewSource = CreateCollectionView(HardwareVersions);
 
             HardwareWinderTypesViewSource = CreateCollectionView(HardwareWinderTypes);
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index 6fa01594d..6979ca1e6 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -92,6 +92,8 @@
     <Compile Include="EntitiesExtensions\MachineEvent.cs" />
     <Compile Include="Entities\EventTypesCategory.cs" />
     <Compile Include="Entities\EventTypesGroup.cs" />
+    <Compile Include="Entities\HardwareSpeedSensor.cs" />
+    <Compile Include="Entities\HardwareSpeedSensorType.cs" />
     <Compile Include="Entities\HtmlPage.cs" />
     <Compile Include="Entities\Sysdiagram.cs" />
     <Compile Include="Entities\TechController.cs" />
@@ -108,6 +110,7 @@
     <Compile Include="Enumerations\HardwareDancerTypes.cs" />
     <Compile Include="Enumerations\HardwareMotorTypes.cs" />
     <Compile Include="Enumerations\HardwarePidControlTypes.cs" />
+    <Compile Include="Enumerations\HardwareSpeedSensorTypes.cs" />
     <Compile Include="Enumerations\HardwareWinderTypes.cs" />
     <Compile Include="Enumerations\HtmlPages.cs" />
     <Compile Include="Enumerations\Ios.cs" />
diff --git a/Software/Visual_Studio/Tango.Core/IO/TemporaryFolder.cs b/Software/Visual_Studio/Tango.Core/IO/TemporaryFolder.cs
index f9cc4a088..c29640f19 100644
--- a/Software/Visual_Studio/Tango.Core/IO/TemporaryFolder.cs
+++ b/Software/Visual_Studio/Tango.Core/IO/TemporaryFolder.cs
@@ -47,7 +47,7 @@ namespace Tango.Core.IO
             {
                 if (Directory.Exists(Path))
                 {
-                    Directory.Delete(Path);
+                    Directory.Delete(Path, true);
                 }
 
                 return true;
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_SPEED_SENSORS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_SPEED_SENSORS.cs
new file mode 100644
index 000000000..789fb0903
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_SPEED_SENSORS.cs
@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class HARDWARE_SPEED_SENSORS
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string HARDWARE_SPEED_SENSOR_TYPE_GUID { get; set; }
+        public string HARDWARE_VERSION_GUID { get; set; }
+        public int RESOLUTION_BITS { get; set; }
+        public double PERIMETER { get; set; }
+    
+        public virtual HARDWARE_SPEED_SENSOR_TYPES HARDWARE_SPEED_SENSOR_TYPES { get; set; }
+        public virtual HARDWARE_VERSIONS HARDWARE_VERSIONS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_SPEED_SENSOR_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_SPEED_SENSOR_TYPES.cs
new file mode 100644
index 000000000..59d98b118
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_SPEED_SENSOR_TYPES.cs
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class HARDWARE_SPEED_SENSOR_TYPES
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public HARDWARE_SPEED_SENSOR_TYPES()
+        {
+            this.HARDWARE_SPEED_SENSORS = new HashSet<HARDWARE_SPEED_SENSORS>();
+        }
+    
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public int CODE { get; set; }
+        public string NAME { get; set; }
+        public string DESCRIPTION { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<HARDWARE_SPEED_SENSORS> HARDWARE_SPEED_SENSORS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs
index b78fe45b1..8948e6e17 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs
@@ -21,6 +21,7 @@ namespace Tango.DAL.Remote.DB
             this.HARDWARE_DANCERS = new HashSet<HARDWARE_DANCERS>();
             this.HARDWARE_MOTORS = new HashSet<HARDWARE_MOTORS>();
             this.HARDWARE_PID_CONTROLS = new HashSet<HARDWARE_PID_CONTROLS>();
+            this.HARDWARE_SPEED_SENSORS = new HashSet<HARDWARE_SPEED_SENSORS>();
             this.HARDWARE_WINDERS = new HashSet<HARDWARE_WINDERS>();
         }
     
@@ -39,6 +40,8 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<HARDWARE_PID_CONTROLS> HARDWARE_PID_CONTROLS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<HARDWARE_SPEED_SENSORS> HARDWARE_SPEED_SENSORS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<HARDWARE_WINDERS> HARDWARE_WINDERS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
index 303927711..9cd8a0449 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -54,6 +54,8 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<HARDWARE_MOTORS> HARDWARE_MOTORS { get; set; }
         public virtual DbSet<HARDWARE_PID_CONTROL_TYPES> HARDWARE_PID_CONTROL_TYPES { get; set; }
         public virtual DbSet<HARDWARE_PID_CONTROLS> HARDWARE_PID_CONTROLS { get; set; }
+        public virtual DbSet<HARDWARE_SPEED_SENSOR_TYPES> HARDWARE_SPEED_SENSOR_TYPES { get; set; }
+        public virtual DbSet<HARDWARE_SPEED_SENSORS> HARDWARE_SPEED_SENSORS { get; set; }
         public virtual DbSet<HARDWARE_VERSIONS> HARDWARE_VERSIONS { get; set; }
         public virtual DbSet<HARDWARE_WINDER_TYPES> HARDWARE_WINDER_TYPES { get; set; }
         public virtual DbSet<HARDWARE_WINDERS> HARDWARE_WINDERS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 5c66fe623..c7d768912 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -427,6 +427,29 @@
           <Property Name="AC_HEATERS__HALF_CYCLE_TIME" Type="int" Nullable="false" />
           <Property Name="PROPORTIONAL_GAIN" Type="float" Nullable="false" />
         </EntityType>
+        <EntityType Name="HARDWARE_SPEED_SENSOR_TYPES">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="CODE" Type="int" Nullable="false" />
+          <Property Name="NAME" Type="varchar" MaxLength="50" Nullable="false" />
+          <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" />
+        </EntityType>
+        <EntityType Name="HARDWARE_SPEED_SENSORS">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="HARDWARE_SPEED_SENSOR_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="HARDWARE_VERSION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="RESOLUTION_BITS" Type="int" Nullable="false" />
+          <Property Name="PERIMETER" Type="float" Nullable="false" />
+        </EntityType>
         <EntityType Name="HARDWARE_VERSIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -1298,6 +1321,32 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_HARDWARE_SPEED_SENSORS_HARDWARE_SPEED_SENSOR_TYPES">
+          <End Role="HARDWARE_SPEED_SENSOR_TYPES" Type="Self.HARDWARE_SPEED_SENSOR_TYPES" Multiplicity="1" />
+          <End Role="HARDWARE_SPEED_SENSORS" Type="Self.HARDWARE_SPEED_SENSORS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="HARDWARE_SPEED_SENSOR_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="HARDWARE_SPEED_SENSORS">
+              <PropertyRef Name="HARDWARE_SPEED_SENSOR_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_HARDWARE_SPEED_SENSORS_HARDWARE_VERSIONS">
+          <End Role="HARDWARE_VERSIONS" Type="Self.HARDWARE_VERSIONS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="HARDWARE_SPEED_SENSORS" Type="Self.HARDWARE_SPEED_SENSORS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="HARDWARE_VERSIONS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="HARDWARE_SPEED_SENSORS">
+              <PropertyRef Name="HARDWARE_VERSION_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_HARDWARE_WINDERS_HARDWARE_VERSIONS">
           <End Role="HARDWARE_VERSIONS" Type="Self.HARDWARE_VERSIONS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -1898,6 +1947,8 @@
           <EntitySet Name="HARDWARE_MOTORS" EntityType="Self.HARDWARE_MOTORS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_PID_CONTROL_TYPES" EntityType="Self.HARDWARE_PID_CONTROL_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_PID_CONTROLS" EntityType="Self.HARDWARE_PID_CONTROLS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="HARDWARE_SPEED_SENSOR_TYPES" EntityType="Self.HARDWARE_SPEED_SENSOR_TYPES" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="HARDWARE_SPEED_SENSORS" EntityType="Self.HARDWARE_SPEED_SENSORS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="Self.HARDWARE_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_WINDER_TYPES" EntityType="Self.HARDWARE_WINDER_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HARDWARE_WINDERS" EntityType="Self.HARDWARE_WINDERS" Schema="dbo" store:Type="Tables" />
@@ -2046,6 +2097,14 @@
             <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" />
             <End Role="HARDWARE_PID_CONTROLS" EntitySet="HARDWARE_PID_CONTROLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_HARDWARE_SPEED_SENSORS_HARDWARE_SPEED_SENSOR_TYPES" Association="Self.FK_HARDWARE_SPEED_SENSORS_HARDWARE_SPEED_SENSOR_TYPES">
+            <End Role="HARDWARE_SPEED_SENSOR_TYPES" EntitySet="HARDWARE_SPEED_SENSOR_TYPES" />
+            <End Role="HARDWARE_SPEED_SENSORS" EntitySet="HARDWARE_SPEED_SENSORS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_HARDWARE_SPEED_SENSORS_HARDWARE_VERSIONS" Association="Self.FK_HARDWARE_SPEED_SENSORS_HARDWARE_VERSIONS">
+            <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" />
+            <End Role="HARDWARE_SPEED_SENSORS" EntitySet="HARDWARE_SPEED_SENSORS" />
+          </AssociationSet>
           <AssociationSet Name="FK_HARDWARE_WINDERS_HARDWARE_VERSIONS" Association="Self.FK_HARDWARE_WINDERS_HARDWARE_VERSIONS">
             <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" />
             <End Role="HARDWARE_WINDERS" EntitySet="HARDWARE_WINDERS" />
@@ -2257,6 +2316,8 @@
           <EntitySet Name="HARDWARE_MOTORS" EntityType="RemoteModel.HARDWARE_MOTORS" />
           <EntitySet Name="HARDWARE_PID_CONTROL_TYPES" EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" />
           <EntitySet Name="HARDWARE_PID_CONTROLS" EntityType="RemoteModel.HARDWARE_PID_CONTROLS" />
+          <EntitySet Name="HARDWARE_SPEED_SENSOR_TYPES" EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" />
+          <EntitySet Name="HARDWARE_SPEED_SENSORS" EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="RemoteModel.HARDWARE_VERSIONS" />
           <EntitySet Name="HARDWARE_WINDER_TYPES" EntityType="RemoteModel.HARDWARE_WINDER_TYPES" />
           <EntitySet Name="HARDWARE_WINDERS" EntityType="RemoteModel.HARDWARE_WINDERS" />
@@ -2453,6 +2514,14 @@
             <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" />
             <End Role="HARDWARE_PID_CONTROLS" EntitySet="HARDWARE_PID_CONTROLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_HARDWARE_SPEED_SENSORS_HARDWARE_SPEED_SENSOR_TYPES" Association="RemoteModel.FK_HARDWARE_SPEED_SENSORS_HARDWARE_SPEED_SENSOR_TYPES">
+            <End Role="HARDWARE_SPEED_SENSOR_TYPES" EntitySet="HARDWARE_SPEED_SENSOR_TYPES" />
+            <End Role="HARDWARE_SPEED_SENSORS" EntitySet="HARDWARE_SPEED_SENSORS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_HARDWARE_SPEED_SENSORS_HARDWARE_VERSIONS" Association="RemoteModel.FK_HARDWARE_SPEED_SENSORS_HARDWARE_VERSIONS">
+            <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" />
+            <End Role="HARDWARE_SPEED_SENSORS" EntitySet="HARDWARE_SPEED_SENSORS" />
+          </AssociationSet>
           <AssociationSet Name="FK_HARDWARE_WINDERS_HARDWARE_VERSIONS" Association="RemoteModel.FK_HARDWARE_WINDERS_HARDWARE_VERSIONS">
             <End Role="HARDWARE_VERSIONS" EntitySet="HARDWARE_VERSIONS" />
             <End Role="HARDWARE_WINDERS" EntitySet="HARDWARE_WINDERS" />
@@ -3059,6 +3128,32 @@
           <NavigationProperty Name="HARDWARE_PID_CONTROL_TYPES" Relationship="RemoteModel.FK_HARDWARE_PID_CONTROLS_HARDWARE_PID_CONTROL_TYPES" FromRole="HARDWARE_PID_CONTROLS" ToRole="HARDWARE_PID_CONTROL_TYPES" />
           <NavigationProperty Name="HARDWARE_VERSIONS" Relationship="RemoteModel.FK_HARDWARE_PID_CONTROLS_HARDWARE_VERSIONS" FromRole="HARDWARE_PID_CONTROLS" ToRole="HARDWARE_VERSIONS" />
         </EntityType>
+        <EntityType Name="HARDWARE_SPEED_SENSOR_TYPES">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="CODE" Type="Int32" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="HARDWARE_SPEED_SENSORS" Relationship="RemoteModel.FK_HARDWARE_SPEED_SENSORS_HARDWARE_SPEED_SENSOR_TYPES" FromRole="HARDWARE_SPEED_SENSOR_TYPES" ToRole="HARDWARE_SPEED_SENSORS" />
+        </EntityType>
+        <EntityType Name="HARDWARE_SPEED_SENSORS">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="HARDWARE_SPEED_SENSOR_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="HARDWARE_VERSION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="RESOLUTION_BITS" Type="Int32" Nullable="false" />
+          <Property Name="PERIMETER" Type="Double" Nullable="false" />
+          <NavigationProperty Name="HARDWARE_SPEED_SENSOR_TYPES" Relationship="RemoteModel.FK_HARDWARE_SPEED_SENSORS_HARDWARE_SPEED_SENSOR_TYPES" FromRole="HARDWARE_SPEED_SENSORS" ToRole="HARDWARE_SPEED_SENSOR_TYPES" />
+          <NavigationProperty Name="HARDWARE_VERSIONS" Relationship="RemoteModel.FK_HARDWARE_SPEED_SENSORS_HARDWARE_VERSIONS" FromRole="HARDWARE_SPEED_SENSORS" ToRole="HARDWARE_VERSIONS" />
+        </EntityType>
         <EntityType Name="HARDWARE_VERSIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -3072,6 +3167,7 @@
           <NavigationProperty Name="HARDWARE_DANCERS" Relationship="RemoteModel.FK_HARDWARE_DANCERS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="HARDWARE_DANCERS" />
           <NavigationProperty Name="HARDWARE_MOTORS" Relationship="RemoteModel.FK_HARDWARE_MOTORS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="HARDWARE_MOTORS" />
           <NavigationProperty Name="HARDWARE_PID_CONTROLS" Relationship="RemoteModel.FK_HARDWARE_PID_CONTROLS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="HARDWARE_PID_CONTROLS" />
+          <NavigationProperty Name="HARDWARE_SPEED_SENSORS" Relationship="RemoteModel.FK_HARDWARE_SPEED_SENSORS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="HARDWARE_SPEED_SENSORS" />
           <NavigationProperty Name="HARDWARE_WINDERS" Relationship="RemoteModel.FK_HARDWARE_WINDERS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="HARDWARE_WINDERS" />
         </EntityType>
         <EntityType Name="HARDWARE_WINDER_TYPES">
@@ -4175,6 +4271,32 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_HARDWARE_SPEED_SENSORS_HARDWARE_SPEED_SENSOR_TYPES">
+          <End Type="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Role="HARDWARE_SPEED_SENSOR_TYPES" Multiplicity="1" />
+          <End Type="RemoteModel.HARDWARE_SPEED_SENSORS" Role="HARDWARE_SPEED_SENSORS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="HARDWARE_SPEED_SENSOR_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="HARDWARE_SPEED_SENSORS">
+              <PropertyRef Name="HARDWARE_SPEED_SENSOR_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_HARDWARE_SPEED_SENSORS_HARDWARE_VERSIONS">
+          <End Type="RemoteModel.HARDWARE_VERSIONS" Role="HARDWARE_VERSIONS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.HARDWARE_SPEED_SENSORS" Role="HARDWARE_SPEED_SENSORS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="HARDWARE_VERSIONS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="HARDWARE_SPEED_SENSORS">
+              <PropertyRef Name="HARDWARE_VERSION_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_HARDWARE_WINDERS_HARDWARE_VERSIONS">
           <End Type="RemoteModel.HARDWARE_VERSIONS" Role="HARDWARE_VERSIONS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -5044,6 +5166,31 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="HARDWARE_SPEED_SENSOR_TYPES">
+            <EntityTypeMapping TypeName="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES">
+              <MappingFragment StoreEntitySet="HARDWARE_SPEED_SENSOR_TYPES">
+                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="CODE" ColumnName="CODE" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="HARDWARE_SPEED_SENSORS">
+            <EntityTypeMapping TypeName="RemoteModel.HARDWARE_SPEED_SENSORS">
+              <MappingFragment StoreEntitySet="HARDWARE_SPEED_SENSORS">
+                <ScalarProperty Name="PERIMETER" ColumnName="PERIMETER" />
+                <ScalarProperty Name="RESOLUTION_BITS" ColumnName="RESOLUTION_BITS" />
+                <ScalarProperty Name="HARDWARE_VERSION_GUID" ColumnName="HARDWARE_VERSION_GUID" />
+                <ScalarProperty Name="HARDWARE_SPEED_SENSOR_TYPE_GUID" ColumnName="HARDWARE_SPEED_SENSOR_TYPE_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="HARDWARE_VERSIONS">
             <EntityTypeMapping TypeName="RemoteModel.HARDWARE_VERSIONS">
               <MappingFragment StoreEntitySet="HARDWARE_VERSIONS">
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index c86db79d6..dc7bcc663 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,75 +5,77 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="6" PointY="73.75" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="76.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="33.875" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="56.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="62.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="1.5" PointY="59.25" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="12.75" PointY="10.875" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="62.875" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="14.25" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="31.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="10.5" PointY="5.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="8.25" PointY="7" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="41.375" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="72.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6" PointY="36.125" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="49.75" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="36.75" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="6" PointY="68.875" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="8.25" PointY="69.75" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="3.75" PointY="73" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="3.75" PointY="69.875" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="27.25" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="24.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="80.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="52.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="43.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="50.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="4.5" PointY="76.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6.75" PointY="56.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="52.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="56.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="52.875" />
-        <EntityTypeShape EntityType="RemoteModel.HTML_PAGES" Width="1.5" PointX="3.75" PointY="66.625" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6" PointY="39.5" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="19.875" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="10.5" PointY="16.375" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="8.25" PointY="12.625" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="7.25" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="7.375" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="10.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="8.25" PointY="37.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="30.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="44.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="5.25" PointY="44" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="8.25" PointY="32.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="21" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="10.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="14.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="18.125" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="47.75" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="67.375" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="9" PointY="59" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="25.5" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="26.75" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="12" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="9" PointY="0.875" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="11.25" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="10.5" PointY="12.875" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="0.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="0.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="2.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="12.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="14.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="14.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="6" PointY="19" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="11.25" PointY="19.875" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="6" PointY="7" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="8" PointY="71.5" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="38.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="72" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="55.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="77.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="1.5" PointY="74.875" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="12.75" PointY="15.125" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="23.5" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="15.375" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="26.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="10.5" PointY="21.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="8.25" PointY="23.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="62.875" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="50.875" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="69" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="80.75" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="8" PointY="74.625" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.25" PointY="75.5" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="5.75" PointY="75.375" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="5.75" PointY="72.25" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="15.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="28.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="7.5" PointY="49.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9.75" PointY="57.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="1.5" PointY="84.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3.75" PointY="56.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="4.5" PointY="64.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6.75" PointY="56.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="68.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="63.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="58.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="52.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="53.5" />
+        <EntityTypeShape EntityType="RemoteModel.HTML_PAGES" Width="1.5" PointX="5.75" PointY="78.5" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="4.5" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="36.125" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="10.5" PointY="13.875" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="8.25" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="22.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="8.375" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="11.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="8.25" PointY="26.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="42.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="45.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="9.25" PointY="53.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="10.25" PointY="33" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="11.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="8.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="19.5" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="35.375" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="33.875" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="11" PointY="37.375" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="30.625" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="31.875" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="13" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="11" PointY="29.25" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.25" PointY="29.375" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="10.5" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="7" />
+        <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="8.75" PointY="1.75" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="8.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="8.75" PointY="7.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="10.75" PointY="1.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="10.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="10.75" PointY="9.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="12.75" PointY="1.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="6" PointY="19.375" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="13.25" PointY="23.25" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="6" PointY="3.5" />
         <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
@@ -113,6 +115,8 @@
         <AssociationConnector Association="RemoteModel.FK_HARDWARE_MOTORS_HARDWARE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_HARDWARE_PID_CONTROLS_HARDWARE_PID_CONTROL_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_HARDWARE_PID_CONTROLS_HARDWARE_VERSIONS" />
+        <AssociationConnector Association="RemoteModel.FK_HARDWARE_SPEED_SENSORS_HARDWARE_SPEED_SENSOR_TYPES" />
+        <AssociationConnector Association="RemoteModel.FK_HARDWARE_SPEED_SENSORS_HARDWARE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_HARDWARE_WINDERS_HARDWARE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_HARDWARE_WINDERS_HARDWARE_WINDER_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_IDS_PACKS_IDS_PACK_FORMULAS" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
index 3bc4eccec..bc7c6749b 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -152,6 +152,12 @@
     <Compile Include="DB\HARDWARE_PID_CONTROL_TYPES.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\HARDWARE_SPEED_SENSORS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\HARDWARE_SPEED_SENSOR_TYPES.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\HARDWARE_VERSIONS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareSpeedSensor.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareSpeedSensor.cs
new file mode 100644
index 000000000..489c0f4fd
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareSpeedSensor.cs
@@ -0,0 +1,218 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: HardwareSpeedSensor.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.Hardware {
+
+  /// <summary>Holder for reflection information generated from HardwareSpeedSensor.proto</summary>
+  public static partial class HardwareSpeedSensorReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for HardwareSpeedSensor.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static HardwareSpeedSensorReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChlIYXJkd2FyZVNwZWVkU2Vuc29yLnByb3RvEhJUYW5nby5QTVIuSGFyZHdh",
+            "cmUaHUhhcmR3YXJlU3BlZWRTZW5zb3JUeXBlLnByb3RvIo4BChNIYXJkd2Fy",
+            "ZVNwZWVkU2Vuc29yEkwKF0hhcmR3YXJlU3BlZWRTZW5zb3JUeXBlGAEgASgO",
+            "MisuVGFuZ28uUE1SLkhhcmR3YXJlLkhhcmR3YXJlU3BlZWRTZW5zb3JUeXBl",
+            "EhYKDlJlc29sdXRpb25CaXRzGAIgASgFEhEKCVBlcmltZXRlchgDIAEoAUIe",
+            "Chxjb20udHdpbmUudGFuZ28ucG1yLmhhcmR3YXJlYgZwcm90bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { global::Tango.PMR.Hardware.HardwareSpeedSensorTypeReflection.Descriptor, },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareSpeedSensor), global::Tango.PMR.Hardware.HardwareSpeedSensor.Parser, new[]{ "HardwareSpeedSensorType", "ResolutionBits", "Perimeter" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class HardwareSpeedSensor : pb::IMessage<HardwareSpeedSensor> {
+    private static readonly pb::MessageParser<HardwareSpeedSensor> _parser = new pb::MessageParser<HardwareSpeedSensor>(() => new HardwareSpeedSensor());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<HardwareSpeedSensor> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.Hardware.HardwareSpeedSensorReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public HardwareSpeedSensor() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public HardwareSpeedSensor(HardwareSpeedSensor other) : this() {
+      hardwareSpeedSensorType_ = other.hardwareSpeedSensorType_;
+      resolutionBits_ = other.resolutionBits_;
+      perimeter_ = other.perimeter_;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public HardwareSpeedSensor Clone() {
+      return new HardwareSpeedSensor(this);
+    }
+
+    /// <summary>Field number for the "HardwareSpeedSensorType" field.</summary>
+    public const int HardwareSpeedSensorTypeFieldNumber = 1;
+    private global::Tango.PMR.Hardware.HardwareSpeedSensorType hardwareSpeedSensorType_ = 0;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.Hardware.HardwareSpeedSensorType HardwareSpeedSensorType {
+      get { return hardwareSpeedSensorType_; }
+      set {
+        hardwareSpeedSensorType_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "ResolutionBits" field.</summary>
+    public const int ResolutionBitsFieldNumber = 2;
+    private int resolutionBits_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int ResolutionBits {
+      get { return resolutionBits_; }
+      set {
+        resolutionBits_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "Perimeter" field.</summary>
+    public const int PerimeterFieldNumber = 3;
+    private double perimeter_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double Perimeter {
+      get { return perimeter_; }
+      set {
+        perimeter_ = value;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as HardwareSpeedSensor);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(HardwareSpeedSensor other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (HardwareSpeedSensorType != other.HardwareSpeedSensorType) return false;
+      if (ResolutionBits != other.ResolutionBits) return false;
+      if (Perimeter != other.Perimeter) return false;
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (HardwareSpeedSensorType != 0) hash ^= HardwareSpeedSensorType.GetHashCode();
+      if (ResolutionBits != 0) hash ^= ResolutionBits.GetHashCode();
+      if (Perimeter != 0D) hash ^= Perimeter.GetHashCode();
+      return hash;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override string ToString() {
+      return pb::JsonFormatter.ToDiagnosticString(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void WriteTo(pb::CodedOutputStream output) {
+      if (HardwareSpeedSensorType != 0) {
+        output.WriteRawTag(8);
+        output.WriteEnum((int) HardwareSpeedSensorType);
+      }
+      if (ResolutionBits != 0) {
+        output.WriteRawTag(16);
+        output.WriteInt32(ResolutionBits);
+      }
+      if (Perimeter != 0D) {
+        output.WriteRawTag(25);
+        output.WriteDouble(Perimeter);
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      if (HardwareSpeedSensorType != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) HardwareSpeedSensorType);
+      }
+      if (ResolutionBits != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(ResolutionBits);
+      }
+      if (Perimeter != 0D) {
+        size += 1 + 8;
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(HardwareSpeedSensor other) {
+      if (other == null) {
+        return;
+      }
+      if (other.HardwareSpeedSensorType != 0) {
+        HardwareSpeedSensorType = other.HardwareSpeedSensorType;
+      }
+      if (other.ResolutionBits != 0) {
+        ResolutionBits = other.ResolutionBits;
+      }
+      if (other.Perimeter != 0D) {
+        Perimeter = other.Perimeter;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            input.SkipLastField();
+            break;
+          case 8: {
+            hardwareSpeedSensorType_ = (global::Tango.PMR.Hardware.HardwareSpeedSensorType) input.ReadEnum();
+            break;
+          }
+          case 16: {
+            ResolutionBits = input.ReadInt32();
+            break;
+          }
+          case 25: {
+            Perimeter = input.ReadDouble();
+            break;
+          }
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareSpeedSensorType.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareSpeedSensorType.cs
new file mode 100644
index 000000000..0d623b491
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareSpeedSensorType.cs
@@ -0,0 +1,48 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: HardwareSpeedSensorType.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.Hardware {
+
+  /// <summary>Holder for reflection information generated from HardwareSpeedSensorType.proto</summary>
+  public static partial class HardwareSpeedSensorTypeReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for HardwareSpeedSensorType.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static HardwareSpeedSensorTypeReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "Ch1IYXJkd2FyZVNwZWVkU2Vuc29yVHlwZS5wcm90bxISVGFuZ28uUE1SLkhh",
+            "cmR3YXJlKjEKF0hhcmR3YXJlU3BlZWRTZW5zb3JUeXBlEhYKEkRlZmF1bHRT",
+            "cGVlZFNlbnNvchAAQh4KHGNvbS50d2luZS50YW5nby5wbXIuaGFyZHdhcmVi",
+            "BnByb3RvMw=="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.HardwareSpeedSensorType), }, null));
+    }
+    #endregion
+
+  }
+  #region Enums
+  public enum HardwareSpeedSensorType {
+    /// <summary>
+    ///Default Speed Sensor
+    /// </summary>
+    [pbr::OriginalName("DefaultSpeedSensor")] DefaultSpeedSensor = 0,
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index 1489f27a0..b8561f61f 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -127,6 +127,8 @@
     <Compile Include="Hardware\HardwareMotorType.cs" />
     <Compile Include="Hardware\HardwarePidControl.cs" />
     <Compile Include="Hardware\HardwarePidControlType.cs" />
+    <Compile Include="Hardware\HardwareSpeedSensor.cs" />
+    <Compile Include="Hardware\HardwareSpeedSensorType.cs" />
     <Compile Include="Hardware\HardwareWinder.cs" />
     <Compile Include="Hardware\HardwareWinderType.cs" />
     <Compile Include="Hardware\SystemResetRequest.cs" />
diff --git a/Software/Visual_Studio/Tango.Protobuf/CompilerProgressEventArgs.cs b/Software/Visual_Studio/Tango.Protobuf/CompilerProgressEventArgs.cs
new file mode 100644
index 000000000..bd56d360f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Protobuf/CompilerProgressEventArgs.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Protobuf
+{
+    public class CompilerProgressEventArgs : EventArgs
+    {
+        public int Current { get; set; }
+        public int Total { get; set; }
+        public String File { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Protobuf/IProtoCompiler.cs b/Software/Visual_Studio/Tango.Protobuf/IProtoCompiler.cs
index 65b07786f..15d65b767 100644
--- a/Software/Visual_Studio/Tango.Protobuf/IProtoCompiler.cs
+++ b/Software/Visual_Studio/Tango.Protobuf/IProtoCompiler.cs
@@ -12,6 +12,11 @@ namespace Tango.Protobuf
     public interface IProtoCompiler : IDisposable
     {
         /// <summary>
+        /// Occurs when the compiler has made some progress.
+        /// </summary>
+        event EventHandler<CompilerProgressEventArgs> CompilationProgress;
+
+        /// <summary>
         /// Compiles the specified .proto message file. 
         /// </summary>
         /// <param name="inputFile">.proto file to compile</param>
diff --git a/Software/Visual_Studio/Tango.Protobuf/ProtoCompiler.cs b/Software/Visual_Studio/Tango.Protobuf/ProtoCompiler.cs
index d58d21ea9..2e51de6df 100644
--- a/Software/Visual_Studio/Tango.Protobuf/ProtoCompiler.cs
+++ b/Software/Visual_Studio/Tango.Protobuf/ProtoCompiler.cs
@@ -21,6 +21,13 @@ namespace Tango.Protobuf
         private const String COMPILERS_FOLDER_NAME = "ProtoCompilers"; //Compilers folder name.
         protected String _compilersPath; //Compilers folder path.
         private LogManager logManager = LogManager.Default;
+        private int _currentProgress;
+        private int _totalProgress;
+
+        /// <summary>
+        /// Occurs when the compiler has made some progress.
+        /// </summary>
+        public event EventHandler<CompilerProgressEventArgs> CompilationProgress;
 
         /// <summary>
         /// Gets the compiler language.
@@ -57,6 +64,13 @@ namespace Tango.Protobuf
         {
             logManager.Log("Compiling file " + inputFile);
 
+            CompilationProgress?.Invoke(this, new CompilerProgressEventArgs()
+            {
+                Current = _currentProgress++,
+                Total = _totalProgress,
+                File = inputFile,
+            });
+
             var tmpPath = TemporaryManager.Default.CreateFolder();
 
             logManager.Log("Temp path: " + tmpPath);
@@ -159,6 +173,9 @@ namespace Tango.Protobuf
         /// </returns>
         public virtual CompilerFolderResult CompileFolder(string sourceFolder, params String[] includeFolders)
         {
+            _currentProgress = 0;
+            _totalProgress = Directory.GetFiles(sourceFolder, "*.proto", SearchOption.AllDirectories).Length;
+
             if (!UsesDefaultStructure)
             {
                 logManager.Log("Compiling folder: " + sourceFolder);
diff --git a/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj b/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj
index efade39c9..f45a082e4 100644
--- a/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj
+++ b/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj
@@ -47,6 +47,7 @@
     <Compile Include="CompilerException.cs" />
     <Compile Include="CompilerFactory.cs" />
     <Compile Include="CompilerFolderResult.cs" />
+    <Compile Include="CompilerProgressEventArgs.cs" />
     <Compile Include="Compilers\CCompiler.cs" />
     <Compile Include="Compilers\CppCompiler.cs" />
     <Compile Include="Compilers\CSharpCompiler.cs" />
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index 4c276c2f4..9ad92d56d 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -171,7 +171,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.BugReporter", "Utilit
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VSIX", "VSIX", "{03937A28-630D-49B6-8344-6980FF7BF7DD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.BuildExtensions", "Tango.BuildExtensions\Tango.BuildExtensions.csproj", "{43A25F41-EE8C-4A29-94D2-4CBC603E6B29}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.BuildExtensions", "VSIX\Tango.BuildExtensions\Tango.BuildExtensions.csproj", "{43A25F41-EE8C-4A29-94D2-4CBC603E6B29}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs
index 6a63d6591..ae18bb6f4 100644
--- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs
@@ -31,6 +31,7 @@ namespace Tango.PMRGenerator.CLI
                 GenerateHardwarePidControls(db, pmrFolder);
                 GenerateHardwareDispensers(db, pmrFolder);
                 GenerateHardwareWinders(db, pmrFolder);
+                GenerateHardwareSpeedSensors(db, pmrFolder);
                 GenerateLiquidTypes(db, pmrFolder);
                 GenerateWindingMethods(db, pmrFolder);
                 GenerateSpoolTypes(db, pmrFolder);
@@ -243,6 +244,44 @@ namespace Tango.PMRGenerator.CLI
             File.WriteAllText(Path.Combine(pmrFolder, "Hardware", messageFile.Name + ".proto"), messageString);
         }
 
+        private static void GenerateHardwareSpeedSensors(ObservablesContext db, String pmrFolder)
+        {
+            Console.WriteLine("Generating Hardware Speed Sensor Types...");
+
+            ProtoEnumFile enumFile = new ProtoEnumFile();
+            enumFile.Name = "HardwareSpeedSensorType";
+            enumFile.Package = "Tango.PMR.Hardware";
+
+            foreach (var field in db.HardwareSpeedSensorTypes.ToList().OrderBy(x => x.Code))
+            {
+                enumFile.Fields.Add(new EnumerationField()
+                {
+                    Name = field.Name.Replace(" ", ""),
+                    Value = field.Code,
+                    Description = field.Description,
+                });
+            }
+
+            Console.WriteLine("Generating Hardware Speed Sensor...");
+            ProtoMessageFile messageFile = new ProtoMessageFile();
+            messageFile.Name = "HardwareSpeedSensor";
+            messageFile.Package = "Tango.PMR.Hardware";
+            messageFile.Imports.Add("HardwareSpeedSensorType.proto");
+
+            messageFile.Properties.Add(new ProtoProperty("HardwareSpeedSensorType", "HardwareSpeedSensorType"));
+
+            foreach (var prop in typeof(HardwareSpeedSensor).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive))
+            {
+                messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType)));
+            }
+
+            String enumString = enumFile.GenerateCode();
+            String messageString = messageFile.GenerateCode();
+
+            File.WriteAllText(Path.Combine(pmrFolder, "Hardware", enumFile.Name + ".proto"), enumString);
+            File.WriteAllText(Path.Combine(pmrFolder, "Hardware", messageFile.Name + ".proto"), messageString);
+        }
+
         private static void GenerateLiquidTypes(ObservablesContext db, String pmrFolder)
         {
             Console.WriteLine("Generating Dispenser Liquid Types...");
diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Program.cs
index 1f58f11fd..621a6d10f 100644
--- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Program.cs
@@ -13,6 +13,8 @@ namespace Tango.Protobuf.CLI
         {
             try
             {
+                Console.Title = "Tango Protobuf Compiler";
+
                 if (args.Length == 0)
                 {
                     return ExitHelp();
@@ -40,6 +42,21 @@ namespace Tango.Protobuf.CLI
                     try
                     {
                         var compiler = CompilerFactory.CreateCompiler(language);
+
+                        compiler.CompilationProgress += (x, e) =>
+                        {
+                            try
+                            {
+                                Console.SetCursorPosition(0, 0);
+                                Console.Write(new string(' ', Console.WindowWidth));
+                                Console.SetCursorPosition(0, 0);
+                                Console.Write("Compiling " + Path.GetFileName(e.File) + "...");
+                                Console.SetCursorPosition(Console.WindowWidth - 7, 0);
+                                Console.Write("(% " + Math.Round((((double)e.Current / (double)e.Total) * 100d), 0) + ")");
+                            }
+                            catch { }
+                        };
+
                         var result = compiler.CompileFolder(Path.GetFullPath(options.SourceFolder), options.Includes != null ? options.Includes.Split(',') : null);
                         result.Save(Path.GetFullPath(options.OutputFolder));
                     }
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/BuildForm.Designer.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.Designer.cs
index 4b95a83b0..4b95a83b0 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/BuildForm.Designer.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.Designer.cs
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/BuildForm.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.cs
index ff75ec321..ff75ec321 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/BuildForm.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.cs
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/BuildForm.resx b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.resx
index 1af7de150..1af7de150 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/BuildForm.resx
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/BuildForm.resx
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/Key.snk b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Key.snk
index e536d20c4..e536d20c4 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/Key.snk
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Key.snk
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/ProgressForm.Designer.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/ProgressForm.Designer.cs
index fd70df334..fd70df334 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/ProgressForm.Designer.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/ProgressForm.Designer.cs
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/ProgressForm.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/ProgressForm.cs
index 349721155..349721155 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/ProgressForm.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/ProgressForm.cs
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/ProgressForm.resx b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/ProgressForm.resx
index 1af7de150..1af7de150 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/ProgressForm.resx
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/ProgressForm.resx
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/Properties/AssemblyInfo.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/AssemblyInfo.cs
index e1969199b..e1969199b 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/AssemblyInfo.cs
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/Properties/Resources.Designer.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/Resources.Designer.cs
index 7e1f6dd26..7e1f6dd26 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/Properties/Resources.Designer.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/Resources.Designer.cs
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/Properties/Resources.resx b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/Resources.resx
index b51e9537e..b51e9537e 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/Properties/Resources.resx
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/Resources.resx
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/Resources/BuildTangoCommand.png b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/BuildTangoCommand.png
index b22d975cb..b22d975cb 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/Resources/BuildTangoCommand.png
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/BuildTangoCommand.png
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/Resources/BuildTangoCommandPackage.ico b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/BuildTangoCommandPackage.ico
index d323b07fb..d323b07fb 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/Resources/BuildTangoCommandPackage.ico
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/BuildTangoCommandPackage.ico
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/Resources/TangoBuildCommand.png b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/TangoBuildCommand.png
index b22d975cb..b22d975cb 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/Resources/TangoBuildCommand.png
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/TangoBuildCommand.png
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/Resources/TangoBuildCommandPackage.ico b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/TangoBuildCommandPackage.ico
index d323b07fb..d323b07fb 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/Resources/TangoBuildCommandPackage.ico
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/TangoBuildCommandPackage.ico
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/Resources/machine-trans-16x16.png b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/machine-trans-16x16.png
index 920049c15..920049c15 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/Resources/machine-trans-16x16.png
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/machine-trans-16x16.png
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/Resources/machine-trans-small.png b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/machine-trans-small.png
index fb9a19df9..fb9a19df9 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/Resources/machine-trans-small.png
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/machine-trans-small.png
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/Tango.BuildExtensions.csproj b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj
index e20a42e3c..b5b5ed45e 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/Tango.BuildExtensions.csproj
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" />
+  <Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -100,7 +100,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
+      <HintPath>..\..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -119,70 +119,70 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Imaging, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Imaging.15.0.26201\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Imaging.15.0.26201\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.15.0.15.0.26201\lib\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.15.0.15.0.26201\lib\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Threading, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Validation, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Validation.15.0.82\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Validation.15.0.82\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -195,7 +195,7 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="TestStack.White, Version=0.13.0.0, Culture=neutral, PublicKeyToken=2672efbf3e161801, processorArchitecture=MSIL">
-      <HintPath>..\packages\TestStack.White.0.13.3\lib\net40\TestStack.White.dll</HintPath>
+      <HintPath>..\..\packages\TestStack.White.0.13.3\lib\net40\TestStack.White.dll</HintPath>
     </Reference>
     <Reference Include="VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
@@ -220,8 +220,8 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.7.7\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.7.7\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
@@ -229,12 +229,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
   </Target>
-  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" />
-  <Import Project="..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
+  <Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" />
+  <Import Project="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.18\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/TangoBuildCommand.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommand.cs
index d462e5f75..36506e5b0 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/TangoBuildCommand.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommand.cs
@@ -42,6 +42,7 @@ namespace Tango.BuildExtensions
         private const String observablesProjectName = "Tango.BL";
         private const String pmrGeneratorProjectName = "Tango.PMRGenerator.CLI";
         private const String pmrProjectName = "Tango.PMR";
+        private const String protoCliProjectName = "Tango.Protobuf.CLI";
 
         #region Redundant
 
@@ -368,6 +369,33 @@ namespace Tango.BuildExtensions
 
         private void UpdateAndBuildPmrMessages()
         {
+            var protoProject = _projects.SingleOrDefault(x => x.Name == protoCliProjectName);
+
+            if (protoProject == null)
+            {
+                throw new NullReferenceException("Could not locate project " + protoCliProjectName);
+            }
+
+            SetStatusText("Building project " + protoCliProjectName + "...");
+
+            _dte.Solution.SolutionBuild.BuildProject("Debug", protoProject.FullName, true);
+
+            if (_dte.Solution.SolutionBuild.LastBuildInfo > 0)
+            {
+                throw new ExternalException(protoCliProjectName + " failed to build!");
+            }
+
+            _dte.Solution.Properties.Item("StartupProject").Value = protoCliProjectName;
+
+            SetStatusText("Executing Tango Proto Compiler...");
+
+            _dte.ExecuteCommand("Debug.Start");
+
+            WaitForWindowOpen("Tango Protobuf Compiler");
+
+            WaitForWindowClose("Tango Protobuf Compiler");
+
+
             var project = _projects.SingleOrDefault(x => x.Name == pmrProjectName);
 
             if (project == null)
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/TangoBuildCommandPackage.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.cs
index f31bb8193..f31bb8193 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/TangoBuildCommandPackage.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.cs
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/TangoBuildCommandPackage.vsct b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.vsct
index 06eec602e..06eec602e 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/TangoBuildCommandPackage.vsct
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.vsct
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/VSPackage.Designer.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/VSPackage.Designer.cs
index 13fd3a51b..13fd3a51b 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/VSPackage.Designer.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/VSPackage.Designer.cs
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/VSPackage.resx b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/VSPackage.resx
index 4d0826c19..4d0826c19 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/VSPackage.resx
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/VSPackage.resx
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/WindowInfo.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/WindowInfo.cs
index 535ee7ce1..535ee7ce1 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/WindowInfo.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/WindowInfo.cs
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/index.html b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/index.html
index 1fee824a3..1fee824a3 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/index.html
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/index.html
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/packages.config b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/packages.config
index c81549d43..c81549d43 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/packages.config
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/packages.config
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/source.extension.vsixmanifest b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/source.extension.vsixmanifest
index 44c933587..b55a2f85f 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/source.extension.vsixmanifest
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="Tango.BuildExtensions.Roy Ben-Shabat.51661b60-44de-4a1c-9748-d7d5edd7d8bb" Version="1.0" Language="en-US" Publisher="Roy Ben-Shabat" />
+    <Identity Id="Tango.BuildExtensions.Roy Ben-Shabat.51661b60-44de-4a1c-9748-d7d5edd7d8bb" Version="1.2" Language="en-US" Publisher="Roy Ben-Shabat" />
     <DisplayName>Tango Build Extensions</DisplayName>
     <Description>Build automation extensions for Twine Tango system.</Description>
   </Metadata>
diff --git a/Software/Visual_Studio/Tango.BuildExtensions/stylesheet.css b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/stylesheet.css
index d5e9c71a8..d5e9c71a8 100644
--- a/Software/Visual_Studio/Tango.BuildExtensions/stylesheet.css
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/stylesheet.css