Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

192 files changed, 1148 insertions, 452 deletions

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 4bec8dee3..8da2e82bb 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 0e1a890a7..5bacff962 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/Uart.c b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/Uart.c
index 54346a4e6..73d5564cc 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/Uart.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/Uart.c
@@ -90,7 +90,8 @@ void Init_U0(void)
         System_abort("Can't create UART Hwi");
     }
 
-    ROM_UARTIntEnable(UART0_BASE, /*UART_INT_TX |*/ UART_INT_RX );
+    ROM_UARTIntEnable(UART0_BASE, /*UART_INT_TX |*/ 0x7F2);//UART_INT_RX );
+	//???? trying to clear all uart problems ???
 
     ROM_UARTEnable(UART0_BASE);
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 4c25aa508..42c31bf9a 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -523,7 +523,7 @@ void EightMilliSecondHeatersInterrupt(UArg arg0)
 
     ROM_TimerIntClear(Heater_timerBase, TIMER_TIMA_TIMEOUT);  // Clear the timer interrupt
 
-    ROM_IntMasterDisable();
+    //ROM_IntMasterDisable();
     HeatersControlMessageStruc Message;
     //bool retcode = false;
 
@@ -544,7 +544,7 @@ void EightMilliSecondHeatersInterrupt(UArg arg0)
     //
     // Enable all interrupts.
     //
-    ROM_IntMasterEnable();
+    //ROM_IntMasterEnable();
     return ;
 }
 
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
index a3ffe0c66..dfd74b7fc 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
@@ -366,7 +366,7 @@ static uint32_t DistanceToSpoolState(void *JobDetails)
 //********************************************************************************************************************
 uint32_t EndState(void *JobDetails, char *Message)
 {
-    ROM_IntMasterDisable();
+    //ROM_IntMasterDisable();
     SendJobProgress(0.0,0,true,Message);
     DiagnosticsStop();
     if (Configured[Module_Winder])
@@ -402,7 +402,7 @@ uint32_t EndState(void *JobDetails, char *Message)
         //EndWaiting[Module_Thread] = ModuleWaiting;
         ThreadEndState(CurrentJob);
     }
-    ROM_IntMasterEnable();
+    //ROM_IntMasterEnable();
     JobMessageStruc JobMessage;
     bool retcode = false;
 
diff --git a/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj b/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj
index 41d11f2fe..e952e009a 100644
--- a/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj
+++ b/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj
@@ -182,4 +182,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs
index 83b86417d..240417f19 100644
--- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs
@@ -8,13 +8,6 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango.EmbroideryUI")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tango.EmbroideryUI")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
@@ -51,5 +44,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.3.1341")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj b/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj
index d384abfe7..8d90477a6 100644
--- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj
+++ b/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Tango.EmbroideryUI.csproj
@@ -56,6 +56,9 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="EmbroideryFileConverter.cs" />
     <Compile Include="EmbroideryFileEditor.xaml.cs">
       <DependentUpon>EmbroideryFileEditor.xaml</DependentUpon>
@@ -118,4 +121,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj b/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj
index 14b902ba6..3dc534eca 100644
--- a/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj
+++ b/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj
@@ -161,4 +161,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj b/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj
index 8076b030d..b0e5c9085 100644
--- a/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj
+++ b/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj
@@ -297,4 +297,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Installers/VS Extensions/BuildVersionIncrement.vsix b/Software/Visual_Studio/Installers/VS Extensions/BuildVersionIncrement.vsix
new file mode 100644
index 000000000..13fd60ba0
--- /dev/null
+++ b/Software/Visual_Studio/Installers/VS Extensions/BuildVersionIncrement.vsix
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs
index e62c20367..66855f3d2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Color Lab Module")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj
index ed7b3b4f2..640017669 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj
@@ -69,8 +69,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\CalibrationDataPointVM.cs" />
@@ -177,4 +177,9 @@
     <Resource Include="Images\arrow-long-right.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
index 73a5c7c86..990bdc4d4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio DB Module")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
index 1535c6dce..8cf8c592d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
@@ -75,8 +75,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Converters\ByteArrayToFileSizeConverter.cs" />
     <Compile Include="Converters\EntityFieldNameToFriendlyStringConverter.cs" />
@@ -808,4 +808,9 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs
index 0fd6e93b2..32b18163d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Data Capturing Module")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj
index 99645a659..24241bd14 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj
@@ -63,8 +63,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Recording\DataRecording.cs" />
     <Compile Include="ViewModelLocator.cs" />
@@ -182,4 +182,9 @@
     <Folder Include="Messages\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
index 09a564296..68e82d986 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Developer Module")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index 46396c791..0bac2b355 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -90,8 +90,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Converters\BrushStopLabToColorConverter.cs" />
     <Compile Include="Converters\BrushStopCMYKToColorConverter.cs" />
@@ -357,4 +357,9 @@
     <Resource Include="Images\arrow-long-right.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModelLocator.cs
index 70ae8a90a..ebf2f2446 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModelLocator.cs
@@ -16,7 +16,6 @@ namespace Tango.MachineStudio.Developer
         /// </summary>
         static ViewModelLocator()
         {
-            TangoIOC.Default.Register<IMainView>(MainView.Instance);
             TangoIOC.Default.Register<MainViewVM>();
             TangoIOC.Default.Register<DeveloperNavigationManager, DeveloperNavigationManager>();
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
index 321f57d7d..5e7ed037e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Hardware Designer Module")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj
index 2e2920af2..270915bd2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj
@@ -66,8 +66,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
@@ -167,4 +167,9 @@
     <Resource Include="Images\speed.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
index c13446ecd..7fdb1934c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Logging Module")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj
index 2ce0446aa..24045f723 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj
@@ -66,8 +66,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ControlledObservableCollection.cs" />
     <Compile Include="Controls\TimelineScrollViewer.cs" />
@@ -252,4 +252,9 @@
     <Resource Include="Images\events.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
index 2470d1d64..6de4d55f1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Machine Designer Module")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj
index 03509da5d..6af746c31 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj
@@ -65,8 +65,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="AutoComplete\MachinesProvider.cs" />
     <Compile Include="AutoComplete\MachineVersionsProvider.cs" />
@@ -222,4 +222,9 @@
     <Resource Include="Images\formula.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs
index 45c89075b..d6b116c3c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Stubs Module")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj
index 99ba89122..73a8b9413 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj
@@ -68,8 +68,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="StubsModuleSettings.cs" />
     <Compile Include="ViewModelLocator.cs" />
@@ -164,4 +164,9 @@
     <Resource Include="Images\stubs.jpg" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs
index d0a85a97c..45fbbad27 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Synchronization Module")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj
index 41009b79f..392958290 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj
@@ -90,8 +90,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="AutoComplete\MachinesProvider.cs" />
     <Compile Include="Navigation\NavigationView.cs" />
@@ -241,4 +241,9 @@
     <Resource Include="Images\machine-trans.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
index 73b9c68fc..8a5dfaecb 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Technician Module")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
index d358edae8..1943780b4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
@@ -84,8 +84,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Converters\MonitorsToMultiChannleMonitorsConverter.cs" />
     <Compile Include="Converters\MonitorsToSingleChannleMonitorsConverter.cs" />
@@ -560,4 +560,9 @@
     <Resource Include="Images\rgb-big.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
index aeb6b6c4d..fafffd539 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Users & Roles Module")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj
index cc9a60f30..000e44919 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj
@@ -69,8 +69,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Navigation\UsersAndRolesNavigationManager.cs" />
     <Compile Include="Navigation\UsersAndRolesNavigationView.cs" />
@@ -208,4 +208,9 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs
index 29c908ba4..0c2aa3cb7 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs
@@ -5,12 +5,12 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
 
-namespace Tango.MachineStudio.Common.Authentication
+namespace Tango.MachineStudio.Common.Authentication 
 {
     /// <summary>
     /// Represents the Machine Studio user authentication provider responsible for the current logged-in user.
     /// </summary>
-    public interface IAuthenticationProvider
+    public interface IAuthenticationProvider 
     {
         /// <summary>
         /// Occurs when the current logged-in user has changed.
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
index f03b250be..50c27507f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Common Components")]
+[assembly: AssemblyVersion("2.0.9.1321")]
 [assembly: ComVisible(false)]
 
 [assembly:ThemeInfo(
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index 145d91461..26517c82b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -72,8 +72,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="AutoComplete\MachinesProvider.cs" />
     <Compile Include="Automation\Developer.cs" />
@@ -292,4 +292,9 @@
     <Folder Include="MarkupExtensions\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs
index 8d5288e3c..e1e39d3aa 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs
@@ -4,4 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio Publish Utility")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj
index 4d8ea2579..cb492a6c4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj
@@ -85,8 +85,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Compile Include="..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
@@ -163,4 +163,9 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
index 53171a1a3..bdd341592 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -33,7 +33,7 @@ namespace Tango.MachineStudio.UI
         private WpfGlobalExceptionTrapper exceptionTrapper;
         private LogManager LogManager = LogManager.Default;
 
-        protected override void OnStartup(StartupEventArgs e)
+        protected override void OnStartup(StartupEventArgs e) 
         {
 
 #if DEBUG
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 5cdfd162a..20e399b44 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,4 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
+[assembly: AssemblyVersion("2.0.8.18204")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.Designer.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.Designer.cs
index 5ff36aae1..c035ee88d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.Designer.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.Designer.cs
@@ -59,14 +59,5 @@ namespace Tango.MachineStudio.UI.Properties {
                 resourceCulture = value;
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to .
-        /// </summary>
-        internal static string BuildDate {
-            get {
-                return ResourceManager.GetString("BuildDate", resourceCulture);
-            }
-        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.resx b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.resx
index 32307e87f..1af7de150 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.resx
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.resx
@@ -117,8 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="BuildDate" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\BuildDate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
deleted file mode 100644
index d7f0f1ad3..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
+++ /dev/null
@@ -1 +0,0 @@
-19-Jul-18 14:12:44.53 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index fdad31251..4290a9b71 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -56,6 +56,8 @@ namespace Tango.MachineStudio.UI.StudioApplication
                     {
                         TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>().ToList().ForEach(x => x.OnApplicationStarted());
                     };
+
+                    LogManager.LogReferencedAssemblies();
                 });
             });
         }
@@ -135,7 +137,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
         {
             get
             {
-                return typeof(DefaultStudioApplicationManager).Assembly.GetName().Version.ToString();
+                return AssemblyHelper.GetCurrentAssemblyVersion().ToString(3);
             }
         }
 
@@ -264,7 +266,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
         {
             get
             {
-                return typeof(ExtendedObject).Assembly.GetName().Version.ToString();
+                return typeof(ExtendedObject).Assembly.GetName().Version.ToString(3); 
             }
         }
 
@@ -275,7 +277,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
         {
             get
             {
-                return Properties.Resources.BuildDate;
+                return AssemblyHelper.GetCurrentAssemblyBuildDate().ToShortDateString();
             }
         }
 
@@ -286,7 +288,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
         {
             get
             {
-                return EmbeddedResourceHelper.GetEmbeddedResourceText("Tango.MachineStudio.UI.ChangeLogs.MachineStudioChangeLog.txt") + Environment.NewLine + Environment.NewLine + Environment.NewLine + EmbeddedResourceHelper.GetEmbeddedResourceText("Tango.MachineStudio.UI.ChangeLogs.CoreChangeLog.txt");
+                return EmbeddedResourceHelper.GetEmbeddedResourceText("Tango.MachineStudio.UI.ChangeLog.txt");
             }
         }
     }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 4d581795b..630a02ee0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -133,8 +133,8 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <EmbeddedResource Include="Console\CodeTemplate.cs" />
-    <Compile Include="..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Console\ConsoleManager.cs" />
     <Compile Include="Console\ConsoleOnExecuteParameters.cs" />
@@ -488,14 +488,10 @@
     <Resource Include="Images\settings.png" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\..\Versioning\CoreChangeLog.txt">
-      <Link>ChangeLogs\CoreChangeLog.txt</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\..\Versioning\MachineStudioChangeLog.txt">
-      <Link>ChangeLogs\MachineStudioChangeLog.txt</Link>
+    <EmbeddedResource Include="..\..\Versioning\ChangeLog.txt">
+      <Link>ChangeLog.txt</Link>
     </EmbeddedResource>
     <Content Include="Html\HTML Templates\Thread Break.html" />
-    <Resource Include="Resources\BuildDate.txt" />
     <Resource Include="machine.ico" />
     <Resource Include="Images\bug-resolved.png" />
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -505,12 +501,13 @@
     <EmbeddedResource Include="TFS\SystemInformationTemplate.cshtml" />
     <Resource Include="Images\bug.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>if $(ConfigurationName) == Debug $(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Machine Studio.lnk"
 
-echo %25date%25 %25time%25 &gt; "$(ProjectDir)\Resources\BuildDate.txt"
-
 RD /S /Q "$(TargetDir)cs\"
 RD /S /Q "$(TargetDir)da\"
 RD /S /Q "$(TargetDir)de\"
@@ -563,4 +560,9 @@ RD /S /Q "$(TargetDir)nb-NO\"</PostBuildEvent>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Properties/AssemblyInfo.cs
index 6b9387721..553de895f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Properties/AssemblyInfo.cs
@@ -6,13 +6,6 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango.MachineStudio.UpdateService")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tango.MachineStudio.UpdateService")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,5 +25,4 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.*")]
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
index 8dc2d264e..8e9d60541 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
@@ -71,6 +71,9 @@
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="MachineStudioUpdateService.svc.cs">
       <DependentUpon>MachineStudioUpdateService.svc</DependentUpon>
     </Compile>
@@ -134,6 +137,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs
index 7a79d1042..98e607dad 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Updater Utility")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 [assembly: ComVisible(false)]
 
 [assembly:ThemeInfo(
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj
index 039bcc399..287103c2e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj
@@ -61,8 +61,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Compile Include="..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
@@ -107,4 +107,9 @@
     <Resource Include="Images\update.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj
index 506745a12..4c1bfb188 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj
@@ -208,4 +208,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Native/Tango.Emulations.Native/Tango.Emulations.Native.vcxproj b/Software/Visual_Studio/Native/Tango.Emulations.Native/Tango.Emulations.Native.vcxproj
index aff8c87b9..0c3da294e 100644
--- a/Software/Visual_Studio/Native/Tango.Emulations.Native/Tango.Emulations.Native.vcxproj
+++ b/Software/Visual_Studio/Native/Tango.Emulations.Native/Tango.Emulations.Native.vcxproj
@@ -200,4 +200,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj b/Software/Visual_Studio/Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj
index c79c4de99..980e926cc 100644
--- a/Software/Visual_Studio/Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj
+++ b/Software/Visual_Studio/Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj
@@ -156,4 +156,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj b/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj
index 9beca48ec..d16f5212b 100644
--- a/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj
+++ b/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj
@@ -47,4 +47,9 @@
     <Content Include="PanelPC\Touch.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs
index 1e290e73e..ff46f9c9f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs
@@ -8,6 +8,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Panel PC Jobs Module")]
+[assembly: AssemblyVersion("2.0.3.1536")]
 
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
index 2cb924aa4..3a7ac381d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
@@ -130,8 +130,8 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\PPC.cs">
-      <Link>PPC.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="AppBarItems\JobProgressAppBarItem.cs" />
     <Compile Include="AppBarItems\JobProgressAppBarItemView.xaml.cs">
@@ -335,4 +335,9 @@
     <Folder Include="Images\NotificationItems\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index 7cc76bdcc..f3e7711f9 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -42,6 +42,16 @@ namespace Tango.PPC.Jobs.ViewModels
 
         #region Properties
 
+        private BL.Enumerations.JobStatuses _jobStatus;
+        /// <summary>
+        /// Gets or sets the temporary job status.
+        /// </summary>
+        public BL.Enumerations.JobStatuses JobStatus
+        {
+            get { return _jobStatus; }
+            set { _jobStatus = value; RaisePropertyChangedAuto(); }
+        }
+
         private Job _job;
         /// <summary>
         /// Gets or sets the selected job.
@@ -190,6 +200,20 @@ namespace Tango.PPC.Jobs.ViewModels
         /// </summary>
         public RelayCommand DyeCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the approve sample command.
+        /// </summary>
+        public RelayCommand ApproveSampleCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the repeat sample dye command.
+        /// </summary>
+        public RelayCommand RepeatSampleDyeCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets another sample command.
+        /// </summary>
+        public RelayCommand AnotherSampleCommand { get; set; }
         #endregion
 
         #region Constructors
@@ -220,7 +244,7 @@ namespace Tango.PPC.Jobs.ViewModels
             RemoveSegmentCommand = new RelayCommand<Segment>(RemoveSegment);
             RemoveBrushStopCommand = new RelayCommand<BrushStop>(RemoveBrushStop);
             RemoveJobCommand = new RelayCommand(RemoveJob);
-            SaveJobCommand = new RelayCommand(SaveJob);
+            SaveJobCommand = new RelayCommand(() => SaveJob());
             ReplaceBrushStopCommand = new RelayCommand<BrushStop>(InvokeColorAdjustmentForBrushStop);
             TwineCatalogFieldTapCommand = new RelayCommand<BrushStop>(InvokeTwineCatalogForBrushStop);
             IncreaseDecreaseSamplesToDyeCommand = new RelayCommand<string>((x) =>
@@ -240,6 +264,10 @@ namespace Tango.PPC.Jobs.ViewModels
 
             StartSampleDyeCommand = new RelayCommand(StartSampleDye);
             DyeCommand = new RelayCommand(StartJob, CanStartJob);
+
+            ApproveSampleCommand = new RelayCommand(ApproveSampleDye);
+            RepeatSampleDyeCommand = new RelayCommand(RepeatSampleDye);
+            AnotherSampleCommand = new RelayCommand(DyeAnotherSample);
         }
 
         #endregion
@@ -249,13 +277,22 @@ namespace Tango.PPC.Jobs.ViewModels
         /// <summary>
         /// Saves the job.
         /// </summary>
-        private async void SaveJob()
+        private async void SaveJob(bool displayNotification = true)
         {
+            if (JobStatus != BL.Enumerations.JobStatuses.Draft)
+            {
+                Job.JobStatus = JobStatus;
+            }
+
             if (Job.Validate(_db))
             {
                 await _db.SaveChangesAsync();
                 RaiseMessage(new JobSavedMessage() { Job = Job });
-                await NotificationProvider.ShowInfo(String.Format("Job '{0}' saved successfully.", Job.Name));
+
+                if (displayNotification)
+                {
+                    await NotificationProvider.ShowInfo(String.Format("Job '{0}' saved successfully.", Job.Name));
+                }
             }
         }
 
@@ -468,11 +505,48 @@ namespace Tango.PPC.Jobs.ViewModels
                 }
             }
 
-            MachineProvider.MachineOperator.Print(sampleDyeJob);
+            SaveJob(false);
+
+            var thisJob = Job;
+
+            MachineProvider.MachineOperator.Print(sampleDyeJob).Completed += (x, e) =>
+            {
+                thisJob.JobStatus = BL.Enumerations.JobStatuses.PendingApproval;
+
+                if (Job != null && Job.Guid == thisJob.Guid)
+                {
+                    JobStatus = BL.Enumerations.JobStatuses.PendingApproval;
+                }
+            };
 
             NavigationManager.NavigateTo<JobsModule>(nameof(JobProgressView));
         }
 
+        /// <summary>
+        /// Sets the job status back to not approved.
+        /// </summary>
+        private void RepeatSampleDye()
+        {
+            JobStatus = BL.Enumerations.JobStatuses.Draft;
+        }
+
+        /// <summary>
+        /// Approves the sample dye.
+        /// </summary>
+        private void ApproveSampleDye()
+        {
+            JobStatus = BL.Enumerations.JobStatuses.Approved;
+            SaveJob(false);
+        }
+
+        /// <summary>
+        /// Dyes another sample.
+        /// </summary>
+        private void DyeAnotherSample()
+        {
+            JobStatus = BL.Enumerations.JobStatuses.Draft;
+        }
+
         #endregion
 
         #region Out Of Gamut Check Thread
@@ -521,51 +595,46 @@ namespace Tango.PPC.Jobs.ViewModels
         /// </summary>
         public async override void OnNavigatedTo()
         {
-            if (_job_to_load == null || (_job_to_load != null && Job != null && _job_to_load.Guid == Job.Guid))
+            if (!(_job_to_load == null || (_job_to_load != null && Job != null && _job_to_load.Guid == Job.Guid)))
             {
-                if (_job_to_load_intent == JobNavigationIntent.SampleDye)
+                NotificationProvider.SetGlobalBusyMessage("Loading job details...");
+
+                _can_navigate_back = false;
+                base.OnNavigatedTo();
+
+                if (_db != null)
                 {
-                    View.DisplaySampleDye();
+                    _db.Dispose();
                 }
-                return;
-            }
 
-            NotificationProvider.SetGlobalBusyMessage("Loading job details...");
+                _db = ObservablesContext.CreateDefault();
+                var a = _db.Jobs.ToList();
+                Job = await _db.Jobs.SingleOrDefaultAsync(x => x.Guid == _job_to_load.Guid);
+                Job.ValidateOnPropertyChanged = true;
+                Rmls = await _db.Rmls.ToListAsync();
+                ColorSpaces = await _db.ColorSpaces.ToListAsync();
+                SpoolTypes = await _db.SpoolTypes.ToListAsync();
+                Customers = await _db.Customers.Where(x => x.OrganizationGuid == MachineProvider.Machine.OrganizationGuid).ToListAsync();
 
-            _can_navigate_back = false;
-            base.OnNavigatedTo();
+                if (!_check_gamut_thread.IsAlive)
+                {
+                    _check_gamut_thread.Start();
+                }
 
-            if (_db != null)
-            {
-                _db.Dispose();
-            }
+                SegmentsCollectionView = CollectionViewSource.GetDefaultView(Job.Segments);
+                SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending));
 
-            _db = ObservablesContext.CreateDefault();
-            var a = _db.Jobs.ToList();
-            Job = await _db.Jobs.SingleOrDefaultAsync(x => x.Guid == _job_to_load.Guid);
-            Job.ValidateOnPropertyChanged = true;
-            Rmls = await _db.Rmls.ToListAsync();
-            ColorSpaces = await _db.ColorSpaces.ToListAsync();
-            SpoolTypes = await _db.SpoolTypes.ToListAsync();
-            Customers = await _db.Customers.Where(x => x.OrganizationGuid == MachineProvider.Machine.OrganizationGuid).ToListAsync();
+                InvokeUIOnIdle(() =>
+                {
+                    NotificationProvider.ReleaseGlobalBusyMessage();
+                });
 
-            if (!_check_gamut_thread.IsAlive)
-            {
-                _check_gamut_thread.Start();
+                _job_to_load = null;
             }
 
-            SegmentsCollectionView = CollectionViewSource.GetDefaultView(Job.Segments);
-            SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending));
-
-            InvokeUIOnIdle(() =>
-            {
-                NotificationProvider.ReleaseGlobalBusyMessage();
-            });
-
-            _job_to_load = null;
-
             if (_job_to_load_intent == JobNavigationIntent.SampleDye)
             {
+                JobStatus = Job.JobStatus;
                 View.DisplaySampleDye();
             }
         }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
index 32f4cc7be..eb5497bd8 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
@@ -21,17 +21,17 @@
             <TextBlock FontSize="{StaticResource TangoHeaderFontSize}" HorizontalAlignment="Center" Text="{Binding Job.Name,FallbackValue='Job Name'}"></TextBlock>
 
             <Grid Margin="0 80 0 0">
+
                 <touch:TouchRingProgress Width="364" Height="364" RingThickness="10">
                     <touch:TouchRingProgress.Style>
                         <Style TargetType="touch:TouchRingProgress">
+                            <Setter Property="Visibility" Value="Visible"></Setter>
                             <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
-                            <Setter Property="Maximum" Value="{Binding RunningJobStatus.TotalProgressWithoutFinalization}"></Setter>
-                            <Setter Property="Value" Value="{Binding RunningJobStatus.ProgressWithoutFinalization}"></Setter>
+                            <Setter Property="Maximum" Value="{Binding RunningJobStatus.TotalProgressMinusSettingUp}"></Setter>
+                            <Setter Property="Value" Value="{Binding RunningJobStatus.ProgressMinusSettingUp}"></Setter>
                             <Style.Triggers>
-                                <DataTrigger Binding="{Binding RunningJobStatus.IsFinalizing}" Value="True">
-                                    <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
-                                    <Setter Property="Maximum" Value="{Binding RunningJobStatus.FinalizingTotalProgress}"></Setter>
-                                    <Setter Property="Value" Value="{Binding RunningJobStatus.FinalizingProgress}"></Setter>
+                                <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="False">
+                                    <Setter Property="Visibility" Value="Visible"></Setter>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
                                     <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
@@ -47,16 +47,30 @@
                     </touch:TouchRingProgress.Style>
                 </touch:TouchRingProgress>
 
+                <touch:TouchBusyIndicator Width="360" Height="360" StrokeThickness="10" IsIndeterminate="{Binding RunningJobStatus.IsSettingUp}" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
+
+                </touch:TouchBusyIndicator>
+
                 <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                        <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
-                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Completed</TextBlock>
-                    </StackPanel>
 
-                    <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
-                                            <Run Text="{Binding RunningJobStatus.ProgressWithoutFinalization,StringFormat=0,FallbackValue=0}"></Run><Run Text="/" /><Run Text="{Binding RunningJobStatus.TotalProgressWithoutFinalization,StringFormat=0,FallbackValue=0}"/>
+                    <StackPanel Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                            <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
+                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Completed</TextBlock>
+                        </StackPanel>
+
+                        <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                            <Run Text="{Binding RunningJobStatus.ProgressMinusSettingUp,StringFormat=0,FallbackValue=0}"></Run><Run Text="/" /><Run Text="{Binding RunningJobStatus.TotalProgressMinusSettingUp,StringFormat=0,FallbackValue=0}"/>
                                             <Run FontSize="16">m</Run>
-                    </TextBlock>
+                        </TextBlock>
+                    </StackPanel>
+
+                    <StackPanel Height="90" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                            <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
+                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Getting ready...</TextBlock>
+                        </StackPanel>
+                    </StackPanel>
 
                     <Rectangle Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoDividerBrush}" />
 
@@ -76,13 +90,24 @@
                 <StackPanel>
                     <Canvas Height="80" Margin="5 0">
                         <StackPanel>
-                            <Canvas.Left>
-                                <MultiBinding Converter="{StaticResource JobProgressToPositionConverter}">
-                                    <Binding Path="RunningJobStatus.CurrentUnitProgress" />
-                                    <Binding Path="RunningJobStatus.CurrentUnitTotalProgress" />
-                                    <Binding RelativeSource="{RelativeSource AncestorType=Canvas}" Path="ActualWidth" />
-                                </MultiBinding>
-                            </Canvas.Left>
+                            <StackPanel.Style>
+                                <Style TargetType="StackPanel">
+                                    <Setter Property="Canvas.Left">
+                                        <Setter.Value>
+                                            <MultiBinding Converter="{StaticResource JobProgressToPositionConverter}">
+                                                <Binding Path="RunningJobStatus.CurrentUnitProgress" />
+                                                <Binding Path="RunningJobStatus.CurrentUnitTotalProgress" />
+                                                <Binding RelativeSource="{RelativeSource AncestorType=Canvas}" Path="ActualWidth" />
+                                            </MultiBinding>
+                                        </Setter.Value>
+                                    </Setter>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="True">
+                                            <Setter Property="Canvas.Left" Value="0"></Setter>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </StackPanel.Style>
                             <StackPanel Margin="-50 0 0 0">
                                 <ContentControl>
                                     <ContentControl.Style>
@@ -95,8 +120,8 @@
                                                                 <Style TargetType="TextBlock">
                                                                     <Setter Property="Text" Value="now dying"></Setter>
                                                                     <Style.Triggers>
-                                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsFinalizing}" Value="True">
-                                                                            <Setter Property="Text" Value="finalizing"></Setter>
+                                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="True">
+                                                                            <Setter Property="Text" Value="getting ready"></Setter>
                                                                         </DataTrigger>
                                                                     </Style.Triggers>
                                                                 </Style>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
index 330a916f4..3d2f7daa8 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
@@ -36,7 +36,7 @@
                                 <TextBlock Margin="20 0 0 0" VerticalAlignment="Center">EDIT</TextBlock>
                             </StackPanel>
                         </touch:TouchButton>
-                        <touch:TouchButton IsEnabled="{Binding MachineProvider.MachineOperator.CanPrint}" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Margin="20 0 0 0" Height="80" Padding="0" Width="270" CornerRadius="40" BlurRadius="20" HorizontalAlignment="Right" Command="{Binding DyeCommand}">
+                        <touch:TouchButton IsEnabled="{Binding MachineProvider.MachineOperator.CanPrint}" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Margin="20 0 0 0" Height="80" Padding="0" Width="270" CornerRadius="40" BlurRadius="20" HorizontalAlignment="Right" DelayCommand="{Binding DyeCommand}" DelayCommandDuration="00:00:0.3">
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock VerticalAlignment="Center">DYE</TextBlock>
                                     <touch:TouchIcon Margin="20 0 0 0" Icon="ChevronRight" Width="14" />
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index d5f77fc5d..bfd571db0 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -574,55 +574,129 @@
 
                                 <StackPanel Margin="60 20 0 0">
 
-                                    <ContentControl Content="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext}">
+                                    <ContentControl>
                                         <ContentControl.Style>
                                             <Style TargetType="ContentControl">
-                                                <Setter Property="ContentTemplate">
+                                                <Setter Property="Content">
                                                     <Setter.Value>
-                                                        <DataTemplate>
-                                                            <StackPanel>
-                                                                <TextBlock>
+                                                        <StackPanel>
+                                                            <ContentControl Content="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext}">
+                                                                <ContentControl.Style>
+                                                                    <Style TargetType="ContentControl">
+                                                                        <Setter Property="ContentTemplate">
+                                                                            <Setter.Value>
+                                                                                <DataTemplate>
+                                                                                    <StackPanel>
+                                                                                        <TextBlock>
                                                                     <Run>Dye 1 or more units in order to get approval.</Run>
                                                                     <LineBreak/>
                                                                     <Run>Once approved, you can dye the entire job.</Run>
-                                                                </TextBlock>
+                                                                                        </TextBlock>
 
-                                                                <DockPanel Margin="0 50 0 0" LastChildFill="True" Width="450" HorizontalAlignment="Left">
-                                                                    <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center">How many sample units?</TextBlock>
+                                                                                        <DockPanel Margin="0 50 0 0" LastChildFill="True" Width="450" HorizontalAlignment="Left">
+                                                                                            <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center">How many sample units?</TextBlock>
 
-                                                                    <DockPanel Margin="50 0 0 0">
-                                                                        <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="-" DockPanel.Dock="Left" Icon="Minus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
-                                                                        <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="+" DockPanel.Dock="Right" Icon="Plus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
-                                                                        <touch:TouchNumericTextBox Value="{Binding Job.SampleUnitsOrMeters}" Minimum="1" Maximum="100" HorizontalContentAlignment="Center" VerticalAlignment="Center" Margin="10 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoTitleFontSize}" DockPanel.Dock="Right" KeyboardContainer="{Binding ElementName=Container}" />
-                                                                    </DockPanel>
-                                                                </DockPanel>
-                                                            </StackPanel>
-                                                        </DataTemplate>
+                                                                                            <DockPanel Margin="50 0 0 0">
+                                                                                                <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="-" DockPanel.Dock="Left" Icon="Minus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
+                                                                                                <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="+" DockPanel.Dock="Right" Icon="Plus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
+                                                                                                <touch:TouchNumericTextBox Value="{Binding Job.SampleUnitsOrMeters}" Minimum="1" Maximum="100" HorizontalContentAlignment="Center" VerticalAlignment="Center" Margin="10 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoTitleFontSize}" DockPanel.Dock="Right" KeyboardContainer="{Binding ElementName=Container}" />
+                                                                                            </DockPanel>
+                                                                                        </DockPanel>
+                                                                                    </StackPanel>
+                                                                                </DataTemplate>
+                                                                            </Setter.Value>
+                                                                        </Setter>
+                                                                        <Style.Triggers>
+                                                                            <DataTrigger Binding="{Binding Job.JobType}" Value="{x:Static enumerations:JobTypes.Sewing}">
+                                                                                <Setter Property="ContentTemplate">
+                                                                                    <Setter.Value>
+                                                                                        <DataTemplate>
+                                                                                            <StackPanel>
+                                                                                                <TextBlock>
+                                                                    <Run>Dye several meters per segment in order to get approval.</Run>
+                                                                    <LineBreak/>
+                                                                    <Run>Once approved, you can dye the entire job.</Run>
+                                                                                                </TextBlock>
+
+                                                                                                <DockPanel Margin="0 50 0 0" LastChildFill="True" Width="450" HorizontalAlignment="Left">
+                                                                                                    <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center">Meters per segment</TextBlock>
+
+                                                                                                    <DockPanel Margin="50 0 0 0">
+                                                                                                        <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="-" DockPanel.Dock="Left" Icon="Minus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
+                                                                                                        <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="+" DockPanel.Dock="Right" Icon="Plus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
+                                                                                                        <touch:TouchNumericTextBox Value="{Binding Job.SampleUnitsOrMeters}" Minimum="1" Maximum="100" HorizontalContentAlignment="Center" VerticalAlignment="Center" Margin="10 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoTitleFontSize}" DockPanel.Dock="Right" KeyboardContainer="{Binding ElementName=Container}" />
+                                                                                                    </DockPanel>
+                                                                                                </DockPanel>
+                                                                                            </StackPanel>
+                                                                                        </DataTemplate>
+                                                                                    </Setter.Value>
+                                                                                </Setter>
+                                                                            </DataTrigger>
+                                                                        </Style.Triggers>
+                                                                    </Style>
+                                                                </ContentControl.Style>
+                                                            </ContentControl>
+
+                                                            <touch:TouchButton Margin="0 50 0 15" DockPanel.Dock="Right" Height="54" Padding="0" Width="184" CornerRadius="30" BlurRadius="20" HorizontalAlignment="Right" Command="{Binding StartSampleDyeCommand}">
+                                                                START
+                                                            </touch:TouchButton>
+                                                        </StackPanel>
                                                     </Setter.Value>
                                                 </Setter>
+
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding Job.JobType}" Value="{x:Static enumerations:JobTypes.Sewing}">
-                                                        <Setter Property="ContentTemplate">
+                                                    <DataTrigger Binding="{Binding JobStatus}" Value="{x:Static enumerations:JobStatuses.PendingApproval}">
+                                                        <Setter Property="Content">
                                                             <Setter.Value>
-                                                                <DataTemplate>
-                                                                    <StackPanel>
-                                                                        <TextBlock>
-                                                                    <Run>Dye several meters per segment in order to get approval.</Run>
-                                                                    <LineBreak/>
-                                                                    <Run>Once approved, you can dye the entire job.</Run>
-                                                                        </TextBlock>
+                                                                <StackPanel>
+                                                                    <TextBlock>How to continue?</TextBlock>
 
-                                                                        <DockPanel Margin="0 50 0 0" LastChildFill="True" Width="450" HorizontalAlignment="Left">
-                                                                            <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center">Meters per segment</TextBlock>
+                                                                    <UniformGrid Columns="2" Width="420" HorizontalAlignment="Left" Margin="0 40 0 20">
+                                                                        <StackPanel HorizontalAlignment="Left">
+                                                                            <touch:TouchButton Style="{StaticResource TangoHollowButton}" Width="180" Height="50" Command="{Binding ApproveSampleCommand}">
+                                                                                <StackPanel Orientation="Horizontal">
+                                                                                    <touch:TouchIcon Icon="Check"></touch:TouchIcon>
+                                                                                    <TextBlock Margin="10 0 0 0">DONE</TextBlock>
+                                                                                </StackPanel>
+                                                                            </touch:TouchButton>
 
-                                                                            <DockPanel Margin="50 0 0 0">
-                                                                                <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="-" DockPanel.Dock="Left" Icon="Minus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
-                                                                                <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="+" DockPanel.Dock="Right" Icon="Plus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
-                                                                                <touch:TouchNumericTextBox Value="{Binding Job.SampleUnitsOrMeters}" Minimum="1" Maximum="100" HorizontalContentAlignment="Center" VerticalAlignment="Center" Margin="10 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoTitleFontSize}" DockPanel.Dock="Right" KeyboardContainer="{Binding ElementName=Container}" />
-                                                                            </DockPanel>
-                                                                        </DockPanel>
-                                                                    </StackPanel>
-                                                                </DataTemplate>
+                                                                            <TextBlock Margin="0 15 0 0" TextAlignment="Center">The sample is approved</TextBlock>
+                                                                        </StackPanel>
+
+                                                                        <StackPanel HorizontalAlignment="Right">
+                                                                            <touch:TouchButton Style="{StaticResource TangoHollowButton}" Width="180" Height="50" Command="{Binding RepeatSampleDyeCommand}">
+                                                                                <StackPanel Orientation="Horizontal">
+                                                                                    <touch:TouchIcon Icon="Repeat"></touch:TouchIcon>
+                                                                                    <TextBlock Margin="10 0 0 0">REPEAT</TextBlock>
+                                                                                </StackPanel>
+                                                                            </touch:TouchButton>
+
+                                                                            <TextBlock Margin="0 15 0 0" TextAlignment="Center">Dye more samples</TextBlock>
+                                                                        </StackPanel>
+                                                                    </UniformGrid>
+
+                                                                </StackPanel>
+                                                            </Setter.Value>
+                                                        </Setter>
+                                                    </DataTrigger>
+
+                                                    <DataTrigger Binding="{Binding JobStatus}" Value="{x:Static enumerations:JobStatuses.Approved}">
+                                                        <Setter Property="Content">
+                                                            <Setter.Value>
+                                                                <StackPanel Margin="0 40 80 40">
+                                                                    <DockPanel LastChildFill="False">
+                                                                        <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center">
+                                                                            <Run>Sample Approved:</Run>
+                                                                            <Run Text="{Binding Job.LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}"></Run>
+                                                                        </TextBlock>
+                                                                        <touch:TouchButton DockPanel.Dock="Right" HorizontalAlignment="Right" Style="{StaticResource TangoHollowButton}" Width="220" Height="50" Command="{Binding AnotherSampleCommand}">
+                                                                            <StackPanel Orientation="Horizontal">
+                                                                                <touch:TouchIcon Icon="Plus"></touch:TouchIcon>
+                                                                                <TextBlock Margin="10 0 0 0">ANOTHER SAMPLE</TextBlock>
+                                                                            </StackPanel>
+                                                                        </touch:TouchButton>
+                                                                    </DockPanel>
+                                                                </StackPanel>
                                                             </Setter.Value>
                                                         </Setter>
                                                     </DataTrigger>
@@ -630,10 +704,6 @@
                                             </Style>
                                         </ContentControl.Style>
                                     </ContentControl>
-
-                                    <touch:TouchButton Margin="0 50 0 15" DockPanel.Dock="Right" Height="54" Padding="0" Width="184" CornerRadius="30" BlurRadius="20" HorizontalAlignment="Right" Command="{Binding StartSampleDyeCommand}">
-                                        START
-                                    </touch:TouchButton>
                                 </StackPanel>
                             </touch:TouchExpander>
                         </StackPanel>
@@ -654,7 +724,7 @@
                 <Border Padding="20 20">
                     <Grid>
                         <DockPanel>
-                            <touch:TouchButton IsEnabled="{Binding MachineProvider.MachineOperator.CanPrint}" DockPanel.Dock="Right" Height="54" Padding="0" Width="184" CornerRadius="30" BlurRadius="20" HorizontalAlignment="Right" Command="{Binding DyeCommand}">
+                            <touch:TouchButton IsEnabled="{Binding MachineProvider.MachineOperator.CanPrint}" DockPanel.Dock="Right" Height="54" Padding="0" Width="184" CornerRadius="30" BlurRadius="20" HorizontalAlignment="Right" DelayCommand="{Binding DyeCommand}" DelayCommandDuration="00:00:0.3">
                                 DYE
                             </touch:TouchButton>
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs
index a9ea5b8b0..7252dea6d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs
@@ -8,6 +8,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Module")]
+[assembly: AssemblyVersion("2.0.*")]
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj
index 0d4e79212..257ddf58d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj
@@ -74,8 +74,8 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Versioning\PPC.cs">
-      <Link>PPC.cs</Link>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="MyModule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -153,4 +153,9 @@
     <Resource Include="Images\ppc-module.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
index 07022e7fb..d811a71db 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -78,6 +78,7 @@ namespace Tango.PPC.Common.Connection
 
                 await MachineOperator.Disconnect();
                 MachineOperator.Adapter = response.Adapter;
+                MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
                 await MachineOperator.Connect();
             }
             catch { }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs
index 47bb0427f..254e25c85 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs
@@ -8,6 +8,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Panel PC Common Library")]
+[assembly: AssemblyVersion("2.0.3.1536")]
 
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
index 32aef8ae8..141e41872 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
@@ -91,8 +91,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\Versioning\PPC.cs">
-      <Link>PPC.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Connection\DefaultMachineProvider.cs" />
     <Compile Include="Connection\IMachineProvider.cs" />
@@ -252,4 +252,9 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 79627389a..a55e18b30 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,3 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Panel PC Application")]
+[assembly: AssemblyVersion("2.0.*")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index cc5eed54f..850896f0d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -108,8 +108,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="..\..\Versioning\PPC.cs">
-      <Link>PPC.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Authentication\DefaultAuthenticationProvider.cs" />
     <Compile Include="Controls\HeaderLoadingControl.xaml.cs">
@@ -390,4 +390,9 @@ copy /Y "$(SolutionDir)Referenced Assemblies\ucrtbased.dll" "$(TargetDir)"
 copy /Y "$(SolutionDir)Referenced Assemblies\vcruntime140.dll" "$(TargetDir)"
 copy /Y "$(SolutionDir)Referenced Assemblies\vcruntime140d.dll" "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index 7f1c1a115..9900a5b27 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -99,8 +99,8 @@
             <DockPanel>
                 <Border BorderThickness="0 0 0 1" BorderBrush="{StaticResource TangoDividerBrush}" DockPanel.Dock="Top">
                     <DockPanel>
-                        <Border Padding="20" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDividerBrush}">
-                            <touch:TouchHamburgerButton Width="50" Command="{Binding MenuOrBackCommand}" EnableDropShadow="False" Height="50" Foreground="{StaticResource TangoPrimaryAccentBrush}" IsBack="{Binding NavigationManager.CanNavigateBack}">
+                        <Border BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDividerBrush}">
+                            <touch:TouchHamburgerButton Width="100" Height="100" Padding="15" Command="{Binding MenuOrBackCommand}" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" IsBack="{Binding NavigationManager.CanNavigateBack}">
                                 <touch:TouchHamburgerButton.Effect>
                                     <DropShadowEffect ShadowDepth="15" BlurRadius="20" Color="Silver" />
                                 </touch:TouchHamburgerButton.Effect>
diff --git a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
index a9fcdcbcf..92145adcc 100644
--- a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
+++ b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
@@ -98,7 +98,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\GlobalAssemblyInfo.cs" />
     <Compile Include="AvalonEditCommands.cs" />
     <Compile Include="CodeCompletion\CompletionListBox.cs" />
     <Compile Include="CodeCompletion\CompletionWindowBase.cs" />
@@ -467,4 +466,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Highlighting\Resources\MarkDown-Mode.xshd" />
   </ItemGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs
index 51b302afc..2eb4047d6 100644
--- a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs
@@ -16,6 +16,15 @@ using System.Windows.Markup;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+[assembly: System.Runtime.InteropServices.ComVisible(false)]
+[assembly: AssemblyCompany("ic#code")]
+[assembly: AssemblyProduct("SharpDevelop")]
+[assembly: AssemblyCopyright("2000-2013 AlphaSierraPapa for the SharpDevelop Team")]
+[assembly: AssemblyVersion("1.0.11.1536")]
+[assembly: NeutralResourcesLanguage("en-US")]
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2243:AttributeStringLiteralsShouldParseCorrectly",
+    Justification = "AssemblyInformationalVersion does not need to be a parsable version")]
 [assembly: AssemblyTitle("ICSharpCode.AvalonEdit")]
 [assembly: AssemblyDescription("WPF-based extensible text editor")]
 [assembly: AssemblyConfiguration("")]
@@ -40,3 +49,4 @@ using System.Windows.Markup;
 [assembly: XmlnsDefinition("http://icsharpcode.net/sharpdevelop/avalonedit", "ICSharpCode.AvalonEdit.Rendering")]
 [assembly: XmlnsDefinition("http://icsharpcode.net/sharpdevelop/avalonedit", "ICSharpCode.AvalonEdit.Highlighting")]
 [assembly: XmlnsDefinition("http://icsharpcode.net/sharpdevelop/avalonedit", "ICSharpCode.AvalonEdit.Search")]
+
diff --git a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/GlobalAssemblyInfo.cs b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/GlobalAssemblyInfo.cs
deleted file mode 100644
index 81469c75b..000000000
--- a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/GlobalAssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////
-//                                                                                         //
-// DO NOT EDIT GlobalAssemblyInfo.cs, it is recreated using AssemblyInfo.template whenever //
-// ICSharpCode.Core is compiled.                                                           //
-//                                                                                         //
-/////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-using System.Resources;
-using System.Reflection;
-
-[assembly: System.Runtime.InteropServices.ComVisible(false)]
-[assembly: AssemblyCompany("ic#code")]
-[assembly: AssemblyProduct("SharpDevelop")]
-[assembly: AssemblyCopyright("2000-2013 AlphaSierraPapa for the SharpDevelop Team")]
-[assembly: AssemblyVersion(RevisionClass.Major + "." + RevisionClass.Minor + "." + RevisionClass.Build + "." + RevisionClass.Revision)]
-[assembly: AssemblyInformationalVersion(RevisionClass.FullVersion + "-8e799bf3")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2243:AttributeStringLiteralsShouldParseCorrectly",
-	Justification = "AssemblyInformationalVersion does not need to be a parsable version")]
-
-internal static class RevisionClass
-{
-	public const string Major = "4";
-	public const string Minor = "3";
-	public const string Build = "1";
-	public const string Revision = "9429";
-	public const string VersionName = null;	// "" is not valid for no version name, you have to use null if you don't want a version name (eg "Beta 1")
-	
-	public const string FullVersion = Major + "." + Minor + "." + Build + ".9429";
-}
diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj
index 7b7b61785..4fe17cdc8 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj
@@ -661,6 +661,11 @@
     </Page>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
index 12d19d44b..4c86442a0 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
@@ -446,4 +446,9 @@
   </Target>
   -->
   <Import Project="..\.paket\paket.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs
index 4fdc74b0f..e4578b5db 100644
--- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.7.1321")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphEx.csproj b/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphEx.csproj
index cc8eda5a4..bf5a16dca 100644
--- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphEx.csproj
+++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphEx.csproj
@@ -216,6 +216,11 @@
   </Target>
   <Import Project="..\..\packages\Fody.2.0.0\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" />
   <Import Project="..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs
index ef723816b..ec7ac1e3e 100644
--- a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows.Markup;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.8")]
+[assembly: AssemblyVersion("1.0.7.1321")]
 [assembly: AssemblyFileVersion("1.0.0.8")]
diff --git a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Tango.AutoComplete.csproj b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Tango.AutoComplete.csproj
index 130da019d..44aba5b8e 100644
--- a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Tango.AutoComplete.csproj
+++ b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Tango.AutoComplete.csproj
@@ -90,6 +90,11 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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.AnimatedGif/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs
index 2c8b459c4..e548e7917 100644
--- a/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs
@@ -6,5 +6,6 @@ using System.Windows.Markup;
 
 [assembly: AssemblyTitle("Tango - GIF Animation Library")]
 [assembly: ComVisible(false)]
+[assembly: AssemblyVersion("2.0.4.1536")]
 
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.AnimatedGif/Tango.AnimatedGif.csproj b/Software/Visual_Studio/Tango.AnimatedGif/Tango.AnimatedGif.csproj
index 18d991271..5be1f5281 100644
--- a/Software/Visual_Studio/Tango.AnimatedGif/Tango.AnimatedGif.csproj
+++ b/Software/Visual_Studio/Tango.AnimatedGif/Tango.AnimatedGif.csproj
@@ -45,8 +45,8 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="AnimationCache.cs" />
     <Compile Include="Decoding\GifApplicationExtension.cs" />
@@ -80,6 +80,11 @@
     </Page>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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.BL/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
index 20c23e4ec..808e44799 100644
--- a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Business logic components")]
-[assembly: ComVisible(false)]
\ No newline at end of file
+[assembly: ComVisible(false)]
+[assembly: AssemblyVersion("2.0.13.1721")]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index 19acce5ce..42e1effb0 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -78,8 +78,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Attributes\JobStatusAttribute.cs" />
     <Compile Include="Catalogs\Catalog.cs" />
@@ -308,4 +308,9 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs
index 8bb5e186c..42ad5696d 100644
--- a/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs
@@ -16,7 +16,7 @@ using System.Windows;
 using System.Windows.Markup;
 
 [assembly: AssemblyTitle("Tango - Brush Picker Control")]
-
+[assembly: AssemblyVersion("2.0.5.1321")]
 [assembly: ThemeInfo(ResourceDictionaryLocation.SourceAssembly, ResourceDictionaryLocation.SourceAssembly)]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
diff --git a/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj b/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj
index 422b5f1ff..b2111ca95 100644
--- a/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj
+++ b/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj
@@ -57,8 +57,8 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Converters\BrushToGradientStopsConverter.cs" />
     <Compile Include="Implementation\AlphaSelector.cs" />
@@ -88,6 +88,11 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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.CircularGauge/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs
index eaecfc80d..7f1d9fb5f 100644
--- a/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Circular Gauge Control")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 [assembly: ComVisible(false)]
 
 
diff --git a/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj b/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj
index da8a33bf4..03cfd7d20 100644
--- a/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj
+++ b/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj
@@ -78,8 +78,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="CircularGaugeControl.cs">
       <SubType>Code</SubType>
@@ -118,6 +118,11 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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.CodeGeneration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs
index 251d04060..8fa5894a3 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Code Generation Components")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
index d292d2357..3ff0d7669 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
@@ -57,8 +57,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Class.cs" />
     <Compile Include="CodeFile.cs" />
@@ -116,6 +116,11 @@
     <EmbeddedResource Include="Templates\EntityCodeFileJavaExtension.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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.ColorPicker/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs
index ac8cb5adb..808d2eca6 100644
--- a/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Color Picker Control")]
+[assembly: AssemblyVersion("2.0.7.1321")]
 [assembly: ComVisible(false)]
 
 
diff --git a/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj b/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj
index 400511023..7d6350587 100644
--- a/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj
+++ b/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj
@@ -105,8 +105,8 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Chromes\Implementation\ButtonChrome.cs" />
     <Compile Include="ColorBlendConverter.cs" />
@@ -149,6 +149,11 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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.Core/ExtensionMethods/AssemblyExtensions.cs b/Software/Visual_Studio/Tango.Core/ExtensionMethods/AssemblyExtensions.cs
new file mode 100644
index 000000000..f75e76d3a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Core/ExtensionMethods/AssemblyExtensions.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+public static class AssemblyExtensions
+{
+    /// <summary>
+    /// Gets the assembly build date according to the visual studio extension (auto version increment).
+    /// The scheme of the assembly version should be {Major}.{Minor}.{BuildNumber}.{YYDDD}
+    /// The revision number contains the number of years since 2000 and day in year.
+    /// </summary>
+    /// <param name="asm">The assembly.</param>
+    /// <returns></returns>
+    public static DateTime GetBuildDate(this Assembly asm)
+    {
+        var version = asm.GetName().Version;
+
+        String revision = version.Revision.ToString();
+
+        if (revision.Length == 5)
+        {
+            int years = int.Parse(new String(revision.Take(2).ToArray()));
+            int day = int.Parse(new String(revision.Skip(2).ToArray()));
+
+            return new DateTime(2000, 1, 1).AddYears(years).AddDays(day - 1);
+        }
+        else
+        {
+            return new DateTime(2000, 1, 1)
+                        .AddDays(version.Revision);
+        }
+    }
+}
+
diff --git a/Software/Visual_Studio/Tango.Core/Helpers/AssemblyHelper.cs b/Software/Visual_Studio/Tango.Core/Helpers/AssemblyHelper.cs
index d241a60f8..11ef751e2 100644
--- a/Software/Visual_Studio/Tango.Core/Helpers/AssemblyHelper.cs
+++ b/Software/Visual_Studio/Tango.Core/Helpers/AssemblyHelper.cs
@@ -19,10 +19,38 @@ namespace Tango.Core.Helpers
         /// <returns></returns>
         public static String GetCurrentAssemblyFolder()
         {
-            string codeBase = Assembly.GetExecutingAssembly().CodeBase;
+            string codeBase = Assembly.GetCallingAssembly().CodeBase;
             UriBuilder uri = new UriBuilder(codeBase);
             string path = Uri.UnescapeDataString(uri.Path);
             return Path.GetDirectoryName(path);
         }
+
+        /// <summary>
+        /// Gets the current assembly build date.
+        /// </summary>
+        /// <returns></returns>
+        public static DateTime GetCurrentAssemblyBuildDate()
+        {
+            return Assembly.GetCallingAssembly().GetBuildDate();
+        }
+
+        /// <summary>
+        /// Gets the current assembly version.
+        /// </summary>
+        /// <returns></returns>
+        public static Version GetCurrentAssemblyVersion()
+        {
+            return Assembly.GetCallingAssembly().GetName().Version;
+        }
+
+        /// <summary>
+        /// Gets the assembly version.
+        /// </summary>
+        /// <param name="assembly">The assembly.</param>
+        /// <returns></returns>
+        private static Version GetAssemblyVersion(Assembly assembly)
+        {
+            return assembly.GetName().Version;
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
index 577126b91..db89db099 100644
--- a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Core Components")]
+[assembly: AssemblyVersion("2.0.14.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
index d5e03d03c..8f9c8a73f 100644
--- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
+++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj
@@ -58,8 +58,8 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Commands\RelayCommand.cs" />
     <Compile Include="Components\DataBaseDescriptionsHelper.cs" />
@@ -80,6 +80,7 @@
     <Compile Include="DI\TangoMessenger.cs" />
     <Compile Include="EventArguments\MouseOrTouchEventArgs.cs" />
     <Compile Include="ExtendedObject.cs" />
+    <Compile Include="ExtensionMethods\AssemblyExtensions.cs" />
     <Compile Include="ExtensionMethods\BitmapExtensions.cs" />
     <Compile Include="ExtensionMethods\BitmapSourceExtensions.cs" />
     <Compile Include="ExtensionMethods\ColorExtensions.cs" />
@@ -146,4 +147,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs
index 5d006eb2a..cfcb9ceab 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Local Data Access Layer")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
index 9c4c3c225..7c38f01d7 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
@@ -63,8 +63,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="DB\ACTION_TYPES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
@@ -268,4 +268,9 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
index 14c18abcd..c959ddf1c 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Remote Data Access Layer")]
+[assembly: AssemblyVersion("2.0.13.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
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 cd2187e34..84b9332c5 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -63,8 +63,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="DB\ACTION_TYPES.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
@@ -345,4 +345,9 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Documents/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Documents/Properties/AssemblyInfo.cs
index 6d98f948c..9171a955d 100644
--- a/Software/Visual_Studio/Tango.Documents/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Documents/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Documents Library")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj b/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj
index f760a1489..b1353cfdb 100644
--- a/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj
+++ b/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj
@@ -56,8 +56,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ExcelReader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -85,4 +85,9 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs
index f8bab5ef1..8b7968bf4 100644
--- a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Drag & Drop Components")]
+[assembly: AssemblyVersion("2.0.11.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj b/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj
index 1cebe0037..385ccd970 100644
--- a/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj
+++ b/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj
@@ -64,8 +64,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="DragAndDropContainer.cs" />
     <Compile Include="DragAndDropService.cs" />
@@ -106,6 +106,11 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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.Editors/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs
index 31b3938dc..e0144a2c1 100644
--- a/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Visual Diagram Editing Components")]
+[assembly: AssemblyVersion("2.0.7.1321")]
 [assembly: ComVisible(false)]
 
 
diff --git a/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj b/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj
index a328e47b7..2080a0ac9 100644
--- a/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj
+++ b/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj
@@ -59,8 +59,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="BrushExtensions.cs" />
     <Compile Include="EnumExtensions.cs" />
@@ -166,4 +166,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs
index 0882138f5..f23444bc9 100644
--- a/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Emulation Components")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj b/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj
index 6dc62dbac..ee358a153 100644
--- a/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj
+++ b/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj
@@ -46,8 +46,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="EmulatorBase.cs" />
     <Compile Include="Emulators\MachineEmulator.cs" />
@@ -87,4 +87,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs
index ac776638e..0a2d10a13 100644
--- a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Hive UI Components")]
+[assembly: AssemblyVersion("2.0.8.1536")]
 
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj b/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj
index 88826e731..1b6957b12 100644
--- a/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj
+++ b/Software/Visual_Studio/Tango.Hive/Tango.Hive.csproj
@@ -54,8 +54,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Converters\HexClipConverter.cs" />
   </ItemGroup>
@@ -87,6 +87,11 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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.Integration/Operation/IMachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
index d17a70b98..e1f0fc803 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
@@ -30,6 +30,11 @@ namespace Tango.Integration.Operation
         Machine Machine { get; }
 
         /// <summary>
+        /// Gets or sets the job handling mode.
+        /// </summary>
+        JobHandlerModes JobHandlingMode { get; set; }
+
+        /// <summary>
         /// Gets the current machine status.
         /// </summary>
         MachineStatuses Status { get; }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
index 6ddc14e3d..e34789fef 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
@@ -21,6 +21,7 @@ namespace Tango.Integration.Operation
         private String _lastStatusMessage;
         private int _last_unit;
         private bool _finalizing;
+        private JobHandlerModes _mode;
 
         #region Events
 
@@ -114,8 +115,10 @@ namespace Tango.Integration.Operation
         /// Initializes a new instance of the <see cref="JobHandler"/> class.
         /// </summary>
         /// <param name="cancelAction">The cancel action.</param>
-        internal JobHandler(Action cancelAction, Job job, ProcessParametersTable processParameters) : this()
+        internal JobHandler(Action cancelAction, Job job, ProcessParametersTable processParameters, JobHandlerModes mode) : this()
         {
+            _mode = mode;
+
             ProcessParameters = processParameters;
             Job = job;
 
@@ -137,11 +140,22 @@ namespace Tango.Integration.Operation
             Status.TotalProgress = Job.LengthIncludingNumberOfUnits + processParameters.DryerBufferLength;
             Status.FinalizingTotalProgress = processParameters.DryerBufferLength;
             Status.TotalProgressWithoutFinalization = Job.LengthIncludingNumberOfUnits;
-            Status.CurrentUnitTotalProgress = Job.Length;
             Status.Progress = 0;
             Status.RemainingTime = Status.TotalTime;
             Status.RemainingProgress = Status.TotalProgress;
             Status.CurrentUnitSegments = _effectiveSegments.ToList();
+            Status.SettingUpTotalProgress = processParameters.DryerBufferLength;
+            Status.TotalProgressMinusSettingUp = Job.LengthIncludingNumberOfUnits;
+            Status.IsSettingUp = true;
+
+            if (mode == JobHandlerModes.Finalization)
+            {
+                Status.CurrentUnitTotalProgress = Job.Length;
+            }
+            else
+            {
+                Status.CurrentUnitTotalProgress = Status.SettingUpTotalProgress;
+            }
 
             if (Job.EnableInterSegment && Job.NumberOfUnits > 1)
             {
@@ -222,7 +236,21 @@ namespace Tango.Integration.Operation
             Status.RemainingTime = Status.TotalTime - Job.TranslateProgressToTime(Status.Progress, ProcessParameters);
             Status.RemainingProgress = Status.TotalProgress - Status.Progress;
 
-            if (s.Progress < Job.LengthIncludingNumberOfUnits)
+            if (Status.SettingUpProgress < Status.SettingUpTotalProgress)
+            {
+                Status.SettingUpProgress += delta;
+            }
+            else
+            {
+                if (Status.IsSettingUp)
+                {
+                    Status.IsSettingUp = false;
+                }
+
+                Status.ProgressMinusSettingUp += delta;
+            }
+
+            if (s.Progress < Job.LengthIncludingNumberOfUnits || _mode == JobHandlerModes.SettingUp)
             {
                 Status.ProgressWithoutFinalization += delta;
 
@@ -239,7 +267,18 @@ namespace Tango.Integration.Operation
                 }
 
                 Status.CurrentUnitTotalProgress = Status.RemainingUnits > 1 && Job.EnableInterSegment ? Job.Length + (Job.InterSegmentLength) : Job.Length;
-                Status.CurrentUnitProgress += delta;
+
+                if (_mode == JobHandlerModes.Finalization)
+                {
+                    Status.CurrentUnitProgress += delta;
+                }
+                else
+                {
+                    if (!Status.IsSettingUp)
+                    {
+                        Status.CurrentUnitProgress += delta;
+                    }
+                }
 
                 if (Status.CurrentUnitProgress >= Status.CurrentUnitTotalProgress)
                 {
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandlerModes.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandlerModes.cs
new file mode 100644
index 000000000..906bf5fcb
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandlerModes.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Integration.Operation
+{
+    public enum JobHandlerModes
+    {
+        Finalization,
+        SettingUp,
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index bdfa8a218..88c753846 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -144,6 +144,11 @@ namespace Tango.Integration.Operation
 
         #region Properties
 
+        /// <summary>
+        /// Gets or sets the job handling mode.
+        /// </summary>
+        public JobHandlerModes JobHandlingMode { get; set; }
+
         private MachineStatuses _status;
         /// <summary>
         /// Gets the current machine status.
@@ -778,7 +783,7 @@ namespace Tango.Integration.Operation
                 {
                     LogManager.Log(ex, "Failed to cancel job.");
                 }
-            }, originalJob, processParameters);
+            }, originalJob, processParameters, JobHandlingMode);
 
             handler.StatusChanged += (x, s) =>
             {
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs b/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs
index fa3b8bc07..8d4a79291 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs
@@ -83,6 +83,46 @@ namespace Tango.Integration.Operation
             set { _progressWithoutFinalization = value; RaisePropertyChangedAuto(); }
         }
 
+        private double _settingUpProgress;
+        /// <summary>
+        /// Gets or sets the setting up progress.
+        /// </summary>
+        public double SettingUpProgress
+        {
+            get { return _settingUpProgress; }
+            set { _settingUpProgress = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _settingUpTotalProgress;
+        /// <summary>
+        /// Gets or sets the setting up total progress.
+        /// </summary>
+        public double SettingUpTotalProgress
+        {
+            get { return _settingUpTotalProgress; }
+            set { _settingUpTotalProgress = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _progressMinusSettingUp;
+        /// <summary>
+        /// Gets or sets the progress minus setting up.
+        /// </summary>
+        public double ProgressMinusSettingUp
+        {
+            get { return _progressMinusSettingUp; }
+            set { _progressMinusSettingUp = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _totalProgressMinusSettingUp;
+        /// <summary>
+        /// Gets or sets the total progress minus setting up.
+        /// </summary>
+        public double TotalProgressMinusSettingUp
+        {
+            get { return _totalProgressMinusSettingUp; }
+            set { _totalProgressMinusSettingUp = value; RaisePropertyChangedAuto(); }
+        }
+
         private double _finalizingTotalProgress;
         /// <summary>
         /// Gets or sets the finalizing total progress.
@@ -183,6 +223,16 @@ namespace Tango.Integration.Operation
             set { _isFinalizing = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _isSettingUp;
+        /// <summary>
+        /// Gets or sets a value indicating whether the job progress is withing the range of zero to the dryer buffer length.
+        /// </summary>
+        public bool IsSettingUp
+        {
+            get { return _isSettingUp; }
+            set { _isSettingUp = value; RaisePropertyChangedAuto(); }
+        }
+
         private String _message;
         /// <summary>
         /// Gets or sets the message.
diff --git a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
index 161c5a04e..c4dbacc0a 100644
--- a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Logging Library")]
+[assembly: AssemblyVersion("2.0.11.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
index 7482db8c0..3ec3eaf40 100644
--- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
+++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
@@ -73,8 +73,8 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Diagnostics\DiagnosticsFileEvent.cs" />
     <Compile Include="Diagnostics\DiagnosticsFilePlayer.cs" />
@@ -87,6 +87,7 @@
     <Compile Include="Operation\EmbeddedLogItem.cs" />
     <Compile Include="Operation\IMachineEventsStateProvider.cs" />
     <Compile Include="Operation\IMachineOperator.cs" />
+    <Compile Include="Operation\JobHandlerModes.cs" />
     <Compile Include="Operation\PrintingFailedEventArgs.cs" />
     <Compile Include="Operation\MachineOperator.cs" />
     <Compile Include="Operation\JobHandler.cs" />
@@ -145,4 +146,9 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Logging/LogManager.cs b/Software/Visual_Studio/Tango.Logging/LogManager.cs
index 5badff595..c0a8409ef 100644
--- a/Software/Visual_Studio/Tango.Logging/LogManager.cs
+++ b/Software/Visual_Studio/Tango.Logging/LogManager.cs
@@ -210,6 +210,23 @@ namespace Tango.Logging
         }
 
         /// <summary>
+        /// Logs the current referenced assemblies in the app domain.
+        /// </summary>
+        public void LogReferencedAssemblies()
+        {
+            String log = "--------------------- Referenced Assemblies --------------------------" + Environment.NewLine + Environment.NewLine;
+
+            foreach (Assembly a in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                log += a.GetName().Name + ", v" + a.GetName().Version + Environment.NewLine;
+            }
+
+            log += Environment.NewLine + "--------------------- --------------------- --------------------------";
+
+            Log(log);
+        }
+
+        /// <summary>
         /// Add new message log item.
         /// </summary>
         /// <param name="message">Message.</param>
diff --git a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs
index 161c5a04e..46e2a7b3f 100644
--- a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Logging Library")]
+[assembly: AssemblyVersion("2.0.17.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj b/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj
index d406ec41a..63cd773e4 100644
--- a/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj
+++ b/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj
@@ -45,8 +45,8 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ApplicationCrashedEventArgs.cs" />
     <Compile Include="ConsoleLogger.cs" />
@@ -75,4 +75,9 @@
     </Page>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs
index 03126049b..e7bf2b52d 100644
--- a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Message Repository")]
+[assembly: AssemblyVersion("2.0.14.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index ebc72b437..07b4e9294 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -45,8 +45,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ColorLab\CalibrationData.cs" />
     <Compile Include="ColorLab\CalibrationPoint.cs" />
@@ -195,4 +195,9 @@
   <PropertyGroup>
     <PreBuildEvent>"$(TargetDir)..\Debug\proto-tc.exe" -i "$(SolutionDir)..\PMR\Messages" -o "$(SolutionDir)Tango.PMR" -l CSharp</PreBuildEvent>
   </PropertyGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs
index 2296973b8..0ad2e625d 100644
--- a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Components")]
+[assembly: AssemblyVersion("2.0.13.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj b/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj
index 0298bd48d..4df4e060c 100644
--- a/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj
+++ b/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj
@@ -41,8 +41,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="CompilerException.cs" />
     <Compile Include="CompilerFactory.cs" />
@@ -82,4 +82,9 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs
index ed04ceb0c..c675c1cc5 100644
--- a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Roslyn Scripting Components")]
+[assembly: AssemblyVersion("2.0.11.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj b/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj
index 2bb3e4b2a..26a9aa3af 100644
--- a/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj
+++ b/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj
@@ -137,8 +137,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="CompilerError.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -173,4 +173,9 @@
     <Error Condition="!Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
   </Target>
   <Import Project="..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs
index f3c038f0e..e6e5b2f46 100644
--- a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Serialization Components")]
+[assembly: AssemblyVersion("2.0.13.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj b/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj
index a6ff42efb..2b99472a0 100644
--- a/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj
+++ b/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj
@@ -46,8 +46,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="BinaryDataSerializer.cs" />
     <Compile Include="CryptographyHelper.cs" />
@@ -61,4 +61,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs
index d5b3aa0ae..dd1101268 100644
--- a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Global Settings")]
+[assembly: AssemblyVersion("2.0.13.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj b/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj
index 4dacf4660..25966e559 100644
--- a/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj
+++ b/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj
@@ -43,8 +43,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SettingsBase.cs" />
@@ -60,4 +60,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs
index 8b4db109b..6d98d4c35 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Shared UI Components")]
+[assembly: AssemblyVersion("2.0.11.1536")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
index e33eff026..cd3658bcd 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
+++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
@@ -54,8 +54,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Components\SelectedObject.cs" />
     <Compile Include="Components\SelectedObjectCollection.cs" />
@@ -221,4 +221,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs
index c91630b59..24ed4f910 100644
--- a/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Stubs Collection")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj
index 5333cbaca..373939019 100644
--- a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj
+++ b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj
@@ -76,9 +76,6 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
-    </Compile>
     <EmbeddedResource Include="Examples\BasicRequest.cs" />
     <EmbeddedResource Include="Examples\BasicRequestPolling.cs" />
     <EmbeddedResource Include="Examples\ContinuousResponse.cs" />
@@ -88,6 +85,9 @@
     <EmbeddedResource Include="Examples\RequestTimeout.cs" />
     <EmbeddedResource Include="Examples\Sleep.cs" />
     <EmbeddedResource Include="Examples\WriteToFile.cs" />
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="ConnectionMode.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -177,4 +177,9 @@
     </Page>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs
index 1221e84be..3147ded90 100644
--- a/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - DataBase Synchronization Components")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj
index 23f318b16..45cf5cff9 100644
--- a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj
+++ b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj
@@ -62,8 +62,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Conversion\ColumnSchema.cs" />
     <Compile Include="Conversion\DatabaseSchema.cs" />
@@ -124,4 +124,9 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs
index 0b9dc84f7..5e1ff4586 100644
--- a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - VSTS API Library")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj b/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj
index 4c061f760..2e91eff8e 100644
--- a/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj
+++ b/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj
@@ -196,8 +196,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Area.cs" />
     <Compile Include="Attachment.cs" />
@@ -261,4 +261,9 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Microsoft.TeamFoundationServer.ExtendedClient.15.112.1\build\Microsoft.TeamFoundationServer.ExtendedClient.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.TeamFoundationServer.ExtendedClient.15.112.1\build\Microsoft.TeamFoundationServer.ExtendedClient.targets'))" />
   </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchHamburgerButton.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchHamburgerButton.xaml
index de43234a3..b993776ca 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchHamburgerButton.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchHamburgerButton.xaml
@@ -9,9 +9,10 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
         <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="RippleBrush" Value="Transparent"></Setter>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="CornerRadius" Value="50"></Setter>
+        <Setter Property="CornerRadius" Value="0"></Setter>
         <Setter Property="Width" Value="37" />
         <Setter Property="Height" Value="37" />
         <Setter Property="Padding" Value="1"/>
@@ -139,7 +140,7 @@
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                         <components:Ripple CornerRadius="{TemplateBinding CornerRadius}">
-                            <Viewbox>
+                            <Viewbox Margin="{TemplateBinding Padding}">
                                 <Canvas x:Name="canvas" Width="24" Height="24" RenderTransformOrigin="0.5,0.5">
                                     <Canvas.RenderTransform>
                                         <TransformGroup>
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs
index 067c3f383..3cd3c1078 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs
@@ -137,10 +137,10 @@ namespace Tango.Touch.Controls
 
                     if (element != null)
                     {
-
                         element.RegisterForLoadedOrNow((x, y) =>
                         {
                             CurrentMinHeight = element.ActualHeight;
+                            ResizeNotification(element);
                         });
                     }
                 }
@@ -160,17 +160,25 @@ namespace Tango.Touch.Controls
         {
             _grid_mask.Opacity = _border_drag.ActualHeight / ActualHeight;
 
+            ResizeNotifications();
+        }
 
+        private void ResizeNotifications()
+        {
             for (int i = 0; i < _items_control.Items.Count; i++)
             {
                 FrameworkElement element = _items_control.ItemContainerGenerator.ContainerFromIndex(i) as FrameworkElement;
+                ResizeNotification(element);
+            }
+        }
 
-                var control = element.FindChild<UserControl>();
+        private void ResizeNotification(FrameworkElement element)
+        {
+            var control = element.FindChild<UserControl>();
 
-                if (control != null && !double.IsNaN(_border_drag.Height))
-                {
-                    control.Height = ((_border_drag.Height - CurrentMinHeight) / ActualHeight) * (control.MaxHeight - control.MinHeight) + control.MinHeight;
-                }
+            if (control != null && !double.IsNaN(_border_drag.Height))
+            {
+                control.Height = ((_border_drag.Height - CurrentMinHeight) / ActualHeight) * (control.MaxHeight - control.MinHeight) + control.MinHeight;
             }
         }
 
diff --git a/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs
index 8ffc1d7c8..00cdb87dd 100644
--- a/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Touch Components")]
+[assembly: AssemblyVersion("2.0.4.1536")]
 [assembly: ComVisible(false)]
 
 [assembly:ThemeInfo(
diff --git a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
index e078d0887..86b10d202 100644
--- a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
+++ b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
@@ -56,8 +56,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Controls\AutoCompleteProvider.cs" />
     <Compile Include="Controls\DoubleValueChangedEventArgs.cs" />
@@ -357,4 +357,9 @@
     <EmbeddedResource Include="Keyboard\keyboard-iphone.wav" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
index 9a309793f..c3c6b1b15 100644
--- a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Transport Components")]
+[assembly: AssemblyVersion("2.0.11.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj b/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj
index 77d8358a2..18245d5cf 100644
--- a/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj
+++ b/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj
@@ -63,8 +63,8 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Adapters\UsbSerialBaudRates.cs" />
     <Compile Include="Adapters\UsbTransportAdapter.cs" />
@@ -126,4 +126,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs
index 0551f8f77..98b8a65d3 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.UnitTesting/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Unit Testing")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
index 0060b9058..634b8a230 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
+++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
@@ -87,8 +87,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ColorCatalogs_TST.cs" />
     <Compile Include="DependencyInjection_TST.cs" />
@@ -194,4 +194,9 @@
   </Target>
   <Import Project="..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets')" />
   <Import Project="..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs
index 6beec3b80..1f99e5619 100644
--- a/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Video Components")]
+[assembly: AssemblyVersion("2.0.7.1321")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Video/Tango.Video.csproj b/Software/Visual_Studio/Tango.Video/Tango.Video.csproj
index bee112411..81e39d411 100644
--- a/Software/Visual_Studio/Tango.Video/Tango.Video.csproj
+++ b/Software/Visual_Studio/Tango.Video/Tango.Video.csproj
@@ -66,8 +66,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="CaptureDevice.cs" />
     <Compile Include="Device.cs" />
@@ -139,4 +139,9 @@
     <Error Condition="!Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
   </Target>
   <Import Project="..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs
index 074e070df..83d8af87f 100644
--- a/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Exotic Visual Elements")]
+[assembly: AssemblyVersion("2.0.5.1321")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj b/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj
index aafa0a47c..acd59b58e 100644
--- a/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj
+++ b/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj
@@ -49,8 +49,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="AnalogSwitch\AnalogSwitch.xaml.cs">
       <DependentUpon>AnalogSwitch.xaml</DependentUpon>
@@ -214,6 +214,11 @@
     <Resource Include="Images\on.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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.sln b/Software/Visual_Studio/Tango.sln
index 794b8be2d..9fed570ea 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -7,12 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Protobuf", "Tango.Pro
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Versioning", "Versioning", "{E53A5748-F312-4A70-AB93-53249749D359}"
 	ProjectSection(SolutionItems) = preProject
-		Versioning\Core.cs = Versioning\Core.cs
-		Versioning\CoreChangeLog.txt = Versioning\CoreChangeLog.txt
-		Versioning\MachineStudio.cs = Versioning\MachineStudio.cs
-		Versioning\MachineStudioChangeLog.txt = Versioning\MachineStudioChangeLog.txt
-		Versioning\PPC.cs = Versioning\PPC.cs
-		Versioning\PPCChangeLog.txt = Versioning\PPCChangeLog.txt
+		Versioning\ChangeLog.txt = Versioning\ChangeLog.txt
+		Versioning\GlobalVersionInfo.cs = Versioning\GlobalVersionInfo.cs
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Core", "Tango.Core\Tango.Core.csproj", "{A34EE0F0-649D-41C8-8489-B6F1CC6924EE}"
@@ -3677,5 +3673,11 @@ Global
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_UseGlobalSettings = False
 	EndGlobalSection
 EndGlobal
diff --git a/Software/Visual_Studio/Utilities/Tango.BugReporter/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.BugReporter/Properties/AssemblyInfo.cs
index 0d86baa04..781dd4f24 100644
--- a/Software/Visual_Studio/Utilities/Tango.BugReporter/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.BugReporter/Properties/AssemblyInfo.cs
@@ -6,13 +6,6 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango.BugReporter")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tango.BugReporter")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
@@ -32,5 +25,4 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.*")]
diff --git a/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj b/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj
index e0450c4bf..794591812 100644
--- a/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.BugReporter/Tango.BugReporter.csproj
@@ -58,6 +58,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -87,4 +90,9 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Properties/AssemblyInfo.cs
index 2a4bb1b33..296f5d574 100644
--- a/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Properties/AssemblyInfo.cs
@@ -6,13 +6,6 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango.CatalogGenerator")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tango.CatalogGenerator")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
@@ -32,5 +25,4 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.*")]
diff --git a/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj
index cffd7a654..9dc692113 100644
--- a/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Tango.CatalogGenerator.csproj
@@ -50,6 +50,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -64,4 +67,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Properties/AssemblyInfo.cs
index ac044393e..b4129f320 100644
--- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - DAL Observables Generator")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj
index ece87e07b..da4c65e05 100644
--- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj
@@ -52,8 +52,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ObservablesGenerator.cs" />
     <Compile Include="Program.cs" />
@@ -82,4 +82,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Properties/AssemblyInfo.cs
index 67dc85fcd..26b665bb0 100644
--- a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Machine Emulator")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj
index 726230dff..8d76d01f4 100644
--- a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj
@@ -61,8 +61,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Compile Include="..\..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
@@ -116,4 +116,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.HashGenerator/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.HashGenerator/Properties/AssemblyInfo.cs
index f3cdb1807..82d9269fb 100644
--- a/Software/Visual_Studio/Utilities/Tango.HashGenerator/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.HashGenerator/Properties/AssemblyInfo.cs
@@ -6,13 +6,6 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango.HashGenerator")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tango.HashGenerator")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
@@ -32,5 +25,4 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.*")]
diff --git a/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj
index cee8566a7..85fcc6d94 100644
--- a/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.HashGenerator/Tango.HashGenerator.csproj
@@ -42,6 +42,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -55,4 +58,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs
index d9040339c..01aee5c39 100644
--- a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs
@@ -8,13 +8,6 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango.ILMerge.UI")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tango.ILMerge.UI")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
@@ -51,5 +44,4 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.*")]
diff --git a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj
index fd5e7b435..5eda44601 100644
--- a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Tango.ILMerge.UI.csproj
@@ -58,6 +58,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -113,4 +116,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Properties/AssemblyInfo.cs
index 67dc85fcd..26b665bb0 100644
--- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Machine Emulator")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj
index 91cf82aa2..71011a702 100644
--- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj
@@ -77,8 +77,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="..\..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="Views\MainView.xaml.cs">
@@ -191,4 +191,9 @@
   <PropertyGroup>
     <PostBuildEvent>$(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Machine Emulator.lnk"</PostBuildEvent>
   </PropertyGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Properties/AssemblyInfo.cs
index 349d5d4a4..2a64a7b3d 100644
--- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - PMR Generator")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj
index 24b819578..58f22c733 100644
--- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj
@@ -49,8 +49,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -74,4 +74,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Properties/AssemblyInfo.cs
index 9e4452498..ecc68e48a 100644
--- a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Ports List DB table generator.")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj
index 7f22be160..21e3f2657 100644
--- a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj
@@ -49,8 +49,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -78,4 +78,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs
index 316919706..d7b3b255a 100644
--- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Compilation CLI")]
+[assembly: AssemblyVersion("2.0.13.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj
index a1beff465..97b2b6e99 100644
--- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj
@@ -45,8 +45,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Options.cs" />
     <Compile Include="Program.cs" />
@@ -63,4 +63,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Properties/AssemblyInfo.cs
index f391aa2a5..29c9baee9 100644
--- a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Compilation Utility")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj
index fea98f586..7c2144ba1 100644
--- a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj
@@ -80,8 +80,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Compile Include="..\..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
@@ -152,4 +152,9 @@
   <PropertyGroup>
     <PostBuildEvent>$(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Proto Compiler GUI.lnk"</PostBuildEvent>
   </PropertyGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Properties/AssemblyInfo.cs
index 587ec6945..9c10a6f93 100644
--- a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Properties/AssemblyInfo.cs
@@ -8,13 +8,6 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango.RemoteRunner.UI")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tango.RemoteRunner.UI")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
@@ -51,5 +44,4 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.*")]
diff --git a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj
index cf48ecd39..e57fa1825 100644
--- a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Tango.RemoteRunner.UI.csproj
@@ -76,6 +76,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="FileUpload.cs" />
     <Compile Include="RunningProcess.cs" />
     <Page Include="MainWindow.xaml">
@@ -169,4 +172,9 @@
     <Error Condition="!Exists('..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
   </Target>
   <Import Project="..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Properties/AssemblyInfo.cs
index a050c5eff..e0e5bb5ff 100644
--- a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Properties/AssemblyInfo.cs
@@ -6,13 +6,6 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango.SQLiteGenerator.CLI")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tango.SQLiteGenerator.CLI")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
@@ -32,5 +25,4 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.*")]
diff --git a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj
index e19a15436..9445911ee 100644
--- a/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.SQLiteGenerator.CLI/Tango.SQLiteGenerator.CLI.csproj
@@ -49,6 +49,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -75,4 +78,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Properties/AssemblyInfo.cs
index d9073ce97..a4d932980 100644
--- a/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Executable shortcut generator utility")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj
index 53a48b393..4a9081dec 100644
--- a/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj
@@ -45,8 +45,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Options.cs" />
     <Compile Include="Program.cs" />
@@ -77,4 +77,9 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Properties/AssemblyInfo.cs
index 04fdae8ae..fce5b22fe 100644
--- a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Stubs execution command prompt utility")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj
index f7b02de3e..d2b9b3ad9 100644
--- a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj
@@ -54,6 +54,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -88,4 +91,9 @@
     <Error Condition="!Exists('..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
   </Target>
   <Import Project="..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs
index 03f102809..0c6882dea 100644
--- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs
@@ -3,12 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Stubs execution GUI utility")]
-[assembly: ComVisible(false)]
-[assembly: AssemblyDescription("Tango - Stubs execution GUI utility")]
-[assembly: AssemblyCompany("Twine LTD")]
-[assembly: AssemblyProduct("Stubs execution utility")]
-[assembly: AssemblyCopyright("Twine LTD 2018")]
-[assembly: AssemblyTrademark("Twine LTD")]
-[assembly: AssemblyVersion("3.1")]
-[assembly: AssemblyFileVersion("3.1")]
+[assembly: AssemblyVersion("3.1.*")]
 
diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj
index de5ba2c69..ee9383e0a 100644
--- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Tango.Stubs.UI.csproj
@@ -78,6 +78,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
@@ -184,4 +187,9 @@
     <Error Condition="!Exists('..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
   </Target>
   <Import Project="..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Properties/AssemblyInfo.cs
index fa96a03aa..f7ad5809f 100644
--- a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Properties/AssemblyInfo.cs
@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Transport Routing Utility")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj
index 0183fd92a..3ec19f785 100644
--- a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj
@@ -66,8 +66,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="..\..\Versioning\Core.cs">
-      <Link>Core.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="Views\MainView.xaml.cs">
@@ -146,4 +146,9 @@
   <PropertyGroup>
     <PostBuildEvent>if $(ConfigurationName) == Debug $(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Transport Router.lnk"</PostBuildEvent>
   </PropertyGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj b/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj
index 1e4bd7447..a89b67dfb 100644
--- a/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.UITests/Tango.UITests.csproj
@@ -142,4 +142,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj
index ffe4eb0d7..ccc33aac4 100644
--- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/Tango.BuildExtensions.csproj
@@ -294,6 +294,11 @@
   </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')" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+    </VisualStudio>
+  </ProjectExtensions>
   <!-- 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/Versioning/CoreChangeLog.txt b/Software/Visual_Studio/Versioning/ChangeLog.txt
index 85a5bedd5..85a5bedd5 100644
--- a/Software/Visual_Studio/Versioning/CoreChangeLog.txt
+++ b/Software/Visual_Studio/Versioning/ChangeLog.txt
diff --git a/Software/Visual_Studio/Versioning/Core.cs b/Software/Visual_Studio/Versioning/GlobalVersionInfo.cs
index 8f9866efa..3197405a9 100644
--- a/Software/Visual_Studio/Versioning/Core.cs
+++ b/Software/Visual_Studio/Versioning/GlobalVersionInfo.cs
@@ -8,6 +8,3 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Twine")]
 [assembly: AssemblyCopyright("Copyright © Twine LTD 2017")]
 [assembly: AssemblyTrademark("Twine LTD")]
-
-[assembly: AssemblyVersion("1.0.0.9")]
-[assembly: AssemblyFileVersion("1.0.0.9")]
diff --git a/Software/Visual_Studio/Versioning/MachineStudio.cs b/Software/Visual_Studio/Versioning/MachineStudio.cs
deleted file mode 100644
index b5d8ad3a1..000000000
--- a/Software/Visual_Studio/Versioning/MachineStudio.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices; 
-
-
-[assembly: AssemblyProduct("Tango Machine Studio")] 
-
-[assembly: AssemblyCompany("Twine")]
-[assembly: AssemblyCopyright("Copyright © Twine LTD 2017")]
-[assembly: AssemblyTrademark("Twine LTD")]
-
-[assembly: AssemblyVersion("1.0.0.18")]
-[assembly: AssemblyFileVersion("1.0.0.18")]
diff --git a/Software/Visual_Studio/Versioning/MachineStudioChangeLog.txt b/Software/Visual_Studio/Versioning/MachineStudioChangeLog.txt
deleted file mode 100644
index d76afeef9..000000000
--- a/Software/Visual_Studio/Versioning/MachineStudioChangeLog.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Change log
-All notable changes to machine studio will be documented in this file.
-
-## [1.0.0.10] - 2018-07-04
-
-### Added
-- Added about dialog with version information.
\ No newline at end of file
diff --git a/Software/Visual_Studio/Versioning/PPC.cs b/Software/Visual_Studio/Versioning/PPC.cs
deleted file mode 100644
index bf45acb20..000000000
--- a/Software/Visual_Studio/Versioning/PPC.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices; 
-
-
-[assembly: AssemblyProduct("Tango PPC")] 
-
-[assembly: AssemblyCompany("Twine")]
-[assembly: AssemblyCopyright("Copyright © Twine LTD 2017")]
-[assembly: AssemblyTrademark("Twine LTD")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Software/Visual_Studio/Versioning/PPCChangeLog.txt b/Software/Visual_Studio/Versioning/PPCChangeLog.txt
deleted file mode 100644
index cc6a96995..000000000
--- a/Software/Visual_Studio/Versioning/PPCChangeLog.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Change log
-All notable changes to PPC will be documented in this file.
-
-## [1.0.0] - 2018-06-20
-
-### Added
-- added something...
-
-### Changed
-- changed something...
-
-### Removed
-- removed something...
\ No newline at end of file
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
index d5a8267fc..142676f82 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
@@ -6,13 +6,6 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango.MachineService")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tango.MachineService")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
@@ -31,5 +24,4 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.*")]
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
index 7a6629752..20fa14d62 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
@@ -167,6 +167,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
     <Compile Include="App_Start\BundleConfig.cs" />
     <Compile Include="App_Start\FilterConfig.cs" />
     <Compile Include="ProtoBufFormatter.cs" />
@@ -243,6 +246,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">