Completed Remote Debugger VSIX !!!

Added 2 dancer parameters.
Refactored Tech Board to reset configuration when connected machine changes.

18 files changed, 351 insertions, 146 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index d8369ea7b..381101c7e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -224,7 +224,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
             UploadHardwareConfigurationCommand = new RelayCommand(UploadHardwareConfiguration);
             SyncHardwareConfigurationCommand = new RelayCommand(SyncHardwareConfiguration);
-            ResetHardwareConfigurationCommand = new RelayCommand(ResetHardwareConfiguration);
+            ResetHardwareConfigurationCommand = new RelayCommand(() => ResetHardwareConfiguration());
         }
 
         #endregion
@@ -239,6 +239,11 @@ namespace Tango.MachineStudio.Technician.ViewModels
         private void ApplicationManager_ConnectedMachineChanged(object sender, IExternalBridgeClient machine)
         {
             MachineOperator = machine;
+
+            if (MachineOperator != null)
+            {
+                ResetHardwareConfiguration(false);
+            }
         }
 
         /// <summary>
@@ -1430,7 +1435,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
             }
         }
 
-        private void ResetHardwareConfiguration()
+        private void ResetHardwareConfiguration(bool showMessage = true)
         {
             if (MachineOperator != null)
             {
@@ -1486,7 +1491,10 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     }
                 }
 
-                _notification.ShowInfo("Visual elements synced to hardware version " + hw.Name + ", " + hw.Version + ".");
+                if (showMessage)
+                {
+                    _notification.ShowInfo("Visual elements synced to hardware version " + hw.Name + ", " + hw.Version + ".");
+                }
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
index 72d8da7ce..9843162de 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
@@ -161,7 +161,7 @@
                             <TextBlock VerticalAlignment="Center">RESET</TextBlock>
                         </StackPanel>
                     </Button>
-                    <Button Height="Auto" Margin="0 0 10 0" FontSize="12" Command="{Binding SyncHardwareConfigurationCommand}" IsEnabled="{Binding ApplicationManager.IsMachineConnected}" ToolTip="Sync all visual elements to the current hardware configuration">
+                    <Button Height="Auto" Margin="0 0 10 0" FontSize="12" Command="{Binding SyncHardwareConfigurationCommand}" IsEnabled="{Binding ApplicationManager.IsMachineConnected}" ToolTip="Sync all visual elements to the current hardware configuration stored on the machine (last uploaded)">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon Margin="0 0 0 0" Width="24" Height="24" Kind="ArrowDownBold"/>
                             <TextBlock VerticalAlignment="Center">SYNC HW CONFIG</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
index 847503e42..622d3b0d0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
@@ -184,7 +184,9 @@ namespace Tango.MachineStudio.Publisher
                         Token = response.Token,
                     });
 
+                    Progress = 0;
                     UpdateVersions();
+                    ShowInfo("Version published successfully!");
                 }
                 catch (Exception ex)
                 {
@@ -203,6 +205,11 @@ namespace Tango.MachineStudio.Publisher
             MessageBox.Show(error, "Machine Studio Publisher", MessageBoxButton.OK, MessageBoxImage.Error);
         }
 
+        private void ShowInfo(String message)
+        {
+            MessageBox.Show(message, "Machine Studio Publisher", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
         protected override void RaisePropertyChangedAuto([CallerMemberName] string caller = null)
         {
             base.RaisePropertyChangedAuto(caller);
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs
index e847eb7cb..5e6ecfec4 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancer.cs
@@ -216,6 +216,46 @@ namespace Tango.BL.Entities
 
         }
 
+        protected Boolean _assemblydirectionright;
+        /// <summary>
+        /// Gets or sets the hardwaredancer assembly direction right.
+        /// </summary>
+        [Column("ASSEMBLY_DIRECTION_RIGHT")]
+
+        public  Boolean AssemblyDirectionRight
+        {
+            get 
+            {
+                return _assemblydirectionright; 
+            }
+
+            set 
+            {
+                _assemblydirectionright = value; RaisePropertyChanged(nameof(AssemblyDirectionRight)); 
+            }
+
+        }
+
+        protected Boolean _accelerateontensionraise;
+        /// <summary>
+        /// Gets or sets the hardwaredancer accelerate on tension raise.
+        /// </summary>
+        [Column("ACCELERATE_ON_TENSION_RAISE")]
+
+        public  Boolean AccelerateOnTensionRaise
+        {
+            get 
+            {
+                return _accelerateontensionraise; 
+            }
+
+            set 
+            {
+                _accelerateontensionraise = value; RaisePropertyChanged(nameof(AccelerateOnTensionRaise)); 
+            }
+
+        }
+
         protected HardwareDancerType _hardwaredancertype;
         /// <summary>
         /// Gets or sets the hardwaredancer hardware dancer types.
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_DANCERS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_DANCERS.cs
index 7341ceec9..d3bd42ac7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_DANCERS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_DANCERS.cs
@@ -27,6 +27,8 @@ namespace Tango.DAL.Remote.DB
         public int ZERO_POINT { get; set; }
         public int RESOLUTION_BITS { get; set; }
         public int ARM_LENGTH { get; set; }
+        public bool ASSEMBLY_DIRECTION_RIGHT { get; set; }
+        public bool ACCELERATE_ON_TENSION_RAISE { get; set; }
     
         public virtual HARDWARE_DANCER_TYPES HARDWARE_DANCER_TYPES { get; set; }
         public virtual HARDWARE_VERSIONS HARDWARE_VERSIONS { 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 b9cd34566..324036ddf 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -343,6 +343,8 @@
           <Property Name="ZERO_POINT" Type="int" Nullable="false" />
           <Property Name="RESOLUTION_BITS" Type="int" Nullable="false" />
           <Property Name="ARM_LENGTH" Type="int" Nullable="false" />
+          <Property Name="ASSEMBLY_DIRECTION_RIGHT" Type="bit" Nullable="false" />
+          <Property Name="ACCELERATE_ON_TENSION_RAISE" Type="bit" Nullable="false" />
         </EntityType>
         <EntityType Name="HARDWARE_MOTOR_TYPES">
           <Key>
@@ -3037,6 +3039,8 @@
           <Property Name="ZERO_POINT" Type="Int32" Nullable="false" />
           <Property Name="RESOLUTION_BITS" Type="Int32" Nullable="false" />
           <Property Name="ARM_LENGTH" Type="Int32" Nullable="false" />
+          <Property Name="ASSEMBLY_DIRECTION_RIGHT" Type="Boolean" Nullable="false" />
+          <Property Name="ACCELERATE_ON_TENSION_RAISE" Type="Boolean" Nullable="false" />
           <NavigationProperty Name="HARDWARE_DANCER_TYPES" Relationship="RemoteModel.FK_HARDWARE_DANCERS_HARDWARE_DANCER_TYPES" FromRole="HARDWARE_DANCERS" ToRole="HARDWARE_DANCER_TYPES" />
           <NavigationProperty Name="HARDWARE_VERSIONS" Relationship="RemoteModel.FK_HARDWARE_DANCERS_HARDWARE_VERSIONS" FromRole="HARDWARE_DANCERS" ToRole="HARDWARE_VERSIONS" />
         </EntityType>
@@ -5065,6 +5069,8 @@
           <EntitySetMapping Name="HARDWARE_DANCERS">
             <EntityTypeMapping TypeName="RemoteModel.HARDWARE_DANCERS">
               <MappingFragment StoreEntitySet="HARDWARE_DANCERS">
+                <ScalarProperty Name="ACCELERATE_ON_TENSION_RAISE" ColumnName="ACCELERATE_ON_TENSION_RAISE" />
+                <ScalarProperty Name="ASSEMBLY_DIRECTION_RIGHT" ColumnName="ASSEMBLY_DIRECTION_RIGHT" />
                 <ScalarProperty Name="ARM_LENGTH" ColumnName="ARM_LENGTH" />
                 <ScalarProperty Name="RESOLUTION_BITS" ColumnName="RESOLUTION_BITS" />
                 <ScalarProperty Name="ZERO_POINT" ColumnName="ZERO_POINT" />
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 462d9d5c1..d64dabfb7 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,77 +5,77 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="8" PointY="70.75" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="65.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="36.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="55.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="45.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="1.5" PointY="42.375" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="9.75" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="8" PointY="56.5" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="14.25" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="31.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="7.5" PointY="36.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="5.25" PointY="38.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="44.125" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="61.25" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="8" PointY="59.375" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="39.5" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="52.125" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="8" PointY="73.875" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.25" PointY="74.75" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="5.75" PointY="78" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="5.75" PointY="74.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="7.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.5" PointY="63.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="11.75" PointY="48.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="32.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="40.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="69.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="51" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.5" PointY="63.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="8.75" PointY="52.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="48.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="67.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="44.5" />
-        <EntityTypeShape EntityType="RemoteModel.HTML_PAGES" Width="1.5" PointX="5.75" PointY="71.5" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="8" PointY="1.125" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10.25" PointY="27.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="7.5" PointY="18.875" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="12.625" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="21.5" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="8.375" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="10.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="5.25" PointY="4.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="58" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="50.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="8.25" PointY="48.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="10.25" PointY="33.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="10.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="18.5" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="24.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="14.75" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="8" PointY="5" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="63.625" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="8" PointY="78.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="25.75" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="27" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="12" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="8" PointY="66.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="10.25" PointY="66.875" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="22.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="24.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="10.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="0.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="10.75" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="12.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="4.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3" PointY="7" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="10.25" PointY="6.75" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="3" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="3" PointY="103.5" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="81.5" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="58.5" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="34.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="64.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="1.5" PointY="37.625" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="10.75" PointY="9.375" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="44.75" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="15.5" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="33" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="8.5" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6.25" PointY="2.5" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="42.375" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="77.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3" PointY="1.625" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="61.375" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="67.25" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="3" PointY="88.625" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="5.25" PointY="89.5" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_CATEGORIES" Width="1.5" PointX="0.75" PointY="92.625" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_GROUPS" Width="1.5" PointX="0.75" PointY="89.625" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="22.5" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="11.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="71" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="59" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="1.5" PointY="99.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3.75" PointY="58.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="5.5" PointY="50" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="7.75" PointY="48.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="67" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="54.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="54.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="96" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="54.875" />
+        <EntityTypeShape EntityType="RemoteModel.HTML_PAGES" Width="1.5" PointX="0.75" PointY="86.25" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="5.25" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="23" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="7.5" PointY="8.125" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="7.75" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="8.625" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="15.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="5.25" PointY="42.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="51.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="48.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="5.25" PointY="46.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="5.25" PointY="38" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="15.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="8.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="19.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="28.375" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="41.625" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="72.75" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="6" PointY="79.125" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="27" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="28.25" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="6" PointY="75" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="8.25" PointY="75.125" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="11.375" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="30.25" />
+        <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="10.75" PointY="2" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="10.75" PointY="5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="12.75" PointY="2" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="12.75" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="12.75" PointY="9" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="12.75" PointY="14" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="14.75" PointY="2" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3" PointY="22.125" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="8.25" PointY="23" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="3" PointY="27.125" />
         <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareDancer.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareDancer.cs
index bd150cb85..f55ab72a2 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareDancer.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareDancer.cs
@@ -23,17 +23,19 @@ namespace Tango.PMR.Hardware {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChRIYXJkd2FyZURhbmNlci5wcm90bxISVGFuZ28uUE1SLkhhcmR3YXJlGhhI",
-            "YXJkd2FyZURhbmNlclR5cGUucHJvdG8i7gEKDkhhcmR3YXJlRGFuY2VyEkIK",
+            "YXJkd2FyZURhbmNlclR5cGUucHJvdG8isAIKDkhhcmR3YXJlRGFuY2VyEkIK",
             "EkhhcmR3YXJlRGFuY2VyVHlwZRgBIAEoDjImLlRhbmdvLlBNUi5IYXJkd2Fy",
             "ZS5IYXJkd2FyZURhbmNlclR5cGUSDwoHR3JhZHVhbBgCIAEoCBIJCgFLGAMg",
             "ASgBEgkKAVgYBCABKAESGAoQUHVsc2VQZXJNbVNwcmluZxgFIAEoBRIZChFN",
             "YXhpbWFsTW92ZW1lbnRNbRgGIAEoBRIRCglaZXJvUG9pbnQYByABKAUSFgoO",
-            "UmVzb2x1dGlvbkJpdHMYCCABKAUSEQoJQXJtTGVuZ3RoGAkgASgFQh4KHGNv",
-            "bS50d2luZS50YW5nby5wbXIuaGFyZHdhcmViBnByb3RvMw=="));
+            "UmVzb2x1dGlvbkJpdHMYCCABKAUSEQoJQXJtTGVuZ3RoGAkgASgFEh4KFkFz",
+            "c2VtYmx5RGlyZWN0aW9uUmlnaHQYCiABKAgSIAoYQWNjZWxlcmF0ZU9uVGVu",
+            "c2lvblJhaXNlGAsgASgIQh4KHGNvbS50d2luZS50YW5nby5wbXIuaGFyZHdh",
+            "cmViBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Hardware.HardwareDancerTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareDancer), global::Tango.PMR.Hardware.HardwareDancer.Parser, new[]{ "HardwareDancerType", "Gradual", "K", "X", "PulsePerMmSpring", "MaximalMovementMm", "ZeroPoint", "ResolutionBits", "ArmLength" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.HardwareDancer), global::Tango.PMR.Hardware.HardwareDancer.Parser, new[]{ "HardwareDancerType", "Gradual", "K", "X", "PulsePerMmSpring", "MaximalMovementMm", "ZeroPoint", "ResolutionBits", "ArmLength", "AssemblyDirectionRight", "AccelerateOnTensionRaise" }, null, null, null)
           }));
     }
     #endregion
@@ -73,6 +75,8 @@ namespace Tango.PMR.Hardware {
       zeroPoint_ = other.zeroPoint_;
       resolutionBits_ = other.resolutionBits_;
       armLength_ = other.armLength_;
+      assemblyDirectionRight_ = other.assemblyDirectionRight_;
+      accelerateOnTensionRaise_ = other.accelerateOnTensionRaise_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -179,6 +183,28 @@ namespace Tango.PMR.Hardware {
       }
     }
 
+    /// <summary>Field number for the "AssemblyDirectionRight" field.</summary>
+    public const int AssemblyDirectionRightFieldNumber = 10;
+    private bool assemblyDirectionRight_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool AssemblyDirectionRight {
+      get { return assemblyDirectionRight_; }
+      set {
+        assemblyDirectionRight_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "AccelerateOnTensionRaise" field.</summary>
+    public const int AccelerateOnTensionRaiseFieldNumber = 11;
+    private bool accelerateOnTensionRaise_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool AccelerateOnTensionRaise {
+      get { return accelerateOnTensionRaise_; }
+      set {
+        accelerateOnTensionRaise_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as HardwareDancer);
@@ -201,6 +227,8 @@ namespace Tango.PMR.Hardware {
       if (ZeroPoint != other.ZeroPoint) return false;
       if (ResolutionBits != other.ResolutionBits) return false;
       if (ArmLength != other.ArmLength) return false;
+      if (AssemblyDirectionRight != other.AssemblyDirectionRight) return false;
+      if (AccelerateOnTensionRaise != other.AccelerateOnTensionRaise) return false;
       return true;
     }
 
@@ -216,6 +244,8 @@ namespace Tango.PMR.Hardware {
       if (ZeroPoint != 0) hash ^= ZeroPoint.GetHashCode();
       if (ResolutionBits != 0) hash ^= ResolutionBits.GetHashCode();
       if (ArmLength != 0) hash ^= ArmLength.GetHashCode();
+      if (AssemblyDirectionRight != false) hash ^= AssemblyDirectionRight.GetHashCode();
+      if (AccelerateOnTensionRaise != false) hash ^= AccelerateOnTensionRaise.GetHashCode();
       return hash;
     }
 
@@ -262,6 +292,14 @@ namespace Tango.PMR.Hardware {
         output.WriteRawTag(72);
         output.WriteInt32(ArmLength);
       }
+      if (AssemblyDirectionRight != false) {
+        output.WriteRawTag(80);
+        output.WriteBool(AssemblyDirectionRight);
+      }
+      if (AccelerateOnTensionRaise != false) {
+        output.WriteRawTag(88);
+        output.WriteBool(AccelerateOnTensionRaise);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -294,6 +332,12 @@ namespace Tango.PMR.Hardware {
       if (ArmLength != 0) {
         size += 1 + pb::CodedOutputStream.ComputeInt32Size(ArmLength);
       }
+      if (AssemblyDirectionRight != false) {
+        size += 1 + 1;
+      }
+      if (AccelerateOnTensionRaise != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -329,6 +373,12 @@ namespace Tango.PMR.Hardware {
       if (other.ArmLength != 0) {
         ArmLength = other.ArmLength;
       }
+      if (other.AssemblyDirectionRight != false) {
+        AssemblyDirectionRight = other.AssemblyDirectionRight;
+      }
+      if (other.AccelerateOnTensionRaise != false) {
+        AccelerateOnTensionRaise = other.AccelerateOnTensionRaise;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -375,6 +425,14 @@ namespace Tango.PMR.Hardware {
             ArmLength = input.ReadInt32();
             break;
           }
+          case 80: {
+            AssemblyDirectionRight = input.ReadBool();
+            break;
+          }
+          case 88: {
+            AccelerateOnTensionRaise = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/Resources.Designer.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/Resources.Designer.cs
index 7e1f6dd26..8add3a102 100644
--- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/Resources.Designer.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/Resources.Designer.cs
@@ -79,5 +79,25 @@ namespace Tango.BuildExtensions.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap play_arrow_big {
+            get {
+                object obj = ResourceManager.GetObject("play_arrow_big", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap play_blue {
+            get {
+                object obj = ResourceManager.GetObject("play_blue", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/Resources.resx b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/Resources.resx
index b51e9537e..9682b1fdd 100644
--- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/Resources.resx
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Properties/Resources.resx
@@ -124,4 +124,10 @@
   <data name="machine-trans-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\machine-trans-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="play_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\play-blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="play_arrow_big" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\play-arrow-big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/RemoteDebugCommand.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/RemoteDebugCommand.cs
index 2acc25187..4bc972fbb 100644
--- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/RemoteDebugCommand.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/RemoteDebugCommand.cs
@@ -20,6 +20,7 @@ using Tango.Core.IO;
 using Tango.PMR.IO;
 using Google.Protobuf;
 using EnvDTE;
+using System.Collections.Generic;
 
 namespace Tango.BuildExtensions
 {
@@ -32,6 +33,9 @@ namespace Tango.BuildExtensions
         private ITransporter transporter;
         private bool _attached;
         private string processId;
+        private OleMenuCommand _menuCommand;
+        private IList<Project> _projects;
+
 
         /// <summary>
         /// Command ID.
@@ -64,14 +68,44 @@ namespace Tango.BuildExtensions
 
             _dteDebuggerEvents.OnEnterDesignMode += _dteDebuggerEvents_OnEnterDesignMode;
 
+            DTE.Events.SolutionEvents.Opened += () =>
+            {
+                _projects = GetSolutionProjects().ToList();
+            };
+
             this.package = package;
 
             OleMenuCommandService commandService = this.ServiceProvider.GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
             if (commandService != null)
             {
                 var menuCommandID = new CommandID(CommandSet, CommandId);
-                var menuItem = new MenuCommand(this.MenuItemCallback, menuCommandID);
-                commandService.AddCommand(menuItem);
+                _menuCommand = new OleMenuCommand(this.MenuItemCallback, menuCommandID);
+                _menuCommand.Visible = false;
+                _menuCommand.BeforeQueryStatus += _menuCommand_BeforeQueryStatus;
+                commandService.AddCommand(_menuCommand);
+            }
+        }
+
+        private void _menuCommand_BeforeQueryStatus(object sender, EventArgs e)
+        {
+            (sender as OleMenuCommand).Visible = false;
+
+            if (DTE.Debugger.CurrentMode == dbgDebugMode.dbgDesignMode
+                && DTE.Solution != null
+                && DTE.Solution.IsOpen)
+            {
+                String projectName = DTE.Solution.Properties.Item("StartupProject").Value.ToStringSafe();
+
+                if (projectName != null)
+                {
+                    var project = _projects.SingleOrDefault(x => x.Name == projectName);
+                    String path = GetProjectOutputFilePath(project);
+
+                    if (Path.GetExtension(path.ToLower()) == ".exe")
+                    {
+                        (sender as OleMenuCommand).Visible = true;
+                    }
+                }
             }
         }
 
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/RemoteDebugForm.Designer.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/RemoteDebugForm.Designer.cs
index 9a3ee1bc9..2da268537 100644
--- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/RemoteDebugForm.Designer.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/RemoteDebugForm.Designer.cs
@@ -29,15 +29,14 @@
         private void InitializeComponent()
         {
             this.panel1 = new System.Windows.Forms.Panel();
+            this.progressBar1 = new System.Windows.Forms.ProgressBar();
+            this.label3 = new System.Windows.Forms.Label();
+            this.listServices = new System.Windows.Forms.ListBox();
             this.txtProjectName = new System.Windows.Forms.Label();
             this.btnCancel = new System.Windows.Forms.Button();
             this.btnOK = new System.Windows.Forms.Button();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
-            this.listServices = new System.Windows.Forms.ListBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.progressBar1 = new System.Windows.Forms.ProgressBar();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
@@ -52,7 +51,6 @@
             this.panel1.Controls.Add(this.btnCancel);
             this.panel1.Controls.Add(this.btnOK);
             this.panel1.Controls.Add(this.pictureBox1);
-            this.panel1.Controls.Add(this.label2);
             this.panel1.Controls.Add(this.label1);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
@@ -60,12 +58,50 @@
             this.panel1.Size = new System.Drawing.Size(561, 353);
             this.panel1.TabIndex = 2;
             // 
+            // progressBar1
+            // 
+            this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.progressBar1.Location = new System.Drawing.Point(101, 277);
+            this.progressBar1.Name = "progressBar1";
+            this.progressBar1.Size = new System.Drawing.Size(447, 5);
+            this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
+            this.progressBar1.TabIndex = 16;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Cursor = System.Windows.Forms.Cursors.Arrow;
+            this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label3.Location = new System.Drawing.Point(98, 112);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(172, 15);
+            this.label3.TabIndex = 15;
+            this.label3.Text = "Scanning for remote runners...";
+            // 
+            // listServices
+            // 
+            this.listServices.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.listServices.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
+            this.listServices.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.listServices.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.listServices.ForeColor = System.Drawing.Color.Gainsboro;
+            this.listServices.FormattingEnabled = true;
+            this.listServices.ItemHeight = 18;
+            this.listServices.Location = new System.Drawing.Point(101, 135);
+            this.listServices.Name = "listServices";
+            this.listServices.Size = new System.Drawing.Size(447, 144);
+            this.listServices.TabIndex = 14;
+            // 
             // txtProjectName
             // 
             this.txtProjectName.AutoSize = true;
             this.txtProjectName.Cursor = System.Windows.Forms.Cursors.Arrow;
             this.txtProjectName.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtProjectName.Location = new System.Drawing.Point(205, 45);
+            this.txtProjectName.ForeColor = System.Drawing.Color.DodgerBlue;
+            this.txtProjectName.Location = new System.Drawing.Point(98, 45);
             this.txtProjectName.Name = "txtProjectName";
             this.txtProjectName.Size = new System.Drawing.Size(87, 16);
             this.txtProjectName.TabIndex = 13;
@@ -96,17 +132,18 @@
             this.btnOK.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15)))));
             this.btnOK.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(60)))), ((int)(((byte)(60)))));
             this.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnOK.ForeColor = System.Drawing.Color.DodgerBlue;
             this.btnOK.Location = new System.Drawing.Point(434, 298);
             this.btnOK.Name = "btnOK";
             this.btnOK.Size = new System.Drawing.Size(114, 42);
             this.btnOK.TabIndex = 10;
-            this.btnOK.Text = "RUN";
+            this.btnOK.Text = "START";
             this.btnOK.UseVisualStyleBackColor = false;
             // 
             // pictureBox1
             // 
             this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Arrow;
-            this.pictureBox1.Image = global::Tango.BuildExtensions.Properties.Resources.machine_trans_small;
+            this.pictureBox1.Image = global::Tango.BuildExtensions.Properties.Resources.play_arrow_big;
             this.pictureBox1.Location = new System.Drawing.Point(20, 45);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(63, 68);
@@ -114,17 +151,6 @@
             this.pictureBox1.TabIndex = 4;
             this.pictureBox1.TabStop = false;
             // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Cursor = System.Windows.Forms.Cursors.Arrow;
-            this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label2.Location = new System.Drawing.Point(98, 45);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(103, 16);
-            this.label2.TabIndex = 1;
-            this.label2.Text = "Remote Debug:";
-            // 
             // label1
             // 
             this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
@@ -136,46 +162,9 @@
             this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
             this.label1.Size = new System.Drawing.Size(559, 29);
             this.label1.TabIndex = 0;
-            this.label1.Text = "Run On Remote Machine";
+            this.label1.Text = "Remote Debug";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // listServices
-            // 
-            this.listServices.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.listServices.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
-            this.listServices.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.listServices.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.listServices.ForeColor = System.Drawing.Color.Gainsboro;
-            this.listServices.FormattingEnabled = true;
-            this.listServices.ItemHeight = 20;
-            this.listServices.Location = new System.Drawing.Point(101, 135);
-            this.listServices.Name = "listServices";
-            this.listServices.Size = new System.Drawing.Size(447, 140);
-            this.listServices.TabIndex = 14;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Cursor = System.Windows.Forms.Cursors.Arrow;
-            this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label3.Location = new System.Drawing.Point(98, 112);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(172, 15);
-            this.label3.TabIndex = 15;
-            this.label3.Text = "Scanning for remote runners...";
-            // 
-            // progressBar1
-            // 
-            this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.progressBar1.Location = new System.Drawing.Point(101, 277);
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(447, 5);
-            this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
-            this.progressBar1.TabIndex = 16;
-            // 
             // RemoteDebugForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -205,7 +194,6 @@
 
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label2;
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.Button btnOK;
         private System.Windows.Forms.Button btnCancel;
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/play-arrow-big.png b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/play-arrow-big.png
new file mode 100644
index 000000000..45ab67ae2
--- /dev/null
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/play-arrow-big.png
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/play-blue.png b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/play-blue.png
new file mode 100644
index 000000000..59e6940de
--- /dev/null
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Resources/play-blue.png
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj
index b18d5c3d2..7148e4761 100644
--- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj
@@ -121,6 +121,8 @@
     </VSCTCompile>
     <None Include="Resources\machine-trans-small.png" />
     <None Include="Resources\machine-trans-16x16.png" />
+    <None Include="Resources\play-blue.png" />
+    <None Include="Resources\play-arrow-big.png" />
     <Content Include="Resources\RemoteDebugCommand.png" />
     <Content Include="Resources\TangoBuildCommand.png" />
     <Content Include="Resources\TangoBuildCommandPackage.ico" />
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.cs
index 9a99b527c..305dfc4e2 100644
--- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.cs
@@ -40,6 +40,7 @@ namespace Tango.BuildExtensions
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [Guid(TangoBuildCommandPackage.PackageGuidString)]
     [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "pkgdef, VS and vsixmanifest are valid VS terms")]
+    [ProvideAutoLoad(UIContextGuids.SolutionExists)]
     public sealed class TangoBuildCommandPackage : Package
     {
         /// <summary>
@@ -67,8 +68,10 @@ namespace Tango.BuildExtensions
         protected override void Initialize()
         {
             TangoBuildCommand.Initialize(this);
+            RemoteDebugCommand.Initialize(this);
             base.Initialize();
-            Tango.BuildExtensions.RemoteDebugCommand.Initialize(this);
+
+            
         }
 
         #endregion
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.vsct b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.vsct
index b454037e0..4919852d8 100644
--- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.vsct
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.vsct
@@ -20,9 +20,13 @@
   <!--This header contains the command ids for the menus provided by the shell. -->
   <Extern href="vsshlids.h" />
 
+  <Extern href="VSDbgCmd.h" />
+  <Extern href="VsDebugGuids.h" />
+
   <!--The Commands section is where commands, menus, and menu groups are defined.
       This section uses a Guid to identify the package that provides the command defined inside it. -->
   <Commands package="guidTangoBuildCommandPackage">
+    
     <!-- Inside this section we have different sub-sections: one for the menus, another
     for the menu groups, one for the buttons (the actual commands), one for the combos
     and the last one for the bitmaps used. Each element is identified by a command id that
@@ -39,6 +43,10 @@
       <Group guid="guidTangoBuildCommandPackageCmdSet" id="MyMenuGroup" priority="0x0600">
         <Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_TOOLS" />
       </Group>
+
+      <Group guid="guidTangoBuildCommandPackageCmdSet" id="DebugGroup" priority="0x0600">
+        <Parent guid="guidVSDebugGroup" id="IDM_DEBUG_MENU"/>
+      </Group>
     </Groups>
 
     <!--Buttons section. -->
@@ -59,11 +67,14 @@
           <ButtonText>Tango Build Engine</ButtonText>
         </Strings>
       </Button>
+      
       <Button guid="guidTangoBuildCommandPackageCmdSet" id="cmdidRemoteDebugCommand" priority="0x0100" type="Button">
-        <Parent guid="guidTangoBuildCommandPackageCmdSet" id="MyMenuGroup" />
-        <Icon guid="guidImages1" id="bmpPic1" />
+        <Parent guid="guidTangoBuildCommandPackageCmdSet" id="DebugGroup" />
+        <Icon guid="play_image_guid" id="play" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
         <Strings>
-          <ButtonText>Run On Remote Machine</ButtonText>
+          <ButtonText>Remote Debug</ButtonText>
         </Strings>
       </Button>
     </Buttons>
@@ -77,10 +88,23 @@
             must be the actual index (1-based) of the bitmap inside the bitmap strip. -->
       <Bitmap guid="guidImages" href="Resources\TangoBuildCommand.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows, bmpPicStrikethrough" />
       <Bitmap guid="guidMyImages" href="Resources\machine-trans-16x16.png" usedList="machine" />
+      <Bitmap guid="play_image_guid" href="Resources\play-blue.png" usedList="play" />
       <Bitmap guid="guidImages1" href="Resources\RemoteDebugCommand.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows, bmpPicStrikethrough" />
     </Bitmaps>
   </Commands>
 
+  <CommandPlacements>
+
+    <CommandPlacement guid="guidTangoBuildCommandPackageCmdSet" id="DebugGroup" priority="0x600">
+      <Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_DEBUG"/>
+    </CommandPlacement>
+
+    <CommandPlacement guid="guidTangoBuildCommandPackageCmdSet" id="cmdidRemoteDebugCommand" priority="0x600">
+      <Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_DEBUG"/>
+    </CommandPlacement>
+    
+  </CommandPlacements>
+
   <Symbols>
     <!-- This is the package guid. -->
     <GuidSymbol name="guidTangoBuildCommandPackage" value="{f911efc8-1a59-4b5f-953d-d715ddd70710}" />
@@ -89,13 +113,18 @@
     <GuidSymbol name="guidTangoBuildCommandPackageCmdSet" value="{c03a7b01-8109-4ec5-8f90-858bed027e5d}">
       <IDSymbol name="MyMenuGroup" value="0x1020" />
       <IDSymbol name="TangoBuildCommandId" value="0x0100" />
-      <IDSymbol value="4129" name="cmdidRemoteDebugCommand" />
+      <IDSymbol name="DebugGroup" value="0x2020" />
+      <IDSymbol name="cmdidRemoteDebugCommand" value="4129" />
     </GuidSymbol>
 
     <GuidSymbol name="guidMyImages" value="{d52f5c81-cc63-4c7c-8513-231caf50db11}">
       <IDSymbol name="machine" value="1" />
     </GuidSymbol>
 
+    <GuidSymbol name="play_image_guid" value="{d52f5c81-cc63-4c7c-8513-231caf50d101}">
+      <IDSymbol name="play" value="1" />
+    </GuidSymbol>
+
     <GuidSymbol name="guidImages" value="{735a16c4-95ad-41f9-9342-ac321265d383}">
       <IDSymbol name="bmpPic1" value="1" />
       <IDSymbol name="bmpPic2" value="2" />
@@ -114,4 +143,6 @@
       <IDSymbol name="bmpPicStrikethrough" value="6" />
     </GuidSymbol>
   </Symbols>
+
+
 </CommandTable>
diff --git a/Software/Visual_Studio/Versioning/GlobalVersionInfo.cs b/Software/Visual_Studio/Versioning/GlobalVersionInfo.cs
index a1208cae9..e067918d5 100644
--- a/Software/Visual_Studio/Versioning/GlobalVersionInfo.cs
+++ b/Software/Visual_Studio/Versioning/GlobalVersionInfo.cs
@@ -9,5 +9,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("Copyright © Twine LTD 2017")]
 [assembly: AssemblyTrademark("Twine LTD")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]