2 files changed, 18 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs
index 8df0a7fb8..1fcdb4410 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/INavigationManager.cs
@@ -13,6 +13,11 @@ namespace Tango.PPC.Common.Navigation
     public interface INavigationManager
     {
         /// <summary>
+        /// Occurs when the current view model has changed.
+        /// </summary>
+        event EventHandler<PPCViewModel> CurrentVMChanged;
+
+        /// <summary>
         /// Gets the current module.
         /// </summary>
         IPPCModule CurrentModule { get; }
@@ -28,6 +33,16 @@ namespace Tango.PPC.Common.Navigation
         bool CanNavigateBack { get; }
 
         /// <summary>
+        /// Gets a value indicating whether the back should be enabled.
+        /// </summary>
+        bool IsBackEnabled { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the navigation system is currently navigating.
+        /// </summary>
+        bool IsNavigating { get; set; }
+
+        /// <summary>
         /// Navigates to the previous view if <see cref="CanNavigateBack"/> is true.
         /// </summary>
         Task<bool> NavigateBack();
@@ -79,7 +94,7 @@ namespace Tango.PPC.Common.Navigation
         /// Navigates to the specified module and view by full path (e.g Jobs.JobsView).
         /// </summary>
         /// <param name="fullPath">The full path.</param>
-        Task<bool> NavigateTo(String fullPath, bool pushToHistory = true);
+        Task<bool> NavigateTo(String fullPath, bool pushToHistory = true, Action<PPCViewModel, PPCViewModel> onNavigating = null, Action<PPCViewModel, PPCViewModel> onNavigated = null);
 
         /// <summary>
         /// Navigates to the specified module and view with the specified object and expecting a return parameter.
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/NavigationView.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/NavigationView.cs
index b4562054c..643908e87 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/NavigationView.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Navigation/NavigationView.cs
@@ -22,6 +22,7 @@ namespace Tango.PPC.Common.Navigation
         HomeModule,
         ShutdownView,
         RestartingSystemView,
-        EmergencyView
+        EmergencyView,
+        RestartingView,
     }
 }