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

26 files changed, 767 insertions, 116 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
index 77255b814..a55b50e5b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
@@ -10,6 +10,9 @@
   <runtime>
     <legacyCorruptedStateExceptionsPolicy enabled="true|false"/>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <!--Required for cefCharp-->
+      <probing privatePath="x86"/>
+      
       <!--<dependentAssembly>
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs
index f9261e754..ebe68a5d3 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs
@@ -105,6 +105,12 @@ namespace Tango.PPC.UI
         {
             e.TryRecover = true;
 
+            if (e.Exception.ToString().Contains("FocusVisualStyle"))
+            {
+                LogManager.Log("FocusVisualStyle Error occurred. Ignoring...");
+                return;
+            }
+
             try
             {
                 LogManager.Log(e.Exception, "Application Crashed!");
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml
new file mode 100644
index 000000000..776233955
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml
@@ -0,0 +1,32 @@
+<UserControl x:Class="Tango.PPC.UI.Dialogs.PowerUpView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
+             xmlns:local="clr-namespace:Tango.PPC.UI.Dialogs"
+             mc:Ignorable="d" 
+             Background="{StaticResource TangoPrimaryBackgroundBrush}"  d:DesignHeight="555" d:DesignWidth="560" Width="600" Height="800" d:DataContext="{d:DesignInstance Type=local:PowerUpViewVM, IsDesignTimeCreatable=False}">
+    <Grid>
+        <StackPanel Margin="0 100 0 0" HorizontalAlignment="Center">
+            <touch:TouchGifAnimation Source="../Images/powerup.gif" EnableAnimation="{Binding IsVisible}" />
+            <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" Margin="0 30 0 0">Continue getting ready for:</TextBlock>
+            <DockPanel HorizontalAlignment="Center" Margin="0 40 0 0">
+                <touch:TouchRadioButton IsChecked="{Binding IsSelectedRml}" />
+                <touch:TouchComboBox Margin="20 0 0 0" Width="300" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRml}" DisplayMemberPath="Name"></touch:TouchComboBox>
+            </DockPanel>
+            <DockPanel HorizontalAlignment="Left" Margin="0 40 0 0">
+                <touch:TouchRadioButton IsChecked="{Binding IsMinimalTemperature}" />
+                <TextBlock VerticalAlignment="Center" Margin="20 0 0 0">Minimal temperature</TextBlock>
+            </DockPanel>
+
+            <touch:TouchButton Command="{Binding OKCommand}" Margin="0 150 0 0" Style="{StaticResource TangoHollowButton}" HorizontalAlignment="Center" Padding="60 15">CONTINUE</touch:TouchButton>
+
+            <TextBlock HorizontalAlignment="Center" Margin="0 10 0 0" Visibility="{Binding IsTimeoutEnabled,Converter={StaticResource BooleanToVisibilityConverter}}">
+                <Run>auto select in</Run>
+                <Run Text="{Binding RemainingSeconds}"></Run>
+                <Run>sec</Run>
+            </TextBlock>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml.cs
new file mode 100644
index 000000000..a9767276a
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.PPC.UI.Dialogs
+{
+    /// <summary>
+    /// Interaction logic for PowerUpView.xaml
+    /// </summary>
+    public partial class PowerUpView : UserControl
+    {
+        public PowerUpView()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnPreviewMouseUp(MouseButtonEventArgs e)
+        {
+            base.OnPreviewMouseUp(e);
+            (DataContext as PowerUpViewVM).IsTimeoutEnabled = false;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs
new file mode 100644
index 000000000..413b8453d
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs
@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Timers;
+using Tango.BL.Entities;
+using Tango.PPC.Common;
+using Tango.Settings;
+using Tango.SharedUI;
+
+namespace Tango.PPC.UI.Dialogs
+{
+    public class PowerUpViewVM : DialogViewVM
+    {
+        private Timer _timer;
+
+        private List<Rml> _rmls;
+        public List<Rml> Rmls
+        {
+            get { return _rmls; }
+            set { _rmls = value; RaisePropertyChangedAuto(); }
+        }
+
+        private Rml _selectedRml;
+        public Rml SelectedRml
+        {
+            get { return _selectedRml; }
+            set { _selectedRml = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _isSelectedRml;
+        public bool IsSelectedRml
+        {
+            get { return _isSelectedRml; }
+            set
+            {
+                _isSelectedRml = value;
+                RaisePropertyChangedAuto();
+
+                if (_isSelectedRml)
+                {
+                    IsMinimalTemperature = false;
+                }
+            }
+        }
+
+        private bool _isMinimalTemperature;
+        public bool IsMinimalTemperature
+        {
+            get { return _isMinimalTemperature; }
+            set
+            {
+                _isMinimalTemperature = value;
+                RaisePropertyChangedAuto();
+
+                if (_isMinimalTemperature)
+                {
+                    IsSelectedRml = false;
+                }
+            }
+        }
+
+        private int _remainingSeconds;
+        public int RemainingSeconds
+        {
+            get { return _remainingSeconds; }
+            set { _remainingSeconds = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _isTimeoutEnabled;
+        public bool IsTimeoutEnabled
+        {
+            get { return _isTimeoutEnabled; }
+            set
+            {
+                _isTimeoutEnabled = value; RaisePropertyChangedAuto();
+
+                if (!_isTimeoutEnabled)
+                {
+                    _timer.Stop();
+                }
+            }
+        }
+
+        public PowerUpViewVM()
+        {
+            RemainingSeconds = (int)SettingsManager.Default.GetOrCreate<PPCSettings>().PowerUpScreenTimeout.TotalSeconds;
+            CanClose = false;
+            IsMinimalTemperature = true;
+            IsTimeoutEnabled = true;
+            _timer = new Timer();
+            _timer.Interval = TimeSpan.FromSeconds(1).TotalMilliseconds;
+            _timer.Elapsed += _timer_Elapsed;
+        }
+
+        private void _timer_Elapsed(object sender, ElapsedEventArgs e)
+        {
+            RemainingSeconds--;
+
+            if (RemainingSeconds == 0)
+            {
+                InvokeUI(() =>
+                {
+                    Accept();
+                });
+            }
+        }
+
+        protected override void Cancel()
+        {
+            _timer.Stop();
+            base.Cancel();
+        }
+
+        protected override void Accept()
+        {
+            _timer.Stop();
+            base.Accept();
+        }
+
+        public override void OnShow()
+        {
+            base.OnShow();
+            _timer.Start();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/UpdateFromFileView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/UpdateFromFileView.xaml
index 231f5dabb..a175b655e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/UpdateFromFileView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/UpdateFromFileView.xaml
@@ -6,16 +6,16 @@
              xmlns:local="clr-namespace:Tango.PPC.UI.Dialogs"
              xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
              mc:Ignorable="d" 
-             Background="{StaticResource TangoPrimaryBackgroundBrush}"  d:DesignHeight="555" d:DesignWidth="560" Width="550" Height="450" d:DataContext="{d:DesignInstance Type=local:UpdateFromFileViewVM, IsDesignTimeCreatable=False}">
+             Background="{StaticResource TangoPrimaryBackgroundBrush}"  d:DesignHeight="555" d:DesignWidth="560" Width="570" Height="700" d:DataContext="{d:DesignInstance Type=local:UpdateFromFileViewVM, IsDesignTimeCreatable=False}">
     <Grid Margin="20">
         <DockPanel>
-            <StackPanel DockPanel.Dock="Bottom" HorizontalAlignment="Right" Orientation="Horizontal">
-                <touch:TouchButton Command="{Binding CloseCommand}" CornerRadius="25" Style="{StaticResource TangoMessageBoxButton}" HorizontalContentAlignment="Center" DockPanel.Dock="Right" Width="120" Height="50" VerticalAlignment="Bottom">CANCEL</touch:TouchButton>
-                <touch:TouchButton Command="{Binding OKCommand}" CornerRadius="25" Style="{StaticResource TangoMessageBoxButton}" Foreground="{StaticResource TangoPrimaryAccentBrush}" HorizontalContentAlignment="Center" DockPanel.Dock="Right" Width="120" Height="50" VerticalAlignment="Bottom">UPDATE</touch:TouchButton>
-            </StackPanel>
+            <Grid DockPanel.Dock="Bottom">
+                <touch:TouchButton HorizontalAlignment="Left" CornerRadius="25" Command="{Binding CloseCommand}" Style="{StaticResource TangoHollowButton}" Width="150" Height="50" VerticalAlignment="Bottom">CANCEL</touch:TouchButton>
+                <touch:TouchButton HorizontalAlignment="Right" CornerRadius="25" Command="{Binding OKCommand}" Style="{StaticResource TangoHollowButton}" Width="150" Height="50" VerticalAlignment="Bottom">UPDATE</touch:TouchButton>
+            </Grid>
             <StackPanel>
                 <Image Source="../Images/update.png" Stretch="Uniform" Height="120"></Image>
-                <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0" FontSize="{StaticResource TangoHeaderFontSize}">UPDATE PACKAGE</TextBlock>
+                <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0" FontSize="{StaticResource TangoHeaderFontSize}">Tango Update Package</TextBlock>
                 <TextBlock Margin="20 10" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center">The selected file contains a software update package. Press 'UPDATE' to start updating your system.</TextBlock>
 
                 <TextBlock HorizontalAlignment="Center" Margin="0 40 0 0" FontSize="{StaticResource TangoTitleFontSize}" Foreground="{StaticResource TangoGrayTextBrush}">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/power_off.gif b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/power_off.gif
new file mode 100644
index 000000000..dd07593e2
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/power_off.gif
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/powerup.gif b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/powerup.gif
new file mode 100644
index 000000000..f435d38d1
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/powerup.gif
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/InternalModule.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/InternalModule.cs
new file mode 100644
index 000000000..e960fa020
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/InternalModule.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media.Imaging;
+using Tango.BL.Enumerations;
+using Tango.PPC.Common;
+using Tango.PPC.UI.Views;
+
+namespace Tango.PPC.UI
+{
+    [PPCModule(100)]
+    public class InternalModule : PPCModuleBase
+    {
+        public InternalModule()
+        {
+            IsVisibleInMenu = false;
+        }
+
+        /// <summary>
+        /// Gets the module name.
+        /// </summary>
+        public override string Name
+        {
+            get
+            {
+                return "Internal";
+            }
+        }
+
+        /// <summary>
+        /// Gets the module description.
+        /// </summary>
+        public override string Description
+        {
+            get
+            {
+                return "Internal Module";
+            }
+        }
+
+        /// <summary>
+        /// Gets the module cover image.
+        /// </summary>
+        public override BitmapSource Image
+        {
+            get
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the module entry point view type.
+        /// </summary>
+        public override Type MainViewType
+        {
+            get
+            {
+                return typeof(InternalModuleView);
+            }
+        }
+
+        /// <summary>
+        /// Gets the permission required to see and load this module.
+        /// </summary>
+        public override Permissions Permission
+        {
+            get
+            {
+                return Permissions.RunPPC;
+            }
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public override void Dispose()
+        {
+            //Dispose module here...
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultStudioModuleLoader.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultStudioModuleLoader.cs
index feb7e371f..375b648d0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultStudioModuleLoader.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultStudioModuleLoader.cs
@@ -103,7 +103,7 @@ namespace Tango.PPC.UI.Modules
 
                         if (moduleAssembly != null)
                         {
-                            foreach (var moduleType in moduleAssembly.GetTypes().Where(x => !x.IsInterface && typeof(IPPCModule).IsAssignableFrom(x) && !x.IsAbstract))
+                            foreach (var moduleType in moduleAssembly.GetLoadableTypes().Where(x => !x.IsInterface && typeof(IPPCModule).IsAssignableFrom(x) && !x.IsAbstract))
                             {
                                 if (!AllModules.ToList().Exists(x => x.GetType() == moduleType))
                                 {
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
index 2a825cc19..3502648d4 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Navigation/DefaultNavigationManager.cs
@@ -12,6 +12,7 @@ using Tango.Core.Commands;
 using Tango.PPC.Common;
 using Tango.PPC.Common.Modules;
 using Tango.PPC.Common.Navigation;
+using Tango.PPC.Common.Notifications;
 using Tango.PPC.Common.Threading;
 using Tango.PPC.UI.Views;
 using Tango.SharedUI.Controls;
@@ -36,6 +37,7 @@ namespace Tango.PPC.UI.Navigation
         private List<AwaitingVMResult> _awaitingVMResults;
         private IDispatcherProvider _dispatcherProvider;
         private IPPCModuleLoader _moduleLoader;
+        private INotificationProvider _notificationProvider;
         private Object _currentVM;
         private String _lastFullPath;
         private bool _preventHistory;
@@ -75,12 +77,13 @@ namespace Tango.PPC.UI.Navigation
         /// Initializes a new instance of the <see cref="DefaultNavigationManager"/> class.
         /// </summary>
         /// <param name="moduleLoader">The module loader.</param>
-        public DefaultNavigationManager(IPPCModuleLoader moduleLoader, IDispatcherProvider dispatcherProvider)
+        public DefaultNavigationManager(IPPCModuleLoader moduleLoader, IDispatcherProvider dispatcherProvider, INotificationProvider notificationProvider)
         {
             IsBackEnabled = true;
             _awaitingVMResults = new List<AwaitingVMResult>();
             _navigationHistory = new Stack<String>();
             _moduleLoader = moduleLoader;
+            _notificationProvider = notificationProvider;
 
             NavigateToCommand = new RelayCommand<string>(async (x) => await NavigateTo(x));
             NavigateBackCommand = new RelayCommand(async () => await NavigateBack());
@@ -197,105 +200,127 @@ namespace Tango.PPC.UI.Navigation
         /// <param name="fullPath">The full path.</param>
         public async Task<bool> NavigateTo(String fullPath, bool pushToHistory = true, Action<PPCViewModel, PPCViewModel> onNavigating = null, Action<PPCViewModel, PPCViewModel> onNavigated = null)
         {
-            String[] path = fullPath.Split('.');
-            var module = _moduleLoader.UserModules.SingleOrDefault(x => x.GetType().Name == path[0] || x.Name == path[0]);
+            try
+            {
+                String[] path = fullPath.Split('.');
+                var module = _moduleLoader.UserModules.SingleOrDefault(x => x.GetType().Name == path[0] || x.Name == path[0]);
+
+                if (module == null)
+                {
+                    await _notificationProvider.ShowError("The specified module was not loaded.");
+                    return false;
+                }
 
-            if (path.Length == 1 && path[0] == CurrentModule.Name) return true;
+                if (path.Length == 1 && path[0] == CurrentModule.Name) return true;
 
-            LogManager.Log($"Navigating to: {fullPath}...");
+                LogManager.Log($"Navigating to: {fullPath}...");
 
-            var fromVM = _currentVM;
+                var fromVM = _currentVM;
 
-            if (_currentVM != null && _currentVM is INavigationBlocker)
-            {
-                if (_navigating_back)
+                if (_currentVM != null && _currentVM is INavigationBlocker)
                 {
-                    if (!await (_currentVM as INavigationBlocker).OnNavigateBackRequest())
+                    if (_navigating_back)
                     {
-                        return false;
+                        if (!await (_currentVM as INavigationBlocker).OnNavigateBackRequest())
+                        {
+                            return false;
+                        }
                     }
-                }
-                else
-                {
-                    if (!await (_currentVM as INavigationBlocker).OnNavigateOutRequest())
+                    else
                     {
-                        return false;
+                        if (!await (_currentVM as INavigationBlocker).OnNavigateOutRequest())
+                        {
+                            return false;
+                        }
                     }
                 }
-            }
 
 
 
-            if (pushToHistory && _lastFullPath != null && !_preventHistory)
-            {
-                _navigationHistory.Push(_lastFullPath);
-                RaisePropertyChanged(nameof(CanNavigateBack));
-            }
-
-            _lastFullPath = fullPath;
+                if (pushToHistory && _lastFullPath != null && !_preventHistory)
+                {
+                    _navigationHistory.Push(_lastFullPath);
+                    RaisePropertyChanged(nameof(CanNavigateBack));
+                }
 
-            MainView.Instance.NavigationControl.NavigateTo(NavigationView.LayoutView.ToString());
-            var navigationControl = LayoutView.Instance.NavigationControl;
-            CurrentModule = module;
-            var moduleView = navigationControl.NavigateTo(module.Name);
+                _lastFullPath = fullPath;
 
-            _currentVM = moduleView.DataContext;
+                MainView.Instance.NavigationControl.NavigateTo(NavigationView.LayoutView.ToString());
+                var navigationControl = LayoutView.Instance.NavigationControl;
+                CurrentModule = module;
+                var moduleView = navigationControl.NavigateTo(module.Name);
 
-            if (path.Length > 1)
-            {
-                var moduleNavigation = moduleView.FindChildOffline<NavigationControl>();
+                _currentVM = moduleView.DataContext;
 
-                if (moduleNavigation != null)
+                if (path.Length > 1)
                 {
-                    moduleNavigation.RegisterForLoadedOrNow(async (x, e) =>
-                    {
-                        var lastView = moduleNavigation.GetElement(path.Last());
-
-                        if (lastView != null)
-                        {
-                            onNavigating?.Invoke(fromVM as PPCViewModel, lastView.DataContext as PPCViewModel);
-                        }
+                    var moduleNavigation = moduleView.FindChildOffline<NavigationControl>();
 
-                        foreach (var view in path.Skip(1))
+                    if (moduleNavigation != null)
+                    {
+                        moduleNavigation.RegisterForLoadedOrNow(async (x, e) =>
                         {
-                            await Task.Delay(100);
+                            var lastView = moduleNavigation.GetElement(path.Last());
 
-                            FrameworkElement v = null;
+                            if (lastView != null)
+                            {
+                                onNavigating?.Invoke(fromVM as PPCViewModel, lastView.DataContext as PPCViewModel);
+                            }
 
-                            v = moduleNavigation.NavigateTo(view, () =>
+                            foreach (var view in path.Skip(1))
                             {
-                                if (v != null)
+                                await Task.Delay(100);
+
+                                FrameworkElement v = null;
+
+                                v = moduleNavigation.NavigateTo(view, () =>
                                 {
-                                    NotifyOnNavigated(fromVM, v.DataContext);
-                                    onNavigated?.Invoke(fromVM as PPCViewModel, v.DataContext as PPCViewModel);
-                                    NotifyAwaitingVMResults(fromVM as PPCViewModel, v.DataContext as PPCViewModel);
-                                }
-                            });
+                                    if (v != null)
+                                    {
+                                        NotifyOnNavigated(fromVM, v.DataContext);
+                                        onNavigated?.Invoke(fromVM as PPCViewModel, v.DataContext as PPCViewModel);
+                                        NotifyAwaitingVMResults(fromVM as PPCViewModel, v.DataContext as PPCViewModel);
+                                    }
+                                });
 
-                            NotifyOnBeforeNavigated(fromVM, v.DataContext);
+                                NotifyOnBeforeNavigated(fromVM, v.DataContext);
 
-                            if (v != null)
-                            {
-                                _currentVM = v.DataContext;
+                                if (v != null)
+                                {
+                                    _currentVM = v.DataContext;
 
-                                if (view != path.Last())
+                                    if (view != path.Last())
+                                    {
+                                        moduleNavigation = v.FindChildOffline<NavigationControl>();
+                                    }
+                                }
+                                else
                                 {
-                                    moduleNavigation = v.FindChildOffline<NavigationControl>();
+                                    throw LogManager.Log(new ArgumentNullException("Could not navigate to " + fullPath));
                                 }
                             }
-                            else
-                            {
-                                throw LogManager.Log(new ArgumentNullException("Could not navigate to " + fullPath));
-                            }
-                        }
-                    });
+                        });
+                    }
+                    else
+                    {
+                        onNavigating?.Invoke(fromVM as PPCViewModel, _currentVM as PPCViewModel);
+
+                        NotifyOnBeforeNavigated(fromVM, _currentVM);
+
+                        await Task.Delay(navigationControl.TransitionDuration.TimeSpan);
+
+                        NotifyOnNavigated(fromVM, _currentVM);
+
+                        onNavigated?.Invoke(fromVM as PPCViewModel, _currentVM as PPCViewModel);
+                        NotifyAwaitingVMResults(fromVM as PPCViewModel, _currentVM as PPCViewModel);
+                    }
                 }
                 else
                 {
-                    onNavigating?.Invoke(fromVM as PPCViewModel, _currentVM as PPCViewModel);
-
                     NotifyOnBeforeNavigated(fromVM, _currentVM);
 
+                    onNavigating?.Invoke(fromVM as PPCViewModel, _currentVM as PPCViewModel);
+
                     await Task.Delay(navigationControl.TransitionDuration.TimeSpan);
 
                     NotifyOnNavigated(fromVM, _currentVM);
@@ -303,22 +328,14 @@ namespace Tango.PPC.UI.Navigation
                     onNavigated?.Invoke(fromVM as PPCViewModel, _currentVM as PPCViewModel);
                     NotifyAwaitingVMResults(fromVM as PPCViewModel, _currentVM as PPCViewModel);
                 }
+
+                return true;
             }
-            else
+            catch (Exception ex)
             {
-                NotifyOnBeforeNavigated(fromVM, _currentVM);
-
-                onNavigating?.Invoke(fromVM as PPCViewModel, _currentVM as PPCViewModel);
-
-                await Task.Delay(navigationControl.TransitionDuration.TimeSpan);
-
-                NotifyOnNavigated(fromVM, _currentVM);
-
-                onNavigated?.Invoke(fromVM as PPCViewModel, _currentVM as PPCViewModel);
-                NotifyAwaitingVMResults(fromVM as PPCViewModel, _currentVM as PPCViewModel);
+                await _notificationProvider.ShowError($"Error navigating to '{fullPath}'.");
+                return false;
             }
-
-            return true;
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 44b6ffded..149fb549f 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -33,6 +33,7 @@ using Tango.Core.Threading;
 using Tango.PPC.Common.Messages;
 using Tango.Core.ExtensionMethods;
 using Tango.PPC.Common.Navigation;
+using Tango.PPC.Common.Synchronization;
 
 namespace Tango.PPC.UI.PPCApplication
 {
@@ -50,6 +51,7 @@ namespace Tango.PPC.UI.PPCApplication
         private IEventLogger _eventLogger;
         private IPPCModuleLoader _moduleLoader;
         private INotificationProvider _notificationProvider;
+        private IMachineDataSynchronizer _machineDataSynchronizer;
         private WatchDogServer _watchdogServer;
         private ObservablesContext _machineContext;
         private ActionTimer _screenLockTimer;
@@ -147,15 +149,34 @@ namespace Tango.PPC.UI.PPCApplication
         }
 
         /// <summary>
+        /// Gets the firmware version.
+        /// </summary>
+        public Version FirmwareVersion
+        {
+            get
+            {
+                return Version.Parse(SettingsManager.Default.GetOrCreate<PPCSettings>().FirmwareVersion);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the application folder.
+        /// </summary>
+        public String StartPath { get; private set; }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="DefaultPPCApplicationManager"/> class.
         /// </summary>
-        public DefaultPPCApplicationManager(IMachineProvider machineProvider, IDispatcherProvider dispatcherProvider, IEventLogger eventLogger, IPPCModuleLoader moduleLoader, INotificationProvider notificationProvider)
+        public DefaultPPCApplicationManager(IMachineProvider machineProvider, IDispatcherProvider dispatcherProvider, IEventLogger eventLogger, IPPCModuleLoader moduleLoader, INotificationProvider notificationProvider, IMachineDataSynchronizer machineDataSynchronizer)
         {
+            StartPath = AssemblyHelper.GetCurrentAssemblyFolder();
+
             _notificationProvider = notificationProvider;
             _machineProvider = machineProvider;
             _dispatcher = dispatcherProvider;
             _eventLogger = eventLogger;
             _moduleLoader = moduleLoader;
+            _machineDataSynchronizer = machineDataSynchronizer;
 
             if (!DesignMode)
             {
@@ -248,6 +269,8 @@ namespace Tango.PPC.UI.PPCApplication
                         LogManager.Log("Loading machine from database...");
                         _machineContext = ObservablesContext.CreateDefault();
                         _machine = new MachineBuilder(_machineContext).SetFirst().WithVersion().WithSettings().WithOrganization().WithConfiguration().WithSpools().WithCats().Build();
+
+
                     }
 
                     initialized = true;
@@ -305,6 +328,8 @@ namespace Tango.PPC.UI.PPCApplication
                 }
             }
 
+            var internalModules = this.GetType().Assembly.GetTypes().Where(xx => typeof(PPCModuleBase).IsAssignableFrom(xx)).ToList();
+
             LogManager.Log("Waiting for IPPCModuleLoader instance injection...");
             TangoIOC.Default.GetInstanceWhenAvailable<IPPCModuleLoader>((loader) =>
             {
@@ -319,12 +344,32 @@ namespace Tango.PPC.UI.PPCApplication
                         {
                             if (!Views.LayoutView.Instance.NavigationControl.Elements.ToList().Exists(m => m.GetType() == module.MainViewType))
                             {
-                                LogManager.Log("Loading module view " + module.Name + "...");
-                                FrameworkElement view = Activator.CreateInstance(module.MainViewType) as FrameworkElement;
-                                SharedUI.Controls.NavigationControl.SetNavigationName(view, module.Name);
-                                Views.LayoutView.Instance.NavigationControl.Elements.Add(view);
+                                try
+                                {
+                                    LogManager.Log("Loading module view " + module.Name + "...");
+                                    FrameworkElement view = Activator.CreateInstance(module.MainViewType) as FrameworkElement;
+                                    SharedUI.Controls.NavigationControl.SetNavigationName(view, module.Name);
+                                    Views.LayoutView.Instance.NavigationControl.Elements.Add(view);
+                                }
+                                catch (Exception ex)
+                                {
+                                    LogManager.Log(ex, $"Error loading module view for module {module.Name}.");
+                                }
                             }
                         }
+
+                        //Adding internal modules.
+                        LogManager.Log("Loading internal modules...");
+                        foreach (var type in internalModules)
+                        {
+                            var module = Activator.CreateInstance(type) as IPPCModule;
+                            LogManager.Log("Loading module view " + module.Name + "...");
+                            FrameworkElement view = Activator.CreateInstance(module.MainViewType) as FrameworkElement;
+                            SharedUI.Controls.NavigationControl.SetNavigationName(view, module.Name);
+                            Views.LayoutView.Instance.NavigationControl.Elements.Add(view);
+                            _moduleLoader.AllModules.Add(module);
+                            _moduleLoader.UserModules.Add(module);
+                        }
                     });
 
                     LogManager.Log($"{loader.UserModules.Count} modules loaded.");
@@ -349,6 +394,9 @@ namespace Tango.PPC.UI.PPCApplication
             LogManager.Log("Initializing Machine Provider...");
             _machineProvider.Init(_machine, _machineContext);
 
+            LogManager.Log("Starting Machine Data Synchronizer...");
+            _machineDataSynchronizer.IsEnabled = true;
+
             LogManager.Log("Applications initialization completed!");
 
             LogManager.Log("Checking for un-notified PPC view models...");
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
index 56ec2fa7e..4c5a87ab4 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
@@ -259,7 +259,7 @@ namespace Tango.PPC.UI.Printing
             {
                 throw new InvalidOperationException("Error starting job. Color is out of range.");
             }
-            if (job.Segments.SelectMany(x => x.BrushStops).Any(x => x.BrushColorSpace == ColorSpaces.Catalog && x.ColorCatalogsItem == null))
+            if (job.Segments.SelectMany(x => x.BrushStops).Any(x => x.BrushColorSpace == ColorSpaces.Catalog && x.ColorCatalogsItem == null && !x.IsTransparent))
             {
                 throw new InvalidOperationException("Error starting job. Please select a catalog color.");
             }
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 ab5492ab6..96891a8a9 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
@@ -132,6 +132,10 @@
       <DependentUpon>InsufficientLiquidQuantityView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Dialogs\InsufficientLiquidQuantityViewVM.cs" />
+    <Compile Include="Dialogs\PowerUpView.xaml.cs">
+      <DependentUpon>PowerUpView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\PowerUpViewVM.cs" />
     <Compile Include="Dialogs\ScreenLockView.xaml.cs">
       <DependentUpon>ScreenLockView.xaml</DependentUpon>
     </Compile>
@@ -145,6 +149,7 @@
       <DependentUpon>UpdateFromFileView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Dialogs\UpdateFromFileViewVM.cs" />
+    <Compile Include="InternalModule.cs" />
     <Compile Include="Modules\DefaultStudioModuleLoader.cs" />
     <Compile Include="Navigation\DefaultNavigationManager.cs" />
     <Compile Include="Notifications\DefaultNotificationProvider.cs" />
@@ -160,6 +165,7 @@
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\EmergencyViewVM.cs" />
     <Compile Include="ViewModels\ExternalBridgeViewVM.cs" />
+    <Compile Include="ViewModels\InternalModuleViewVM.cs" />
     <Compile Include="ViewModels\LayoutViewVM.cs" />
     <Compile Include="ViewModels\LoadingErrorViewVM.cs" />
     <Compile Include="ViewModels\LoadingViewVM.cs" />
@@ -168,6 +174,7 @@
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="ViewModels\MachineUpdateViewVM.cs" />
     <Compile Include="ViewModels\NoPermissionsViewVM.cs" />
+    <Compile Include="ViewModels\PowerOffViewVM.cs" />
     <Compile Include="ViewModels\RestartingSystemViewVM.cs" />
     <Compile Include="ViewModels\RestartingViewVM.cs" />
     <Compile Include="ViewsContracts\ILayoutView.cs" />
@@ -176,6 +183,9 @@
     <Compile Include="Views\ExternalBridgeView.xaml.cs">
       <DependentUpon>ExternalBridgeView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\InternalModuleView.xaml.cs">
+      <DependentUpon>InternalModuleView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\LayoutView.xaml.cs">
       <DependentUpon>LayoutView.xaml</DependentUpon>
     </Compile>
@@ -185,6 +195,9 @@
     <Compile Include="Views\LoadingErrorView.xaml.cs">
       <DependentUpon>LoadingErrorView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\PowerOffView.xaml.cs">
+      <DependentUpon>PowerOffView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\RestartingView.xaml.cs">
       <DependentUpon>RestartingView.xaml</DependentUpon>
     </Compile>
@@ -225,6 +238,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Dialogs\PowerUpView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Dialogs\ScreenLockView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -269,6 +286,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\InternalModuleView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\LayoutView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -281,6 +302,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\PowerOffView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\RestartingView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -374,6 +399,8 @@
     <Resource Include="Images\GlobalStatus\error.png" />
     <Resource Include="Images\GlobalStatus\service.png" />
     <Resource Include="Images\update_available.png" />
+    <Resource Include="Images\powerup.gif" />
+    <Resource Include="Images\power_off.gif" />
     <Content Include="Manifests\release.xml" />
     <Content Include="Manifests\debug.xml" />
     <None Include="firmware_package.tfp">
@@ -465,6 +492,11 @@
       <Project>{bc2753f8-c0f7-48f5-a85c-149ec7a2f8c7}</Project>
       <Name>Tango.PPC.BackupRestore</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules\Tango.PPC.Browser\Tango.PPC.Browser.csproj">
+      <Project>{f02eaa84-ad59-465b-99a2-4422c13bfb72}</Project>
+      <Name>Tango.PPC.Browser</Name>
+      <Private>True</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Modules\Tango.PPC.BugReporting\Tango.PPC.BugReporting.csproj">
       <Project>{8146fa0a-0725-4a1a-82e6-696c58f33a2b}</Project>
       <Name>Tango.PPC.BugReporting</Name>
@@ -609,8 +641,8 @@ RD /S /Q "$(TargetDir)pt-BR\"
 
 RD /S /Q "$(TargetDir)roslyn\"
 RD /S /Q "$(TargetDir)ProtoCompilers\"
-RD /S /Q "$(TargetDir)x86\"
-RD /S /Q "$(TargetDir)x64\"
+if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)x86\"
+if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)x64\"
 
 copy /Y "$(SolutionDir)Referenced Assemblies\mscoree.dll" "$(TargetDir)"
 copy /Y "$(SolutionDir)Referenced Assemblies\msvcp140d.dll" "$(TargetDir)"
@@ -626,7 +658,8 @@ if $(ConfigurationName) == Release del *.xml
 if $(ConfigurationName) == Debug copy /Y "$(TargetDir)Packages" "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>copy /Y "$(ProjectDir)Manifests\$(ConfigurationName).xml" "$(ProjectDir)app.manifest"</PreBuildEvent>
+    <PreBuildEvent>copy /Y "$(ProjectDir)Manifests\$(ConfigurationName).xml" "$(ProjectDir)app.manifest"
+</PreBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
index 60bce4e20..09ed7c6d0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Windows;
 using Tango.Core.DI;
 using Tango.Integration.ExternalBridge;
@@ -21,6 +22,7 @@ using Tango.PPC.Common.OS;
 using Tango.PPC.Common.Printing;
 using Tango.PPC.Common.RemoteAssistance;
 using Tango.PPC.Common.Storage;
+using Tango.PPC.Common.Synchronization;
 using Tango.PPC.Common.Threading;
 using Tango.PPC.Common.UpdatePackages;
 using Tango.PPC.Common.UWF;
@@ -75,8 +77,17 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Unregister<PPCWebClient>();
             TangoIOC.Default.Unregister<IBackupManager>();
             TangoIOC.Default.Unregister<IPackageRunner>();
+            TangoIOC.Default.Unregister<IMachineDataSynchronizer>();
+
+            if (App.StartupArgs.Contains("-webDebug"))
+            {
+                TangoIOC.Default.Register<PPCWebClient, PPCWebClient>(new PPCWebClient("http://localhost:1111", null));
+            }
+            else
+            {
+                TangoIOC.Default.Register<PPCWebClient, PPCWebClient>(new PPCWebClient());
+            }
 
-            TangoIOC.Default.Register<PPCWebClient, PPCWebClient>(new PPCWebClient());
             TangoIOC.Default.Register<IDispatcherProvider, DefaultDispatcherProvider>(new DefaultDispatcherProvider(Application.Current.Dispatcher));
             TangoIOC.Default.Register<INotificationProvider, DefaultNotificationProvider>();
             TangoIOC.Default.Register<IAuthenticationProvider, DefaultAuthenticationProvider>();
@@ -84,6 +95,7 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Register<INavigationManager, DefaultNavigationManager>();
             TangoIOC.Default.Register<IMachineProvider, DefaultMachineProvider>();
             TangoIOC.Default.Register<IEventLogger, DefaultEventLogger>();
+            TangoIOC.Default.Register<IMachineDataSynchronizer, DefaultMachineDataSynchronizer>();
             TangoIOC.Default.Register<IPPCApplicationManager, DefaultPPCApplicationManager>();
             TangoIOC.Default.Register<ExternalBridgeScanner, ExternalBridgeScanner>();
             TangoIOC.Default.Register<IDiagnosticsFrameProvider, DefaultDiagnosticsFrameProvider>();
@@ -112,6 +124,8 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Register<RestartingSystemViewVM>();
             TangoIOC.Default.Register<EmergencyViewVM>();
             TangoIOC.Default.Register<RestartingViewVM>();
+            TangoIOC.Default.Register<InternalModuleViewVM>();
+            TangoIOC.Default.Register<PowerOffViewVM>();
 
 
             TangoIOC.Default.GetInstance<IPPCApplicationManager>().ContentRendered += (_, __) =>
@@ -225,5 +239,21 @@ namespace Tango.PPC.UI
                 return TangoIOC.Default.GetInstance<RestartingViewVM>();
             }
         }
+
+        public static InternalModuleViewVM InternalModuleViewVM
+        {
+            get
+            {
+                return TangoIOC.Default.GetInstance<InternalModuleViewVM>();
+            }
+        }
+
+        public static PowerOffViewVM PowerOffViewVM
+        {
+            get
+            {
+                return TangoIOC.Default.GetInstance<PowerOffViewVM>();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/InternalModuleViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/InternalModuleViewVM.cs
new file mode 100644
index 000000000..29e6417f4
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/InternalModuleViewVM.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.PPC.Common;
+
+namespace Tango.PPC.UI.ViewModels
+{
+    public class InternalModuleViewVM : PPCViewModel
+    {
+        public override void OnApplicationStarted()
+        {
+            
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
index 9e8a9fe34..e18354f89 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
@@ -10,6 +10,7 @@ using Tango.Integration.Operation;
 using Tango.PPC.Common;
 using Tango.PPC.Common.Modules;
 using Tango.PPC.Common.Navigation;
+using Tango.PPC.UI.Views;
 using Tango.PPC.UI.ViewsContracts;
 using Tango.SharedUI;
 
@@ -121,6 +122,11 @@ namespace Tango.PPC.UI.ViewModels
         /// </summary>
         public RelayCommand RestartApplicationCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the power off command.
+        /// </summary>
+        public RelayCommand PowerOffCommand { get; set; }
+
         #endregion
 
         #region Constructors
@@ -146,6 +152,7 @@ namespace Tango.PPC.UI.ViewModels
 
             PowerCommand = new RelayCommand(() => IsPowerOpened = true);
             RestartApplicationCommand = new RelayCommand(RestartApplication);
+            PowerOffCommand = new RelayCommand(PowerOffMachine);
         }
 
         #endregion
@@ -239,6 +246,12 @@ namespace Tango.PPC.UI.ViewModels
             }
         }
 
+        private async void PowerOffMachine()
+        {
+            IsMenuOpened = false;
+            await NavigationManager.NavigateTo<InternalModule>(nameof(PowerOffView));
+        }
+
         #endregion
 
         #region Override Methods
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
index 0371e94da..49b2aef89 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
@@ -10,6 +10,7 @@ using Tango.Core.Helpers;
 using Tango.Explorer;
 using Tango.PPC.Common;
 using Tango.PPC.Common.MachineUpdate;
+using Tango.PPC.Common.Publish;
 using Tango.PPC.Common.Web;
 using Tango.PPC.UI.Dialogs;
 using Tango.PPC.UI.Notifications.NotificationItems;
@@ -209,7 +210,7 @@ namespace Tango.PPC.UI.ViewModels
 
                 try
                 {
-                    _update_result = await MachineUpdateManager.Update(MachineProvider.Machine.SerialNumber, _checkUpdateResponse.SetupFirmware, _checkUpdateResponse.SetupFPGA);
+                    _update_result = await MachineUpdateManager.Update(_checkUpdateResponse.SetupFirmware, _checkUpdateResponse.SetupFPGA);
                     LogManager.Log("Machine update completed.");
                     await NavigateTo(MachineUpdateView.UpdateCompletedView);
                 }
@@ -248,15 +249,15 @@ namespace Tango.PPC.UI.ViewModels
         {
             LogManager.Log("Completing machine update...");
 
-            if (!IsDbUpdate)
+            if (IsDbUpdate || !_update_result.RequiresBinariesUpdate)
             {
-                String updater_exe = Path.Combine(_update_result.UpdatePackagePath, "Tango.PPC.Updater.exe");
-                ApplicationManager.UpdateApplication(updater_exe, PathHelper.GetStartupPath());
+                LogManager.Log("Restarting Application...");
+                ApplicationManager.Restart();
             }
             else
             {
-                LogManager.Log("Restarting Application...");
-                ApplicationManager.Restart();
+                String updater_exe = Path.Combine(_update_result.UpdatePackagePath, "Tango.PPC.Updater.exe");
+                ApplicationManager.UpdateApplication(updater_exe, PathHelper.GetStartupPath());
             }
         }
 
@@ -296,7 +297,7 @@ namespace Tango.PPC.UI.ViewModels
             }
             else
             {
-                MachineUpdateManager.AutoCheckForUpdates = MachineProvider.Machine.AutoCheckForUpdates;
+                MachineUpdateManager.EnableAutoCheckForUpdates = true;
             }
         }
 
@@ -375,7 +376,7 @@ namespace Tango.PPC.UI.ViewModels
 
         private async void HandleSoftwareUpdatePackageLoaded(ExplorerFileItem fileItem)
         {
-            UpdatePackageFile packageFile = null;
+            PublishInfo packageFile = null;
 
             try
             {
@@ -383,38 +384,33 @@ namespace Tango.PPC.UI.ViewModels
             }
             catch (Exception ex)
             {
-                LogManager.Log(ex, $"Error loading update package file from {fileItem.Path}.");
+                LogManager.Log(ex, $"Error loading publish info from {fileItem.Path}.");
                 await NotificationProvider.ShowError("An error occurred while trying to load the selected software update package. Please make sure the package is valid.");
                 return;
             }
 
-            if (ApplicationManager.Version <= packageFile.Version)
-            {
-                await NotificationProvider.ShowError($"The selected update package (v{packageFile.Version.ToString()}) contains an older software version.");
-                return;
-            }
-
             UpdateFromFileViewVM vm = new UpdateFromFileViewVM();
-            vm.Version = packageFile.Version.ToString();
+            vm.Version = packageFile.ApplicationVersion;
 
             await NotificationProvider.ShowDialog(vm);
 
             if (vm.DialogResult)
             {
                 await NavigationManager.NavigateTo(Common.Navigation.NavigationView.MachineUpdateView);
-                await NavigateTo(MachineUpdateView.UpdateFromPackageView);
+                await NavigateTo(MachineUpdateView.UpdateProgressView);
 
                 LogManager.Log("Starting machine update from package...");
 
                 try
                 {
-                    _update_result = await MachineUpdateManager.UpdateFromTUP(fileItem.Path);
+                    _update_result = await MachineUpdateManager.UpdateFromTUP(fileItem.Path, MachineProvider.Machine.SetupFirmware, MachineProvider.Machine.SetupFpga);
                     LogManager.Log("Machine update from package completed.");
                     await NavigateTo(MachineUpdateView.UpdateCompletedView);
                 }
                 catch (Exception ex)
                 {
                     LogManager.Log(ex, "Machine update from package failed.");
+                    FailedError = ex.FlattenMessage();
                     await NavigateTo(MachineUpdateView.UpdateFailedFromPackageView);
                 }
             }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
index 01a47539e..8a4d20b76 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
@@ -4,6 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Threading;
+using Tango.BL;
+using Tango.BL.Builders;
+using Tango.BL.Entities;
 using Tango.Core.DI;
 using Tango.Integration.ExternalBridge;
 using Tango.Integration.Operation;
@@ -17,6 +20,7 @@ using Tango.PPC.Common.Notifications;
 using Tango.PPC.Common.WatchDog;
 using Tango.PPC.UI.Dialogs;
 using Tango.SharedUI;
+using System.Data.Entity;
 
 namespace Tango.PPC.UI.ViewModels
 {
@@ -58,6 +62,7 @@ namespace Tango.PPC.UI.ViewModels
         {
             base.OnApplicationReady();
             MachineProvider.MachineOperator.CartridgeValidationRequestReceived += MachineOperator_CartridgeValidationRequestReceived;
+            MachineProvider.MachineOperator.PowerUpStarted += MachineOperator_PowerUpStarted;
         }
 
         #region Event Handlers
@@ -92,6 +97,86 @@ namespace Tango.PPC.UI.ViewModels
             });
         }
 
+        private async void MachineOperator_PowerUpStarted(object sender, EventArgs e)
+        {
+            LogManager.Log("Power up detected, showing power up screen...");
+
+            if (!Settings.DisplayPowerUpScreen)
+            {
+                LogManager.Log("Power up screen disabled. skipping...");
+                return;
+            }
+
+            PowerUpViewVM vm;
+
+            try
+            {
+                LogManager.Log("Loading site rmls...");
+
+                List<Rml> rmls = new List<Rml>();
+
+                using (ObservablesContext db = ObservablesContext.CreateDefault())
+                {
+                    rmls = await new RmlsCollectionBuilder(db).SetAll().WithSite(MachineProvider.Machine.SiteGuid).BuildListAsync();
+                }
+
+                var selectedRml = rmls.SingleOrDefault(x => x.Guid == Settings.LastPowerUpSelectedRmlGuid);
+
+                vm = new PowerUpViewVM();
+                vm.Rmls = rmls;
+                vm.SelectedRml = selectedRml != null ? selectedRml : rmls.FirstOrDefault();
+                vm.IsSelectedRml = selectedRml != null;
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error initializing power up screen.");
+                return;
+            }
+
+            InvokeUI(async () =>
+            {
+                await NotificationProvider.ShowDialog<PowerUpViewVM>(vm);
+
+                await Task.Factory.StartNew(() =>
+                {
+                    LogManager.Log("Power up screen closed.");
+
+                    try
+                    {
+                        using (ObservablesContext db = ObservablesContext.CreateDefault())
+                        {
+                            List<ProcessParametersTable> processTables = new List<ProcessParametersTable>();
+
+                            if (vm.IsSelectedRml)
+                            {
+                                LogManager.Log($"Selected rml '{vm.SelectedRml.Name}'...");
+                                processTables = new RmlBuilder(db).Set(vm.SelectedRml.Guid).WithActiveParametersGroup().Build().GetActiveProcessGroup().ProcessParametersTables.ToList();
+                            }
+                            else
+                            {
+                                LogManager.Log("Selected minimal temperature...");
+                                var rmlsToAvg = new RmlsCollectionBuilder(db).SetAll().WithSite(MachineProvider.Machine.SiteGuid).WithActiveParametersGroup().Build();
+                                processTables = rmlsToAvg.Select(x => x.GetActiveProcessGroup()).SelectMany(x => x.ProcessParametersTables).ToList();
+                            }
+
+                            var processToLoad = processTables.OrderBy(x => x.GetAverageTemperature()).First();
+
+                            LogManager.Log($"Selected process parameters:\nRML: {processToLoad.ProcessParametersTablesGroup.Rml.Name}\nGroup: {processToLoad.ProcessParametersTablesGroup.Name}\nProcess Table: {processToLoad.Name}");
+                            LogManager.Log("Uploading process parameters...");
+                            var r = MachineProvider.MachineOperator.UploadProcessParameters(processToLoad).Result;
+
+                            Settings.LastPowerUpSelectedRmlGuid = vm.IsSelectedRml ? vm.SelectedRml.Guid : null;
+                            Settings.Save();
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, "Error occurred while trying to get and upload the proper process parameters after power screen closed.");
+                    }
+                });
+            });
+        }
+
         #endregion
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/PowerOffViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/PowerOffViewVM.cs
new file mode 100644
index 000000000..0d58b472f
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/PowerOffViewVM.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core.Commands;
+using Tango.PPC.Common;
+
+namespace Tango.PPC.UI.ViewModels
+{
+    public class PowerOffViewVM : PPCViewModel
+    {
+        public RelayCommand AbortCommand { get; set; }
+
+        public PowerOffViewVM()
+        {
+            AbortCommand = new RelayCommand(AbortPowerOff);
+        }
+
+        public override void OnApplicationStarted()
+        {
+
+        }
+
+        private void AbortPowerOff()
+        {
+            NavigationManager.NavigateBack();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/InternalModuleView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/InternalModuleView.xaml
new file mode 100644
index 000000000..88981a9fa
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/InternalModuleView.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="Tango.PPC.UI.Views.InternalModuleView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.PPC.UI.Views"
+             xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:vm="clr-namespace:Tango.PPC.UI.ViewModels"
+			 xmlns:global="clr-namespace:Tango.PPC.UI"
+             mc:Ignorable="d" 
+             d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:InternalModuleViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.InternalModuleViewVM}">
+    <Grid>
+        <controls:NavigationControl TransitionType="Zoom" KeepElementsAttached="True">
+            <local:PowerOffView/>
+        </controls:NavigationControl>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/InternalModuleView.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/InternalModuleView.xaml.cs
new file mode 100644
index 000000000..f67d16dd9
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/InternalModuleView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.PPC.UI.Views
+{
+    /// <summary>
+    /// Interaction logic for InternalModuleView.xaml
+    /// </summary>
+    public partial class InternalModuleView : UserControl
+    {
+        public InternalModuleView()
+        {
+            InitializeComponent();
+        }
+    }
+}
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 9315f9f0e..b4f93fd0a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -172,7 +172,7 @@
                                         <Image Source="/Images/power-machine.png" Margin="30" />
 
                                         <UniformGrid Grid.Column="1" Rows="2">
-                                            <touch:TouchButton HorizontalAlignment="Left" VerticalAlignment="Center" Padding="50 20" Height="Auto" Style="{StaticResource TangoLinkButton}" FontSize="{StaticResource TangoTitleFontSize}" Foreground="{StaticResource TangoPrimaryBackgroundBrush}">Turn Off</touch:TouchButton>
+                                            <touch:TouchButton HorizontalAlignment="Left" VerticalAlignment="Center" Padding="50 20" Height="Auto" Style="{StaticResource TangoLinkButton}" FontSize="{StaticResource TangoTitleFontSize}" Foreground="{StaticResource TangoPrimaryBackgroundBrush}" Command="{Binding PowerOffCommand}" >Turn Off</touch:TouchButton>
                                             <touch:TouchButton HorizontalAlignment="Left" VerticalAlignment="Center" Padding="50 20" Height="Auto" Style="{StaticResource TangoLinkButton}" FontSize="{StaticResource TangoTitleFontSize}" Foreground="{StaticResource TangoPrimaryBackgroundBrush}">Stand By</touch:TouchButton>
                                         </UniformGrid>
                                     </Grid>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml
index fba8a599d..beb09be0d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineUpdateView.xaml
@@ -194,8 +194,9 @@
                             <touch:TouchButton Padding="20" Width="300" Margin="0 0 0 130" CornerRadius="35" Command="{Binding CloseCommand}">CLOSE</touch:TouchButton>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0 50 0 0">
-                            <touch:TouchIcon Icon="AlertOctagon" Foreground="{StaticResource TangoErrorBrush}" Width="70" Height="70" />
-                            <TextBlock VerticalAlignment="Center" Margin="0 10 0 0" Foreground="{StaticResource TangoErrorBrush}" FontSize="{StaticResource TangoTitleFontSize}">An error occurred while trying to update the machine.</TextBlock>
+                            <touch:TouchIcon Icon="AlertOutline" Foreground="{StaticResource TangoErrorBrush}" Width="70" Height="70" />
+                            <TextBlock HorizontalAlignment="Center" Margin="0 10 0 0"  FontSize="{StaticResource TangoTitleFontSize}">Update Failed</TextBlock>
+                            <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" Foreground="{StaticResource TangoErrorBrush}" TextAlignment="Center" Text="{Binding FailedError,FallbackValue='Unexpected error'}"></TextBlock>
                         </StackPanel>
                     </DockPanel>
                 </Grid>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml
new file mode 100644
index 000000000..9762ef621
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml
@@ -0,0 +1,20 @@
+<UserControl x:Class="Tango.PPC.UI.Views.PowerOffView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+			 xmlns:vm="clr-namespace:Tango.PPC.UI.ViewModels"
+			 xmlns:global="clr-namespace:Tango.PPC.UI"
+             xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
+             xmlns:local="clr-namespace:Tango.PPC.UI.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="1280" d:DesignWidth="800" Background="{StaticResource TangoPrimaryBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:PowerOffViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.PowerOffViewVM}">
+    <Grid>
+        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <touch:TouchGifAnimation Source="/Images/power_off.gif" EnableAnimation="{Binding IsVisible}" HorizontalAlignment="Center" />
+            <TextBlock HorizontalAlignment="Center" Margin="0 60 0 0" FontSize="{StaticResource TangoHeaderFontSize}">Machine is turning Off</TextBlock>
+            <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0" FontSize="{StaticResource TangoTitleFontSize}" Foreground="{StaticResource TangoGrayTextBrush}">Do not unplug machine while turning off</TextBlock>
+            <touch:TouchButton Command="{Binding AbortCommand}" Style="{StaticResource TangoHollowButton}" Margin="0 100 0 0" HorizontalAlignment="Center" Width="200" Height="50">ABORT</touch:TouchButton>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml.cs
new file mode 100644
index 000000000..ead34ae12
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/PowerOffView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.PPC.UI.Views
+{
+    /// <summary>
+    /// Interaction logic for LoadingView.xaml
+    /// </summary>
+    public partial class PowerOffView : UserControl
+    {
+        public PowerOffView()
+        {
+            InitializeComponent();
+        }
+    }
+}