diff --git a/ZitiTunneler/App.config b/DesktopEdge/App.config
similarity index 100%
rename from ZitiTunneler/App.config
rename to DesktopEdge/App.config
diff --git a/ZitiTunneler/App.xaml b/DesktopEdge/App.xaml
similarity index 98%
rename from ZitiTunneler/App.xaml
rename to DesktopEdge/App.xaml
index fa730afb..876e1d58 100644
--- a/ZitiTunneler/App.xaml
+++ b/DesktopEdge/App.xaml
@@ -1,7 +1,7 @@
-<Application x:Class="ZitiTunneler.App"
+<Application x:Class="ZitiDesktopEdge.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              ShutdownMode="OnExplicitShutdown"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
diff --git a/ZitiTunneler/App.xaml.cs b/DesktopEdge/App.xaml.cs
similarity index 90%
rename from ZitiTunneler/App.xaml.cs
rename to DesktopEdge/App.xaml.cs
index 2418dc42..d79bc3d8 100644
--- a/ZitiTunneler/App.xaml.cs
+++ b/DesktopEdge/App.xaml.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
 	/// <summary>
 	/// Interaction logic for App.xaml
 	/// </summary>
diff --git a/ZitiTunneler/Assets/Fonts/open_sans.ttf b/DesktopEdge/Assets/Fonts/open_sans.ttf
similarity index 100%
rename from ZitiTunneler/Assets/Fonts/open_sans.ttf
rename to DesktopEdge/Assets/Fonts/open_sans.ttf
diff --git a/ZitiTunneler/Assets/Fonts/russo_one.ttf b/DesktopEdge/Assets/Fonts/russo_one.ttf
similarity index 100%
rename from ZitiTunneler/Assets/Fonts/russo_one.ttf
rename to DesktopEdge/Assets/Fonts/russo_one.ttf
diff --git a/ZitiTunneler/Assets/Images/Ziti-Green.png b/DesktopEdge/Assets/Images/Ziti-Green.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/Ziti-Green.png
rename to DesktopEdge/Assets/Images/Ziti-Green.png
diff --git a/ZitiTunneler/Assets/Images/Ziti-Red.png b/DesktopEdge/Assets/Images/Ziti-Red.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/Ziti-Red.png
rename to DesktopEdge/Assets/Images/Ziti-Red.png
diff --git a/ZitiTunneler/Assets/Images/Ziti-White.png b/DesktopEdge/Assets/Images/Ziti-White.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/Ziti-White.png
rename to DesktopEdge/Assets/Images/Ziti-White.png
diff --git a/ZitiTunneler/Assets/Images/about.png b/DesktopEdge/Assets/Images/about.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/about.png
rename to DesktopEdge/Assets/Images/about.png
diff --git a/ZitiTunneler/Assets/Images/advanced.png b/DesktopEdge/Assets/Images/advanced.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/advanced.png
rename to DesktopEdge/Assets/Images/advanced.png
diff --git a/ZitiTunneler/Assets/Images/appicon.png b/DesktopEdge/Assets/Images/appicon.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/appicon.png
rename to DesktopEdge/Assets/Images/appicon.png
diff --git a/ZitiTunneler/Assets/Images/back.png b/DesktopEdge/Assets/Images/back.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/back.png
rename to DesktopEdge/Assets/Images/back.png
diff --git a/ZitiTunneler/Assets/Images/background.png b/DesktopEdge/Assets/Images/background.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/background.png
rename to DesktopEdge/Assets/Images/background.png
diff --git a/ZitiTunneler/Assets/Images/bubble.png b/DesktopEdge/Assets/Images/bubble.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/bubble.png
rename to DesktopEdge/Assets/Images/bubble.png
diff --git a/ZitiTunneler/Assets/Images/card.png b/DesktopEdge/Assets/Images/card.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/card.png
rename to DesktopEdge/Assets/Images/card.png
diff --git a/ZitiTunneler/Assets/Images/close.png b/DesktopEdge/Assets/Images/close.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/close.png
rename to DesktopEdge/Assets/Images/close.png
diff --git a/ZitiTunneler/Assets/Images/closer.png b/DesktopEdge/Assets/Images/closer.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/closer.png
rename to DesktopEdge/Assets/Images/closer.png
diff --git a/ZitiTunneler/Assets/Images/connect.png b/DesktopEdge/Assets/Images/connect.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/connect.png
rename to DesktopEdge/Assets/Images/connect.png
diff --git a/ZitiTunneler/Assets/Images/connected.png b/DesktopEdge/Assets/Images/connected.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/connected.png
rename to DesktopEdge/Assets/Images/connected.png
diff --git a/ZitiTunneler/Assets/Images/dashboard.png b/DesktopEdge/Assets/Images/dashboard.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/dashboard.png
rename to DesktopEdge/Assets/Images/dashboard.png
diff --git a/ZitiTunneler/Assets/Images/detach.png b/DesktopEdge/Assets/Images/detach.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/detach.png
rename to DesktopEdge/Assets/Images/detach.png
diff --git a/ZitiTunneler/Assets/Images/down.png b/DesktopEdge/Assets/Images/down.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/down.png
rename to DesktopEdge/Assets/Images/down.png
diff --git a/ZitiTunneler/Assets/Images/feedback.png b/DesktopEdge/Assets/Images/feedback.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/feedback.png
rename to DesktopEdge/Assets/Images/feedback.png
diff --git a/ZitiTunneler/Assets/Images/globe.png b/DesktopEdge/Assets/Images/globe.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/globe.png
rename to DesktopEdge/Assets/Images/globe.png
diff --git a/ZitiTunneler/Assets/Images/hamburger.png b/DesktopEdge/Assets/Images/hamburger.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/hamburger.png
rename to DesktopEdge/Assets/Images/hamburger.png
diff --git a/ZitiTunneler/Assets/Images/header.png b/DesktopEdge/Assets/Images/header.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/header.png
rename to DesktopEdge/Assets/Images/header.png
diff --git a/ZitiTunneler/Assets/Images/icon.ico b/DesktopEdge/Assets/Images/icon.ico
similarity index 100%
rename from ZitiTunneler/Assets/Images/icon.ico
rename to DesktopEdge/Assets/Images/icon.ico
diff --git a/ZitiTunneler/Assets/Images/icon.png b/DesktopEdge/Assets/Images/icon.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/icon.png
rename to DesktopEdge/Assets/Images/icon.png
diff --git a/ZitiTunneler/Assets/Images/identity.png b/DesktopEdge/Assets/Images/identity.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/identity.png
rename to DesktopEdge/Assets/Images/identity.png
diff --git a/ZitiTunneler/Assets/Images/jwt.png b/DesktopEdge/Assets/Images/jwt.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/jwt.png
rename to DesktopEdge/Assets/Images/jwt.png
diff --git a/ZitiTunneler/Assets/Images/lastArrow.png b/DesktopEdge/Assets/Images/lastArrow.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/lastArrow.png
rename to DesktopEdge/Assets/Images/lastArrow.png
diff --git a/ZitiTunneler/Assets/Images/loading.png b/DesktopEdge/Assets/Images/loading.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/loading.png
rename to DesktopEdge/Assets/Images/loading.png
diff --git a/ZitiTunneler/Assets/Images/logo.png b/DesktopEdge/Assets/Images/logo.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/logo.png
rename to DesktopEdge/Assets/Images/logo.png
diff --git a/ZitiTunneler/Assets/Images/logs.png b/DesktopEdge/Assets/Images/logs.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/logs.png
rename to DesktopEdge/Assets/Images/logs.png
diff --git a/ZitiTunneler/Assets/Images/next.png b/DesktopEdge/Assets/Images/next.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/next.png
rename to DesktopEdge/Assets/Images/next.png
diff --git a/ZitiTunneler/Assets/Images/nextArrow.png b/DesktopEdge/Assets/Images/nextArrow.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/nextArrow.png
rename to DesktopEdge/Assets/Images/nextArrow.png
diff --git a/ZitiTunneler/Assets/Images/off.png b/DesktopEdge/Assets/Images/off.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/off.png
rename to DesktopEdge/Assets/Images/off.png
diff --git a/ZitiTunneler/Assets/Images/offline.png b/DesktopEdge/Assets/Images/offline.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/offline.png
rename to DesktopEdge/Assets/Images/offline.png
diff --git a/ZitiTunneler/Assets/Images/on.png b/DesktopEdge/Assets/Images/on.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/on.png
rename to DesktopEdge/Assets/Images/on.png
diff --git a/ZitiTunneler/Assets/Images/online.png b/DesktopEdge/Assets/Images/online.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/online.png
rename to DesktopEdge/Assets/Images/online.png
diff --git a/ZitiTunneler/Assets/Images/open.png b/DesktopEdge/Assets/Images/open.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/open.png
rename to DesktopEdge/Assets/Images/open.png
diff --git a/ZitiTunneler/Assets/Images/privacy.png b/DesktopEdge/Assets/Images/privacy.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/privacy.png
rename to DesktopEdge/Assets/Images/privacy.png
diff --git a/ZitiTunneler/Assets/Images/qr.png b/DesktopEdge/Assets/Images/qr.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/qr.png
rename to DesktopEdge/Assets/Images/qr.png
diff --git a/ZitiTunneler/Assets/Images/select.png b/DesktopEdge/Assets/Images/select.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/select.png
rename to DesktopEdge/Assets/Images/select.png
diff --git a/ZitiTunneler/Assets/Images/server.png b/DesktopEdge/Assets/Images/server.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/server.png
rename to DesktopEdge/Assets/Images/server.png
diff --git a/ZitiTunneler/Assets/Images/support.png b/DesktopEdge/Assets/Images/support.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/support.png
rename to DesktopEdge/Assets/Images/support.png
diff --git a/ZitiTunneler/Assets/Images/up.png b/DesktopEdge/Assets/Images/up.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/up.png
rename to DesktopEdge/Assets/Images/up.png
diff --git a/ZitiTunneler/Assets/Images/wrench.png b/DesktopEdge/Assets/Images/wrench.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/wrench.png
rename to DesktopEdge/Assets/Images/wrench.png
diff --git a/ZitiTunneler/Assets/Images/x.png b/DesktopEdge/Assets/Images/x.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/x.png
rename to DesktopEdge/Assets/Images/x.png
diff --git a/ZitiTunneler/Assets/Images/z.png b/DesktopEdge/Assets/Images/z.png
similarity index 100%
rename from ZitiTunneler/Assets/Images/z.png
rename to DesktopEdge/Assets/Images/z.png
diff --git a/ZitiTunneler/Assets/Images/ziti-green.ico b/DesktopEdge/Assets/Images/ziti-green.ico
similarity index 100%
rename from ZitiTunneler/Assets/Images/ziti-green.ico
rename to DesktopEdge/Assets/Images/ziti-green.ico
diff --git a/ZitiTunneler/Assets/Images/ziti-red.ico b/DesktopEdge/Assets/Images/ziti-red.ico
similarity index 100%
rename from ZitiTunneler/Assets/Images/ziti-red.ico
rename to DesktopEdge/Assets/Images/ziti-red.ico
diff --git a/ZitiTunneler/Assets/Images/ziti-white.ico b/DesktopEdge/Assets/Images/ziti-white.ico
similarity index 100%
rename from ZitiTunneler/Assets/Images/ziti-white.ico
rename to DesktopEdge/Assets/Images/ziti-white.ico
diff --git a/ZitiTunneler/ControllerScreen.xaml b/DesktopEdge/ControllerScreen.xaml
similarity index 79%
rename from ZitiTunneler/ControllerScreen.xaml
rename to DesktopEdge/ControllerScreen.xaml
index 0f6633a5..4d9eed8b 100644
--- a/ZitiTunneler/ControllerScreen.xaml
+++ b/DesktopEdge/ControllerScreen.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.ControllerScreen"
+<UserControl x:Class="ZitiDesktopEdge.ControllerScreen"
              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:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/ZitiTunneler/ControllerScreen.xaml.cs b/DesktopEdge/ControllerScreen.xaml.cs
similarity index 95%
rename from ZitiTunneler/ControllerScreen.xaml.cs
rename to DesktopEdge/ControllerScreen.xaml.cs
index 1d922775..f3d584d1 100644
--- a/ZitiTunneler/ControllerScreen.xaml.cs
+++ b/DesktopEdge/ControllerScreen.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
 	/// <summary>
 	/// Interaction logic for ControllerScreen.xaml
 	/// </summary>
diff --git a/ZitiTunneler/IdentityDetails.xaml b/DesktopEdge/IdentityDetails.xaml
similarity index 97%
rename from ZitiTunneler/IdentityDetails.xaml
rename to DesktopEdge/IdentityDetails.xaml
index e7d0251b..027e222c 100644
--- a/ZitiTunneler/IdentityDetails.xaml
+++ b/DesktopEdge/IdentityDetails.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.IdentityDetails"
+<UserControl x:Class="ZitiDesktopEdge.IdentityDetails"
              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:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              x:Name="IdentityArea"
              d:DesignHeight="500" d:DesignWidth="350">
diff --git a/ZitiTunneler/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs
similarity index 98%
rename from ZitiTunneler/IdentityDetails.xaml.cs
rename to DesktopEdge/IdentityDetails.xaml.cs
index 3c0bd255..5aea08d9 100644
--- a/ZitiTunneler/IdentityDetails.xaml.cs
+++ b/DesktopEdge/IdentityDetails.xaml.cs
@@ -12,9 +12,9 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using ZitiTunneler.Models;
+using ZitiDesktopEdge.Models;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
 	/// <summary>
 	/// Interaction logic for IdentityDetails.xaml
 	/// </summary> 
diff --git a/ZitiTunneler/IdentityItem.xaml b/DesktopEdge/IdentityItem.xaml
similarity index 96%
rename from ZitiTunneler/IdentityItem.xaml
rename to DesktopEdge/IdentityItem.xaml
index 7d0eda60..3fc3f4aa 100644
--- a/ZitiTunneler/IdentityItem.xaml
+++ b/DesktopEdge/IdentityItem.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.IdentityItem"
+<UserControl x:Class="ZitiDesktopEdge.IdentityItem"
              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:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="60" d:DesignWidth="375" Height="60">
     <Canvas MouseEnter="Canvas_MouseEnter" MouseLeave="Canvas_MouseLeave">
diff --git a/ZitiTunneler/IdentityItem.xaml.cs b/DesktopEdge/IdentityItem.xaml.cs
similarity index 97%
rename from ZitiTunneler/IdentityItem.xaml.cs
rename to DesktopEdge/IdentityItem.xaml.cs
index e1bcb844..a601218b 100644
--- a/ZitiTunneler/IdentityItem.xaml.cs
+++ b/DesktopEdge/IdentityItem.xaml.cs
@@ -12,9 +12,9 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using ZitiTunneler.Models;
+using ZitiDesktopEdge.Models;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
 	/// <summary>
 	/// User Control to list Identities and give status
 	/// </summary>
diff --git a/ZitiTunneler/MainMenu.xaml b/DesktopEdge/MainMenu.xaml
similarity index 95%
rename from ZitiTunneler/MainMenu.xaml
rename to DesktopEdge/MainMenu.xaml
index 4c36e7f5..1c4c1677 100644
--- a/ZitiTunneler/MainMenu.xaml
+++ b/DesktopEdge/MainMenu.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.MainMenu"
+<UserControl x:Class="ZitiDesktopEdge.MainMenu"
              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:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              x:Name="MainMenuArea"
              d:DesignHeight="400" d:DesignWidth="350" Margin="1,1,1,1">
@@ -71,7 +71,7 @@
                 <StackPanel Name="AboutItemsButton" Orientation="Vertical" HorizontalAlignment="Stretch" Visibility="Collapsed">
                     <Label Name="ServiceVersion" HorizontalAlignment="Center" FontSize="10" Foreground="#638190" Margin="0,-20,0,0" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"></Label>
                 </StackPanel>
-                <Label Name="MainItemsButton" Margin="0,30,0,0" Foreground="#F4044D" FontWeight="SemiBold" Content="Quit Ziti Tunneler" Cursor="Hand" MouseDown="CloseApp" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" HorizontalAlignment="Center"></Label>
+                <Label Name="MainItemsButton" Margin="0,30,0,0" Foreground="#F4044D" FontWeight="SemiBold" Content="Quit Ziti Desktop Edge" Cursor="Hand" MouseDown="CloseApp" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" HorizontalAlignment="Center"></Label>
             </StackPanel>
         </Grid>
     </Grid>
diff --git a/ZitiTunneler/MainMenu.xaml.cs b/DesktopEdge/MainMenu.xaml.cs
similarity index 95%
rename from ZitiTunneler/MainMenu.xaml.cs
rename to DesktopEdge/MainMenu.xaml.cs
index ec1c812e..4852156f 100644
--- a/ZitiTunneler/MainMenu.xaml.cs
+++ b/DesktopEdge/MainMenu.xaml.cs
@@ -5,9 +5,9 @@ using System.Diagnostics;
 using System;
 using System.Threading;
 using System.Management.Automation;
-using ZitiTunneler.Models;
+using ZitiDesktopEdge.Models;
 
-namespace ZitiTunneler
+namespace ZitiDesktopEdge
 {	
     /// <summary>
     /// Interaction logic for MainMenu.xaml
@@ -130,10 +130,10 @@ namespace ZitiTunneler
 			Process.Start(new ProcessStartInfo("https://netfoundry.io/terms") { UseShellExecute = true });
 		}
 		private void ShowFeedback(object sender, MouseButtonEventArgs e) {
-			Process.Start(new ProcessStartInfo("mailto:support@netfoundry.io") { UseShellExecute = true });
+			Process.Start(new ProcessStartInfo("mailto:ziti-support@netfoundry.io") { UseShellExecute = true });
 		}
 		private void ShowSupport(object sender, MouseButtonEventArgs e) {
-			Process.Start(new ProcessStartInfo("https://support.netfoundry.io") { UseShellExecute = true });
+			Process.Start(new ProcessStartInfo("https://openziti.discourse.group/") { UseShellExecute = true });
 		}
 
 		private void DetachWindow(object sender, MouseButtonEventArgs e) {
diff --git a/ZitiTunneler/MainWindow.xaml b/DesktopEdge/MainWindow.xaml
similarity index 97%
rename from ZitiTunneler/MainWindow.xaml
rename to DesktopEdge/MainWindow.xaml
index e777c23d..d1c0d86a 100644
--- a/ZitiTunneler/MainWindow.xaml
+++ b/DesktopEdge/MainWindow.xaml
@@ -1,19 +1,22 @@
-<Window x:Class="ZitiTunneler.MainWindow"
+<Window x:Class="ZitiDesktopEdge.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:ZitiTunneler"
+        xmlns:local="clr-namespace:ZitiDesktopEdge"
         mc:Ignorable="d"
         ShowInTaskbar="False"
         x:Name="MainUI"
-        Title="ZitiTunneler" Height="520" 
+        Title="Ziti Desktop Edge" Height="520" 
         Width="350" ResizeMode="NoResize" 
         ClipToBounds="False"
         Icon="Assets/Images/icon.png" AllowsTransparency="True" 
         Closing="Window_Closing"
         WindowStyle="None" Loaded="MainWindow1_Loaded" Deactivated="MainUI_Deactivated" Activated="MainUI_Activated" Background="#000F0F23">
     <Window.Resources>
+        <Style TargetType="Image">
+            <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />
+        </Style>
         <SolidColorBrush x:Key="ProgressBar.Progress" Color="#FF06B025"/>
         <SolidColorBrush x:Key="ProgressBar.Background" Color="#FFE6E6E6"/>
         <SolidColorBrush x:Key="ProgressBar.Border" Color="#FFBCBCBC"/>
@@ -215,7 +218,7 @@
                 </Grid.RowDefinitions>
                 <Label Foreground="White" Content="Service Not Started" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"/>
                 <Label Foreground="LightGray" Content="Start the Ziti Tunnel Service to get started" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans"/>
-                <Label Name="QuitButton" Grid.Row="3" Foreground="#F4044D" FontWeight="SemiBold" Content="Quit Ziti Tunneler" Cursor="Hand" MouseDown="CloseApp" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" HorizontalAlignment="Center"></Label>
+                <Label Name="QuitButton" Grid.Row="3" Foreground="#F4044D" FontWeight="SemiBold" Content="Quit Ziti Desktop Edge" Cursor="Hand" MouseDown="CloseApp" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" HorizontalAlignment="Center"></Label>
             </Grid>
         </Grid>
         <Grid x:Name="LoadingScreen" Visibility="Collapsed" Width="350">
diff --git a/ZitiTunneler/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs
similarity index 96%
rename from ZitiTunneler/MainWindow.xaml.cs
rename to DesktopEdge/MainWindow.xaml.cs
index e4ec807c..8a538d7f 100644
--- a/ZitiTunneler/MainWindow.xaml.cs
+++ b/DesktopEdge/MainWindow.xaml.cs
@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Input;
 using System.IO;
-using ZitiTunneler.Models;
+using ZitiDesktopEdge.Models;
 using System.IO.Compression;
 
-using ZitiTunneler.ServiceClient;
+using ZitiDesktopEdge.ServiceClient;
 using System.ServiceProcess;
 using System.Linq;
 using System.Runtime.Remoting.Messaging;
@@ -18,7 +18,7 @@ using System.Threading.Tasks;
 using System.Threading;
 using System.Text;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
 
 	/// <summary>
 	/// Interaction logic for MainWindow.xaml
@@ -64,6 +64,8 @@ namespace ZitiTunneler {
 
 			App.Current.MainWindow.WindowState = WindowState.Normal;
 			App.Current.MainWindow.Closing += MainWindow_Closing;
+			App.Current.MainWindow.Deactivated += MainWindow_Deactivated;
+			App.Current.MainWindow.Activated += MainWindow_Activated;
 			notifyIcon = new System.Windows.Forms.NotifyIcon();
 			notifyIcon.Visible = true;
 			notifyIcon.Click += TargetNotifyIcon_Click;
@@ -76,6 +78,14 @@ namespace ZitiTunneler {
 			InitializeComponent();
 		}
 
+		private void MainWindow_Activated(object sender, EventArgs e) {
+			this.Visibility = Visibility.Visible;
+		}
+
+		private void MainWindow_Deactivated(object sender, EventArgs e) {
+			this.Visibility = Visibility.Collapsed;
+		}
+
 		private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) {
 			notifyIcon.Visible = false;
 			notifyIcon.Icon.Dispose();
@@ -343,8 +353,10 @@ namespace ZitiTunneler {
 				IdList.Height += 60;
 			}
 			var desktopWorkingArea = System.Windows.SystemParameters.WorkArea;
-			this.Left = desktopWorkingArea.Right-this.Width-_right;
-			this.Top = desktopWorkingArea.Bottom-this.Height-_bottom;
+			if (this._isAttached) {
+				this.Left = desktopWorkingArea.Right - this.Width - _right;
+				this.Top = desktopWorkingArea.Bottom - this.Height - _bottom;
+			}
 		}
 
 		private void OpenIdentity(ZitiIdentity identity) {
diff --git a/ZitiTunneler/MenuEditItem.xaml b/DesktopEdge/MenuEditItem.xaml
similarity index 92%
rename from ZitiTunneler/MenuEditItem.xaml
rename to DesktopEdge/MenuEditItem.xaml
index be1332b8..10c04ec3 100644
--- a/ZitiTunneler/MenuEditItem.xaml
+++ b/DesktopEdge/MenuEditItem.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.MenuEditItem"
+<UserControl x:Class="ZitiDesktopEdge.MenuEditItem"
              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:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="50" HorizontalAlignment="Stretch" d:DesignWidth="350" Cursor="Hand">
     <Grid>
diff --git a/ZitiTunneler/MenuEditItem.xaml.cs b/DesktopEdge/MenuEditItem.xaml.cs
similarity index 97%
rename from ZitiTunneler/MenuEditItem.xaml.cs
rename to DesktopEdge/MenuEditItem.xaml.cs
index 7e55b604..14aa8075 100644
--- a/ZitiTunneler/MenuEditItem.xaml.cs
+++ b/DesktopEdge/MenuEditItem.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
     /// <summary>
     /// Interaction logic for MenuItem.xaml
     /// </summary>
diff --git a/ZitiTunneler/MenuItem.xaml b/DesktopEdge/MenuItem.xaml
similarity index 96%
rename from ZitiTunneler/MenuItem.xaml
rename to DesktopEdge/MenuItem.xaml
index 51d0296e..7cb19dfe 100644
--- a/ZitiTunneler/MenuItem.xaml
+++ b/DesktopEdge/MenuItem.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.MenuItem"
+<UserControl x:Class="ZitiDesktopEdge.MenuItem"
              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:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="50" HorizontalAlignment="Stretch" d:DesignWidth="375" Cursor="Hand">
     <UserControl.Triggers>
diff --git a/ZitiTunneler/MenuItem.xaml.cs b/DesktopEdge/MenuItem.xaml.cs
similarity index 97%
rename from ZitiTunneler/MenuItem.xaml.cs
rename to DesktopEdge/MenuItem.xaml.cs
index 156ac5e5..dd4da3c3 100644
--- a/ZitiTunneler/MenuItem.xaml.cs
+++ b/DesktopEdge/MenuItem.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
     /// <summary>
     /// Interaction logic for MenuItem.xaml
     /// </summary>
diff --git a/ZitiTunneler/Models/UILog.cs b/DesktopEdge/Models/UILog.cs
similarity index 93%
rename from ZitiTunneler/Models/UILog.cs
rename to DesktopEdge/Models/UILog.cs
index fc157a6d..af73adbb 100644
--- a/ZitiTunneler/Models/UILog.cs
+++ b/DesktopEdge/Models/UILog.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace ZitiTunneler.Models {
+namespace ZitiDesktopEdge.Models {
 	public class UILog {
 
 		private static string _logDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "NetFoundry" ,"Logs", "Log.log");
diff --git a/ZitiTunneler/Models/UIModel.cs b/DesktopEdge/Models/UIModel.cs
similarity index 87%
rename from ZitiTunneler/Models/UIModel.cs
rename to DesktopEdge/Models/UIModel.cs
index e8b5b46a..641877aa 100644
--- a/ZitiTunneler/Models/UIModel.cs
+++ b/DesktopEdge/Models/UIModel.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ZitiTunneler.Models
+namespace ZitiDesktopEdge.Models
 {
     static class UIModel
     {
diff --git a/ZitiTunneler/Models/ZitiIdentity.cs b/DesktopEdge/Models/ZitiIdentity.cs
similarity index 97%
rename from ZitiTunneler/Models/ZitiIdentity.cs
rename to DesktopEdge/Models/ZitiIdentity.cs
index 4278bd99..9af38425 100644
--- a/ZitiTunneler/Models/ZitiIdentity.cs
+++ b/DesktopEdge/Models/ZitiIdentity.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ZitiTunneler.Models {
+namespace ZitiDesktopEdge.Models {
 	public class ZitiIdentity {
 		public List<ZitiService> Services { get; set; }
 		public string Name { get; set; }
diff --git a/ZitiTunneler/Models/ZitiService.cs b/DesktopEdge/Models/ZitiService.cs
similarity index 90%
rename from ZitiTunneler/Models/ZitiService.cs
rename to DesktopEdge/Models/ZitiService.cs
index fa513ce1..f1f22583 100644
--- a/ZitiTunneler/Models/ZitiService.cs
+++ b/DesktopEdge/Models/ZitiService.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ZitiTunneler.Models {
+namespace ZitiDesktopEdge.Models {
     public class ZitiService {
 		public string Name { get; set; }
 		public string Url { get; set; }
diff --git a/ZitiTunneler/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs
similarity index 92%
rename from ZitiTunneler/Properties/AssemblyInfo.cs
rename to DesktopEdge/Properties/AssemblyInfo.cs
index d3db0749..9155285a 100644
--- a/ZitiTunneler/Properties/AssemblyInfo.cs
+++ b/DesktopEdge/Properties/AssemblyInfo.cs
@@ -7,12 +7,12 @@ using System.Windows;
 // 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: AssemblyTitle("ZitiTunneler")]
+[assembly: AssemblyTitle("Ziti Desktop Edge")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ZitiTunneler")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyProduct("Ziti Desktop Edge")]
+[assembly: AssemblyCopyright("Copyright NetFoundry ©  2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/ZitiTunneler/Properties/Resources.Designer.cs b/DesktopEdge/Properties/Resources.Designer.cs
similarity index 90%
rename from ZitiTunneler/Properties/Resources.Designer.cs
rename to DesktopEdge/Properties/Resources.Designer.cs
index 60ce376f..e73a18ff 100644
--- a/ZitiTunneler/Properties/Resources.Designer.cs
+++ b/DesktopEdge/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace ZitiTunneler.Properties {
+namespace Ziti.Desktop.Edge.Properties {
     using System;
-
-
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,19 +19,19 @@ namespace ZitiTunneler.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
-
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
@@ -39,13 +39,13 @@ namespace ZitiTunneler.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ZitiTunneler.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ziti.Desktop.Edge.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
diff --git a/ZitiTunneler/Properties/Resources.resx b/DesktopEdge/Properties/Resources.resx
similarity index 100%
rename from ZitiTunneler/Properties/Resources.resx
rename to DesktopEdge/Properties/Resources.resx
diff --git a/ZitiTunneler/Properties/Settings.Designer.cs b/DesktopEdge/Properties/Settings.Designer.cs
similarity index 91%
rename from ZitiTunneler/Properties/Settings.Designer.cs
rename to DesktopEdge/Properties/Settings.Designer.cs
index 4a310077..bd88d524 100644
--- a/ZitiTunneler/Properties/Settings.Designer.cs
+++ b/DesktopEdge/Properties/Settings.Designer.cs
@@ -8,15 +8,15 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace ZitiTunneler.Properties {
-
-
+namespace Ziti.Desktop.Edge.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
+        
         public static Settings Default {
             get {
                 return defaultInstance;
diff --git a/ZitiTunneler/Properties/Settings.settings b/DesktopEdge/Properties/Settings.settings
similarity index 100%
rename from ZitiTunneler/Properties/Settings.settings
rename to DesktopEdge/Properties/Settings.settings
diff --git a/ZitiTunneler/RegistrationScreen.xaml b/DesktopEdge/RegistrationScreen.xaml
similarity index 79%
rename from ZitiTunneler/RegistrationScreen.xaml
rename to DesktopEdge/RegistrationScreen.xaml
index d9d562d9..16bd3287 100644
--- a/ZitiTunneler/RegistrationScreen.xaml
+++ b/DesktopEdge/RegistrationScreen.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.RegistrationScreen"
+<UserControl x:Class="ZitiDesktopEdge.RegistrationScreen"
              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:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/ZitiTunneler/RegistrationScreen.xaml.cs b/DesktopEdge/RegistrationScreen.xaml.cs
similarity index 95%
rename from ZitiTunneler/RegistrationScreen.xaml.cs
rename to DesktopEdge/RegistrationScreen.xaml.cs
index 19b250d1..3bc20ca6 100644
--- a/ZitiTunneler/RegistrationScreen.xaml.cs
+++ b/DesktopEdge/RegistrationScreen.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
 	/// <summary>
 	/// Interaction logic for RegistrationScreen.xaml
 	/// </summary>
diff --git a/ZitiTunneler/ServiceClient/ClientImpl.cs b/DesktopEdge/ServiceClient/ClientImpl.cs
similarity index 99%
rename from ZitiTunneler/ServiceClient/ClientImpl.cs
rename to DesktopEdge/ServiceClient/ClientImpl.cs
index d4ce7a6b..517900f3 100644
--- a/ZitiTunneler/ServiceClient/ClientImpl.cs
+++ b/DesktopEdge/ServiceClient/ClientImpl.cs
@@ -22,7 +22,7 @@ using System.Windows.Documents;
 /// one or more messages returned.
 /// 
 /// </summary>
-namespace ZitiTunneler.ServiceClient
+namespace ZitiDesktopEdge.ServiceClient
 {
     internal class Client
     {
diff --git a/ZitiTunneler/ServiceClient/DataStructures.cs b/DesktopEdge/ServiceClient/DataStructures.cs
similarity index 99%
rename from ZitiTunneler/ServiceClient/DataStructures.cs
rename to DesktopEdge/ServiceClient/DataStructures.cs
index 61e4b1cd..6d904b60 100644
--- a/ZitiTunneler/ServiceClient/DataStructures.cs
+++ b/DesktopEdge/ServiceClient/DataStructures.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 /// These classes represent the data structures that are passed back and forth
 /// between the service and the client.
 /// </summary>
-namespace ZitiTunneler.ServiceClient
+namespace ZitiDesktopEdge.ServiceClient
 {
     class SvcResponse
     {
diff --git a/ZitiTunneler/ServiceInfo.xaml b/DesktopEdge/ServiceInfo.xaml
similarity index 92%
rename from ZitiTunneler/ServiceInfo.xaml
rename to DesktopEdge/ServiceInfo.xaml
index 24fe242d..91e678bd 100644
--- a/ZitiTunneler/ServiceInfo.xaml
+++ b/DesktopEdge/ServiceInfo.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.ServiceInfo"
+<UserControl x:Class="ZitiDesktopEdge.ServiceInfo"
              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:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="36" HorizontalAlignment="Stretch" d:DesignWidth="350" Cursor="Hand">
     <Grid>
diff --git a/ZitiTunneler/ServiceInfo.xaml.cs b/DesktopEdge/ServiceInfo.xaml.cs
similarity index 97%
rename from ZitiTunneler/ServiceInfo.xaml.cs
rename to DesktopEdge/ServiceInfo.xaml.cs
index 6653045e..dea597fb 100644
--- a/ZitiTunneler/ServiceInfo.xaml.cs
+++ b/DesktopEdge/ServiceInfo.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
     /// <summary>
     /// Interaction logic for MenuItem.xaml
     /// </summary>
diff --git a/ZitiTunneler/SubMenuItem.xaml b/DesktopEdge/SubMenuItem.xaml
similarity index 96%
rename from ZitiTunneler/SubMenuItem.xaml
rename to DesktopEdge/SubMenuItem.xaml
index 7147afe6..54028384 100644
--- a/ZitiTunneler/SubMenuItem.xaml
+++ b/DesktopEdge/SubMenuItem.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.SubMenuItem"
+<UserControl x:Class="ZitiDesktopEdge.SubMenuItem"
              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:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="50" HorizontalAlignment="Stretch" d:DesignWidth="375" Cursor="Hand">
     <UserControl.Triggers>
diff --git a/ZitiTunneler/SubMenuItem.xaml.cs b/DesktopEdge/SubMenuItem.xaml.cs
similarity index 96%
rename from ZitiTunneler/SubMenuItem.xaml.cs
rename to DesktopEdge/SubMenuItem.xaml.cs
index c06bebd4..5c9de79e 100644
--- a/ZitiTunneler/SubMenuItem.xaml.cs
+++ b/DesktopEdge/SubMenuItem.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
     /// <summary>
     /// Interaction logic for MenuItem.xaml
     /// </summary>
diff --git a/ZitiTunneler/Themes/Generic.xaml b/DesktopEdge/Themes/Generic.xaml
similarity index 77%
rename from ZitiTunneler/Themes/Generic.xaml
rename to DesktopEdge/Themes/Generic.xaml
index 253d4f7d..cd5d962e 100644
--- a/ZitiTunneler/Themes/Generic.xaml
+++ b/DesktopEdge/Themes/Generic.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:ZitiTunneler">
+    xmlns:local="clr-namespace:ZitiDesktopEdge">
 
 </ResourceDictionary>
diff --git a/ZitiTunneler/Toggler.resx b/DesktopEdge/Toggler.resx
similarity index 100%
rename from ZitiTunneler/Toggler.resx
rename to DesktopEdge/Toggler.resx
diff --git a/ZitiTunneler/Toggler.xaml b/DesktopEdge/Toggler.xaml
similarity index 94%
rename from ZitiTunneler/Toggler.xaml
rename to DesktopEdge/Toggler.xaml
index 06bc1188..f017c716 100644
--- a/ZitiTunneler/Toggler.xaml
+++ b/DesktopEdge/Toggler.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="ZitiTunneler.Toggler"
+<UserControl x:Class="ZitiDesktopEdge.Toggler"
              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:ZitiTunneler"
+             xmlns:local="clr-namespace:ZitiDesktopEdge"
              mc:Ignorable="d" 
              d:DesignHeight="20" d:DesignWidth="35" Width="35" Height="20" Padding="0,0,0,0" Loaded="OnLoad">
     <StackPanel Orientation="Vertical" Margin="0,0,0,0">
diff --git a/ZitiTunneler/Toggler.xaml.cs b/DesktopEdge/Toggler.xaml.cs
similarity index 98%
rename from ZitiTunneler/Toggler.xaml.cs
rename to DesktopEdge/Toggler.xaml.cs
index 4f9d416a..db532134 100644
--- a/ZitiTunneler/Toggler.xaml.cs
+++ b/DesktopEdge/Toggler.xaml.cs
@@ -14,7 +14,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Windows.Media.Animation;
 
-namespace ZitiTunneler {
+namespace ZitiDesktopEdge {
     /// <summary>
     /// Interaction logic for Toggler.xaml
     /// </summary>
diff --git a/ZitiTunneler/ZitiTunneler.csproj b/DesktopEdge/ZitiDesktopEdge.csproj
similarity index 98%
rename from ZitiTunneler/ZitiTunneler.csproj
rename to DesktopEdge/ZitiDesktopEdge.csproj
index 9c600c19..765c2ef5 100644
--- a/ZitiTunneler/ZitiTunneler.csproj
+++ b/DesktopEdge/ZitiDesktopEdge.csproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{FA4291EA-A97E-4854-959F-91EE7B330B37}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>ZitiTunneler</RootNamespace>
-    <AssemblyName>ZitiTunneler</AssemblyName>
+    <RootNamespace>Ziti.Desktop.Edge</RootNamespace>
+    <AssemblyName>ZitiDesktopEdge</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -28,7 +28,7 @@
     <MapFileExtensions>true</MapFileExtensions>
     <SupportUrl>https://support.netfoundry.io</SupportUrl>
     <TargetCulture>en-US</TargetCulture>
-    <ProductName>Ziti Tunneler</ProductName>
+    <ProductName>Ziti Desktop Edge</ProductName>
     <PublisherName>NetFoundry</PublisherName>
     <SuiteName>Ziti</SuiteName>
     <AutorunEnabled>true</AutorunEnabled>
@@ -235,7 +235,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="app.manifest" />
-    <None Include="ZitiTunneler_TemporaryKey.pfx" />
+    <None Include="ZitiDesktopEdge_TemporaryKey.pfx" />
     <Resource Include="Assets\Fonts\open_sans.ttf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
diff --git a/ZitiTunneler/app.manifest b/DesktopEdge/app.manifest
similarity index 100%
rename from ZitiTunneler/app.manifest
rename to DesktopEdge/app.manifest
diff --git a/ZitiTunneler/packages.config b/DesktopEdge/packages.config
similarity index 100%
rename from ZitiTunneler/packages.config
rename to DesktopEdge/packages.config
diff --git a/ZitiTunneler/ziti.ico b/DesktopEdge/ziti.ico
similarity index 100%
rename from ZitiTunneler/ziti.ico
rename to DesktopEdge/ziti.ico
diff --git a/README.md b/README.md
index 3d4d257e..1ec5b193 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# Ziti Tunnel for Windows
+# Ziti Desktop Edge for Windows
 
 (the uwp project which used to be here has moved to [uwp-vpnplugin-archive](.uwp-vpnplugin-archive) and is likely abandoned)
 
-The Ziti Tunnel for Windows is an application that is necessary to integrate applications which cannot embed a Ziti SDK
+The Ziti Desktop Edge for Windows is an application that is necessary to integrate applications which cannot embed a Ziti SDK
 directly into the application. This is colloquially known as a "brown field" Ziti-enabled application because the app
 itself has no understanding that it has been Ziti-enabled.
 
diff --git a/ZitiUWPSolution.sln b/ZitiDesktopEdge.sln
similarity index 96%
rename from ZitiUWPSolution.sln
rename to ZitiDesktopEdge.sln
index dbf08b50..7ce876dc 100644
--- a/ZitiUWPSolution.sln
+++ b/ZitiDesktopEdge.sln
@@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiTunneler", "ZitiTunneler\ZitiTunneler.csproj", "{FA4291EA-A97E-4854-959F-91EE7B330B37}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiDesktopEdge", "DesktopEdge\ZitiDesktopEdge.csproj", "{FA4291EA-A97E-4854-959F-91EE7B330B37}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZitiUpdateService", "ZitiUpdateService\ZitiUpdateService.csproj", "{9AB81609-F5DD-40A6-87B5-F3279D48514D}"
 EndProject
diff --git a/ZitiUpdateService/UpdateService.cs b/ZitiUpdateService/UpdateService.cs
index 1cd46eb7..2d0f2521 100644
--- a/ZitiUpdateService/UpdateService.cs
+++ b/ZitiUpdateService/UpdateService.cs
@@ -41,8 +41,7 @@ namespace ZitiUpdateService {
 			InitializeComponent();
 		}
 
-		public void Debug()
-		{
+		public void Debug() {
 			OnStart(null);
 		}
 
@@ -70,15 +69,13 @@ namespace ZitiUpdateService {
 
 			var serviceTimerInterval = ConfigurationManager.AppSettings.Get("ServiceTimer");
 			var serviceInt = TimeSpan.Zero;
-			if (!TimeSpan.TryParse(serviceTimerInterval, out serviceInt))
-			{
+			if (!TimeSpan.TryParse(serviceTimerInterval, out serviceInt)) {
 				serviceInt = new TimeSpan(0, 1, 0);
 			}
 
 			var updateTimerInterval = ConfigurationManager.AppSettings.Get("UpdateTimer");
 			var upInt = TimeSpan.Zero;
-			if (!TimeSpan.TryParse(updateTimerInterval, out upInt))
-			{
+			if (!TimeSpan.TryParse(updateTimerInterval, out upInt)) {
 				upInt = new TimeSpan(0, 1, 0);
 			}
 
@@ -103,8 +100,7 @@ namespace ZitiUpdateService {
 		private void CheckUpdate(object sender, ElapsedEventArgs e) {
 			if (inUpdateCheck) return;
 			inUpdateCheck = true; //simple semaphone
-			try
-			{
+			try {
 				var request = WebRequest.Create(_versionUrl) as HttpWebRequest;
 				var response = request.GetResponse();
 				Stream receiveStream = response.GetResponseStream();
@@ -114,14 +110,11 @@ namespace ZitiUpdateService {
 				xmlDoc.LoadXml(result);
 				XmlNode node = xmlDoc.SelectSingleNode("metadata/versioning/" + _versionType);
 				string version = node.InnerText;
-				Log("Version Checked: " + version + " on " + _version + " from " + _versionType);
-				if (version != _version)
-				{
+				if (version != _version) {
 					Log("Version Checked: " + version + " on " + _version + " from " + _versionType);
 					UpdateServiceFiles(version);
 				}
-			} catch
-            {
+			} catch {
 
             }
 			inUpdateCheck = false;
@@ -130,25 +123,19 @@ namespace ZitiUpdateService {
 		private void CheckService(object sender, ElapsedEventArgs e) {
 			if (inServiceCheck || inUpdateCheck) return;
 			inServiceCheck = true; //simple semaphone
-			try
-			{
+			try {
 				controller = ServiceController.GetServices().FirstOrDefault(s => s.ServiceName == "ziti");
 				if (controller == null) return; //means it's not installed or the user doesn't have privs
 
-				if (controller.Status == ServiceControllerStatus.Stopped || controller.Status == ServiceControllerStatus.StopPending)
-				{
-					if (_isJustStopped)
-					{
+				if (controller.Status == ServiceControllerStatus.Stopped || controller.Status == ServiceControllerStatus.StopPending) {
+					if (_isJustStopped) {
 						_isJustStopped = false;
 						Log("Ziti Service has been stopped, update Network");
 						//should not be necessary in v0.0.10+ RunScript();
 						StartZiti();
 					}
-				}
-				else
-				{
-					if (controller.Status == ServiceControllerStatus.Running)
-					{
+				} else {
+					if (controller.Status == ServiceControllerStatus.Running) {
 						_isJustStopped = true;
 					}
 				}
@@ -170,8 +157,7 @@ namespace ZitiUpdateService {
 			string version = node.InnerText;
 			Log("Got Version: " + version+" from "+_versionType);
 
-			if (_version.Trim() == currentVersion.Trim())
-			{
+			if (_version.Trim() == currentVersion.Trim()) {
 				_version = currentVersion;
 				Log("Version local is the same as the version remote: " + version);
 				return;
@@ -237,7 +223,7 @@ namespace ZitiUpdateService {
 
 		private void StartZiti() {
 			controller = ServiceController.GetServices().FirstOrDefault(s => s.ServiceName == "ziti");
-			if (controller.Status != ServiceControllerStatus.Running) {
+			if (controller != null && controller.Status != ServiceControllerStatus.Running) {
 				try {
 					Log("Starting Service");
 					controller.Start();
diff --git a/ZitiWintunInstaller.sln b/ZitiWintunInstaller.sln
new file mode 100644
index 00000000..08823b4c
--- /dev/null
+++ b/ZitiWintunInstaller.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29318.209
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D66B1C6A-ADFE-437E-B037-C4C849A6CA97}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ZitiWintunInstaller", "ZitiWintunInstaller\ZitiWintunInstaller.wixproj", "{1A5D850F-2E38-4524-8745-29A96FA62683}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1A5D850F-2E38-4524-8745-29A96FA62683}.Debug|x86.ActiveCfg = Debug|x86
+		{1A5D850F-2E38-4524-8745-29A96FA62683}.Debug|x86.Build.0 = Debug|x86
+		{1A5D850F-2E38-4524-8745-29A96FA62683}.Release|x86.ActiveCfg = Release|x86
+		{1A5D850F-2E38-4524-8745-29A96FA62683}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3E499EAC-C1BA-41A0-8076-D660F8ACC977}
+	EndGlobalSection
+EndGlobal
diff --git a/ZitiWintunInstaller/.gitignore b/ZitiWintunInstaller/.gitignore
new file mode 100644
index 00000000..6bade68c
--- /dev/null
+++ b/ZitiWintunInstaller/.gitignore
@@ -0,0 +1 @@
+wintun*msm
diff --git a/ZitiWintunInstaller/Product.wxs b/ZitiWintunInstaller/Product.wxs
new file mode 100644
index 00000000..d79aca6d
--- /dev/null
+++ b/ZitiWintunInstaller/Product.wxs
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Product Id="*" Name="OpenZitiWintunInstaller" Language="1033" Version="1.0.0.0" Manufacturer="Ziti" UpgradeCode="1abdbe15-0f36-4633-ba6f-8a32d8cf4838">
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64"/>
+
+		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+		<MediaTemplate />
+        
+        <DirectoryRef Id="INSTALLFOLDER">
+            <Merge Id="WintunMergeModule" Language="0" DiskId="1" SourceFile="wintun-amd64-0.8.1.msm" />
+        </DirectoryRef>
+        <Feature Id="WintunFeature" Title="Wintun" Level="1">
+            <MergeRef Id="WintunMergeModule" />
+        </Feature>
+	</Product>
+
+	<Fragment>
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<Directory Id="ProgramFilesFolder">
+				<Directory Id="INSTALLFOLDER" Name="OpenZitiWintunInstaller" />
+			</Directory>
+		</Directory>
+	</Fragment>
+
+	<Fragment>
+		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
+			<!-- <Component Id="ProductComponent"> -->
+				<!-- TODO: Insert files, registry keys, and other resources here. -->
+			<!-- </Component> -->
+		</ComponentGroup>
+	</Fragment>
+</Wix>
diff --git a/ZitiWintunInstaller/ZitiWintunInstaller.wixproj b/ZitiWintunInstaller/ZitiWintunInstaller.wixproj
new file mode 100644
index 00000000..25e9d37e
--- /dev/null
+++ b/ZitiWintunInstaller/ZitiWintunInstaller.wixproj
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>1a5d850f-2e38-4524-8745-29a96fa62683</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>OpenZitiWintunInstaller</OutputName>
+    <OutputType>Package</OutputType>
+    <Name>NFWintunInstaller</Name>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <PropertyGroup>
+    <PreBuildEvent>echo Inside Pre-build event about to download wintun 
+echo       from: https://www.wintun.net/builds/wintun-amd64-0.8.1.msm
+echo       into $(MSBuildProjectFullPath)\wintun-amd64-0.8.1.msm
+
+call powershell "Invoke-WebRequest https://www.wintun.net/builds/wintun-amd64-0.8.1.msm -OutFile $(ProjectDir)wintun-amd64-0.8.1.msm"</PreBuildEvent>
+  </PropertyGroup>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
\ No newline at end of file
diff --git a/release-notes.md b/release-notes.md
new file mode 100644
index 00000000..ad08f3f4
--- /dev/null
+++ b/release-notes.md
@@ -0,0 +1,12 @@
+# Release 0.0.15
+
+* What's New
+
+* Bug fixes
+  * [#51](https://github.com/openziti/desktop-edge-win/issues/51) - cziti log would never roll over. 
+            now the cziti log rolls daily with a maximum of seven (7) log files
+
+# All versions prior to 0.0.15
+
+Changelog tracking began with 0.0.15 - all previous changes were not tracked. If interested please
+review the commit history.
\ No newline at end of file
diff --git a/service/cziti/cziti-cli/main.go b/service/cziti/cziti-cli/main.go
index 073f7ad0..daf67bb7 100644
--- a/service/cziti/cziti-cli/main.go
+++ b/service/cziti/cziti-cli/main.go
@@ -25,7 +25,7 @@ import (
 	"os"
 	"strconv"
 	"strings"
-	"github.com/netfoundry/ziti-tunnel-win/service/cziti"
+	"github.com/openziti/ziti-tunnel-win/service/cziti"
 )
 
 func main() {
diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go
index c1d582ea..6a69d3e5 100644
--- a/service/cziti/dns-proxy.go
+++ b/service/cziti/dns-proxy.go
@@ -22,7 +22,7 @@ import (
 	"github.com/miekg/dns"
 	"net"
 	"time"
-	"github.com/netfoundry/ziti-tunnel-win/service/cziti/windns"
+	"github.com/openziti/ziti-tunnel-win/service/cziti/windns"
 )
 
 func processDNSquery(packet []byte, p *net.UDPAddr, s *net.UDPConn) {
@@ -199,7 +199,12 @@ func runDNSproxy(dnsServers []string) {
 			for _, proxy := range dnsUpstreams {
 				// log.Debug("sending proxy req", dns.Type(pr.req.Question[0].Qtype), pr.req.Question[0].Name, proxy.RemoteAddr())
 				if _, err := proxy.Write(b); err != nil {
-					log.Debug("failed to proxy DNS to ", proxy)
+					//TODO: if this happens -does this mean the next dns server is not available?
+					log.Debugf("failed to proxy DNS to %s %s %v. %v",
+						dns.Type(pr.req.Question[0].Qtype),
+						pr.req.Question[0].Name,
+						proxy.RemoteAddr(),
+						err)
 				}
 			}
 
@@ -222,7 +227,7 @@ func runDNSproxy(dnsServers []string) {
 			now := time.Now()
 			for k, r := range reqs {
 				if now.After(r.exp) {
-					log.Debug("req expired", dns.Type(r.req.Question[0].Qtype), r.req.Question[0].Name)
+					log.Debugf("req expired %s %s", dns.Type(r.req.Question[0].Qtype), r.req.Question[0].Name)
 					delete(reqs, k)
 				}
 			}
diff --git a/service/cziti/sdk.go b/service/cziti/sdk.go
index b00e4a8c..c55568d9 100644
--- a/service/cziti/sdk.go
+++ b/service/cziti/sdk.go
@@ -25,6 +25,8 @@ package cziti
 #include "sdk.h"
 extern void initCB(ziti_context nf, int status, void *ctx);
 extern void serviceCB(ziti_context nf, ziti_service*, int status, void *ctx);
+extern void cron_callback(uv_async_t *handle);
+extern void free_async(uv_handle_t* timer);
 
 */
 import "C"
@@ -32,8 +34,13 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/michaelquigley/pfxlog"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config"
+	"github.com/robfig/cron/v3"
+	"io/ioutil"
 	"os"
+	"strings"
 	"sync"
+	"time"
 	"unsafe"
 )
 
@@ -44,6 +51,7 @@ const (
 
 var ServiceChanges = make(chan ServiceChange, 256)
 var log = pfxlog.Logger()
+var c = cron.New()
 
 type sdk struct {
 	libuvCtx *C.libuv_ctx
@@ -71,7 +79,6 @@ func SetLogLevel(level int) {
 }
 
 func Start() {
-
 	v := C.ziti_get_version()
 	log.Infof("starting ziti-sdk-c %s(%s)[%s]", C.GoString(v.version), C.GoString(v.revision), C.GoString(v.build_date))
 
@@ -223,7 +230,7 @@ func LoadZiti(cfg string) *CZitiCtx {
 	ctx.options.init_cb = C.ziti_init_cb(C.initCB)
 	ctx.options.service_cb = C.ziti_service_cb(C.serviceCB)
 	ctx.options.refresh_interval = C.long(15)
-	ctx.options.metrics_type = C.EWMA_5s
+	ctx.options.metrics_type = C.INSTANT
 	ctx.options.config_types = C.all_configs
 
 	ch := make(chan *CZitiCtx)
@@ -262,3 +269,85 @@ func(c *CZitiCtx) Shutdown() {
 		log.Info("shutdown called for identity but it has no context")
 	}
 }
+
+var logFile *os.File //the current, active log file
+var logLevel int //set in InitializeCLogger
+var lastRollover = time.Now()
+
+func InitializeCLogger(level int) {
+	logLevel = level
+	SetLogLevel(logLevel)
+	initializeLogForToday()
+
+	c.AddFunc("@midnight", initiateRollLog)
+	c.Start()
+}
+
+func initiateRollLog() {
+	lastRollover = time.Now()
+	async := (*C.uv_async_t)(C.malloc(C.sizeof_uv_async_t))
+	C.uv_async_init(_impl.libuvCtx.l, async, C.uv_async_cb(C.cron_callback))
+	C.uv_async_send((*C.uv_async_t)(unsafe.Pointer(async)))
+}
+
+//export free_async
+func free_async(handle *C.uv_handle_t){
+	C.free(unsafe.Pointer(handle))
+}
+
+//export cron_callback
+func cron_callback(async *C.uv_async_t) {
+	// roll the log while on the uv loop
+	if logFile == nil {
+		log.Warn("log file is nil. this is unexpected. log rolling aborted")
+	}
+
+	_ = logFile.Close() //close the log file
+
+	//rename the log file to 'now'
+	nowFormatted := time.Now().Format("2006-01-02-030405")
+	_ = os.Rename(config.Path()+"cziti.log", config.Path()+"cziti-" + nowFormatted + ".log")
+
+	// set the log file in the c sdk
+	initializeLogForToday()
+
+	// find any logs older than 7 days and remove them
+	removeFilesOlderThanRetentionPolicy()
+
+	C.uv_close((*C.uv_handle_t)(unsafe.Pointer(async)), C.uv_close_cb(C.free_async))
+}
+
+func initializeLogForToday() {
+	var err error
+	logFile, err = os.OpenFile(config.Path()+"cziti.log", os.O_WRONLY|os.O_TRUNC|os.O_APPEND|os.O_CREATE, 0644)
+	if err != nil {
+		log.Warnf("could not open cziti.log for writing. no debug information will be captured.")
+	} else {
+		SetLog(logFile)
+	}
+}
+
+func removeFilesOlderThanRetentionPolicy() {
+	logFiles, err := ioutil.ReadDir(config.Path())
+	if err != nil {
+		return
+	}
+	now := time.Now()
+	for _, file := range logFiles {
+		if !strings.HasPrefix(file.Name(), "cziti-") {
+			continue
+		}
+		if file.Mode().IsRegular() {
+			if isOlderThanRetentionPolicy(now, file.ModTime()) {
+				log.Infof("removing file %s because it is older than the retention policy.", file.Name())
+				os.Remove(config.Path() + file.Name())
+			}
+		}
+	}
+	return
+}
+
+func isOlderThanRetentionPolicy(asOf time.Time, t time.Time) bool {
+	oneWeek := 7 * 24 * time.Hour
+	return asOf.Sub(t) > oneWeek
+}
diff --git a/service/cziti/windns/windns.go-back b/service/cziti/windns/windns.go-back
deleted file mode 100644
index cc973818..00000000
--- a/service/cziti/windns/windns.go-back
+++ /dev/null
@@ -1,92 +0,0 @@
-package windns
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/michaelquigley/pfxlog"
-)
-
-var log = pfxlog.Logger()
-var disableIt bool = true
-
-func init() {
-	disableIt = os.Getenv("this_will_not_exist") == ""
-	disableIt = true
-}
-
-
-func ResetDNS() {
-	if disableIt {
-		log.Warn("ResetDNS altering is not running")
-		return
-	}
-	log.Info("restoring dns to original-ish state")
-
-	script := `Get-NetIPInterface | ForEach-Object { Set-DnsClientServerAddress -InterfaceIndex $_.ifIndex -ResetServerAddresses }`
-
-	cmd := exec.Command("powershell", "-Command", script)
-	cmd.Stderr = os.Stdout
-	cmd.Stdout = os.Stdout
-
-	err := cmd.Run()
-	if err != nil {
-		log.Errorf("ERROR resetting DNS", err)
-	}
-}
-
-func GetUpstreamDNS() []string {
-	ResetDNS()
-
-	script := `Get-DnsClientServerAddress | ForEach-Object { $_.ServerAddresses } | Sort-Object | Get-Unique`
-
-	cmd := exec.Command("powershell", "-Command", script)
-	cmd.Stderr = os.Stdout
-	output := new(bytes.Buffer)
-	cmd.Stdout = output
-
-	err := cmd.Run()
-
-	if err != nil {
-		panic(err)
-	}
-
-	var names []string
-	for {
-		l, err := output.ReadString('\n')
-		if err != nil {
-			break
-		}
-		addr := net.ParseIP(strings.TrimSpace(l))
-		if !addr.IsLoopback() {
-			names = append(names, addr.String())
-		}
-	}
-	return names
-}
-
-func ReplaceDNS(ips []net.IP) {
-	if disableIt {
-		log.Warn("ReplaceDNS altering is not running")
-		return
-	}
-	var names []string
-	for _, i := range ips {
-		names = append(names, i.String())
-	}
-	addresses := strings.Join(names, ",")
-	script := fmt.Sprintf(
-		`Get-NetIPInterface | ForEach-Object { Set-DnsClientServerAddress -InterfaceIndex $_.ifIndex -ServerAddresses %s }`,
-		addresses)
-	cmd := exec.Command("powershell", "-Command", script)
-	cmd.Stderr = os.Stderr
-	cmd.Stdout = os.Stdout
-
-	if err := cmd.Run(); err != nil {
-		log.Errorf("ERROR resetting DNS (%v)", err)
-	}
-}
diff --git a/service/go.mod b/service/go.mod
index 7278df0b..8169dc73 100644
--- a/service/go.mod
+++ b/service/go.mod
@@ -1,4 +1,4 @@
-module github.com/netfoundry/ziti-tunnel-win/service
+module github.com/openziti/ziti-tunnel-win/service
 
 go 1.14
 
@@ -6,19 +6,17 @@ require (
 	github.com/Microsoft/go-winio v0.4.14
 	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
 	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
-	github.com/jonboulle/clockwork v0.1.0 // indirect
-	github.com/kr/pretty v0.1.0 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.1 // indirect
 	github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc
 	github.com/miekg/dns v1.1.29
-	github.com/netfoundry/ziti-foundation v0.9.8
-	github.com/netfoundry/ziti-sdk-golang v0.11.16
-	github.com/sirupsen/logrus v1.5.0
-	github.com/spf13/cobra v0.0.5
+	github.com/openziti/foundation v0.11.11
+	github.com/openziti/sdk-golang v0.13.20
+	github.com/robfig/cron/v3 v3.0.1
+	github.com/sirupsen/logrus v1.6.0
+	github.com/spf13/cobra v0.0.7
 	github.com/tebeka/strftime v0.1.4 // indirect
-	golang.org/x/sys v0.0.0-20200406113430-c6e801f48ba2
+	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae
 	golang.zx2c4.com/wireguard v0.0.20200320
 	golang.zx2c4.com/wireguard/windows v0.1.0
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )
diff --git a/service/go.sum b/service/go.sum
index 43d2c7e0..cb2c5887 100644
--- a/service/go.sum
+++ b/service/go.sum
@@ -1,23 +1,35 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Jeffail/gabs v1.4.0 h1://5fYRRTq1edjfIrQGvdkcd22pkYUrHZ5YC/H2GJVAo=
 github.com/Jeffail/gabs v1.4.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
 github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod h1:uAXEEpARkRhCZfEvy/y0Jcc888f9tHCc1W7/UeEtreE=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/antlr/antlr4 v0.0.0-20191115170859-54daca92f7b0/go.mod h1:T7PbCXFs94rrTttyxjbyT5+/1V8T2TYDejxUfHJjw1Y=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/biogo/store v0.0.0-20190426020002-884f370e325d/go.mod h1:Iev9Q3MErcn+w3UOJD/DkEzllvugfdx7bGcMOFhvr/4=
+github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU=
@@ -26,12 +38,31 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa h1:RDBNVkRviHZtvDvId8XSGPu3rmpmSe+wKRcEWNgsfWU=
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
@@ -42,10 +73,14 @@ github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uc
 github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kataras/go-events v0.0.3-0.20170604004442-17d67be645c3/go.mod h1:6IxMW59VJdEIqj3bjFGJvGLRdb0WHtrlxPZy9qXctcg=
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -69,6 +104,7 @@ github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaa
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc h1:PQrqw9XKYcPRI9rKwoGZucMjWvfZpyfb5j8Lc13j8YY=
@@ -81,53 +117,81 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/netfoundry/secretstream v0.1.1/go.mod h1:uasYkYSp0MmNSlKOWJ2sVzxPms8e58TS4ENq4yro86k=
-github.com/netfoundry/ziti-foundation v0.9.8 h1:Nyx4U+pZ6iPtXBYSIad8xg5nBVjQNLatCHg5krQmeWM=
-github.com/netfoundry/ziti-foundation v0.9.8/go.mod h1:desAxe5jN/V/+cYe99TGEqxtMVdlJ1HfSRzCmuPJD7M=
-github.com/netfoundry/ziti-sdk-golang v0.11.16 h1:YZxHtDq4o+r141ISHvElT0CH4DKdb+EeQaoxSDVJAq0=
-github.com/netfoundry/ziti-sdk-golang v0.11.16/go.mod h1:Onxp1kNm0xarDjl6S43Y9PQPVHfXgUFcM157KQKqHm4=
+github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=
+github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/netfoundry/secretstream v0.1.2/go.mod h1:uasYkYSp0MmNSlKOWJ2sVzxPms8e58TS4ENq4yro86k=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/openziti/foundation v0.11.11 h1:GPASO0aTtzuzwQbfvu1OMOPdAKzi/DTkxKJ0y2NTzXU=
+github.com/openziti/foundation v0.11.11/go.mod h1:Qdd7eCuTrpRwEeDbvYy89sFbEY4+J7OuX8UygxNBsvY=
+github.com/openziti/sdk-golang v0.13.20 h1:vnpGvaS/TBz2zd8lUO4cGVYmRWcnAX0v8k/P9+q36BI=
+github.com/openziti/sdk-golang v0.13.20/go.mod h1:2cCcWJATUzfx8T9CjaERqersSbKT0r5DptUTcZvHOVs=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
+github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
-github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
+github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/speps/go-hashids v2.0.0+incompatible h1:kSfxGfESueJKTx0mpER9Y/1XHl+FVQjtCqRyYcviFbw=
 github.com/speps/go-hashids v2.0.0+incompatible/go.mod h1:P7hqPzMdnZOfyIk+xrlG1QaSMw+gCBdHKsBDnhpaZvc=
 github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
-github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/cobra v0.0.7 h1:FfTH+vuMXOas8jmfb5/M7dzEYx7LpcLb7a0LPe34uOU=
+github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
-github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
+github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tebeka/strftime v0.1.4 h1:e0FKSyxthD1Xk4cIixFPoyfD33u2SbjNngOaaC3ePoU=
 github.com/tebeka/strftime v0.1.4/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIUJUJH6XQ=
-github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -136,21 +200,35 @@ golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw=
 golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190228165749-92fc7df08ae7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -159,17 +237,21 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200301040627-c5d0d7b4ec88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200406113430-c6e801f48ba2 h1:Z9pPywZscwuw0ijrLEbTzW9lppFgBY4HDgbvoDnreQs=
-golang.org/x/sys v0.0.0-20200406113430-c6e801f48ba2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3-0.20191230102452-929e72ca90de h1:aYKJLPSrddB2N7/6OKyFqJ337SXpo61bBuvO5p1+7iY=
 golang.org/x/text v0.3.3-0.20191230102452-929e72ca90de/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -178,14 +260,23 @@ golang.zx2c4.com/wireguard v0.0.20200320 h1:1vE6zVeO7fix9cJX1Z9ZQ+ikPIIx7vIyU0o0
 golang.zx2c4.com/wireguard v0.0.20200320/go.mod h1:lDian4Sw4poJ04SgHh35nzMVwGSYlPumkdnHcucAQoY=
 golang.zx2c4.com/wireguard/windows v0.1.0 h1:742izt2DAJBpIQT+DvrzN58P9p7fO4BUFOgMzY9qVhw=
 golang.zx2c4.com/wireguard/windows v0.1.0/go.mod h1:EK7CxrFnicmYJ0ZCF6crBh2/EMMeSxMlqgLlwN0Kv9s=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/service/ziti-tunnel/dto/dtos.go b/service/ziti-tunnel/dto/dtos.go
index c6bf7b9c..e7502ff7 100644
--- a/service/ziti-tunnel/dto/dtos.go
+++ b/service/ziti-tunnel/dto/dtos.go
@@ -18,11 +18,11 @@
 package dto
 
 import (
-	idcfg "github.com/netfoundry/ziti-sdk-golang/ziti/config"
-	"github.com/netfoundry/ziti-sdk-golang/ziti/enroll"
-	"github.com/netfoundry/ziti-tunnel-win/service/cziti"
+	idcfg "github.com/openziti/sdk-golang/ziti/config"
+	"github.com/openziti/sdk-golang/ziti/enroll"
+	"github.com/openziti/ziti-tunnel-win/service/cziti"
 	"log"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/config"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config"
 )
 
 type AddIdentity struct {
diff --git a/service/ziti-tunnel/globals/loghelper.go b/service/ziti-tunnel/globals/loghelper.go
index d8b3832d..e90699d8 100644
--- a/service/ziti-tunnel/globals/loghelper.go
+++ b/service/ziti-tunnel/globals/loghelper.go
@@ -28,7 +28,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/config"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config"
 )
 
 var Elog debug.Log
diff --git a/service/ziti-tunnel/idutil/identity.go b/service/ziti-tunnel/idutil/identity.go
index d809b9d6..ad09b3d3 100644
--- a/service/ziti-tunnel/idutil/identity.go
+++ b/service/ziti-tunnel/idutil/identity.go
@@ -19,9 +19,9 @@ package idutil
 
 import (
 	"github.com/michaelquigley/pfxlog"
-	idcfg "github.com/netfoundry/ziti-sdk-golang/ziti/config"
-	"github.com/netfoundry/ziti-tunnel-win/service/cziti"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/dto"
+	idcfg "github.com/openziti/sdk-golang/ziti/config"
+	"github.com/openziti/ziti-tunnel-win/service/cziti"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto"
 )
 
 var log = pfxlog.Logger()
diff --git a/service/ziti-tunnel/main.go b/service/ziti-tunnel/main.go
index 017a93a4..855e5e13 100644
--- a/service/ziti-tunnel/main.go
+++ b/service/ziti-tunnel/main.go
@@ -24,10 +24,10 @@ import (
 	"golang.org/x/sys/windows/svc/eventlog"
 	"os"
 	"strings"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/globals"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/globals"
 
 	"golang.org/x/sys/windows/svc"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/service"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/service"
 )
 
 var log = globals.Logger()
diff --git a/service/ziti-tunnel/service/debug.go b/service/ziti-tunnel/service/debug.go
index 881c6a1d..861ccee0 100644
--- a/service/ziti-tunnel/service/debug.go
+++ b/service/ziti-tunnel/service/debug.go
@@ -18,8 +18,8 @@
 package service
 
 import (
-	idcfg "github.com/netfoundry/ziti-sdk-golang/ziti/config"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/dto"
+	idcfg "github.com/openziti/sdk-golang/ziti/config"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto"
 )
 
 func dbg() {
diff --git a/service/ziti-tunnel/service/events.go b/service/ziti-tunnel/service/events.go
index 5b02dc67..5a644680 100644
--- a/service/ziti-tunnel/service/events.go
+++ b/service/ziti-tunnel/service/events.go
@@ -17,7 +17,7 @@
 
 package service
 
-import "github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/dto"
+import "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto"
 
 const (
 	ADDED = "added"
diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go
index c197f784..186c3d34 100644
--- a/service/ziti-tunnel/service/ipc.go
+++ b/service/ziti-tunnel/service/ipc.go
@@ -23,15 +23,15 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/Microsoft/go-winio"
-	"github.com/netfoundry/ziti-foundation/identity/identity"
-	idcfg "github.com/netfoundry/ziti-sdk-golang/ziti/config"
-	"github.com/netfoundry/ziti-sdk-golang/ziti/enroll"
-	"github.com/netfoundry/ziti-tunnel-win/service/cziti"
-	"github.com/netfoundry/ziti-tunnel-win/service/cziti/windns"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/config"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/dto"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/globals"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/idutil"
+	"github.com/openziti/foundation/identity/identity"
+	idcfg "github.com/openziti/sdk-golang/ziti/config"
+	"github.com/openziti/sdk-golang/ziti/enroll"
+	"github.com/openziti/ziti-tunnel-win/service/cziti"
+	"github.com/openziti/ziti-tunnel-win/service/cziti/windns"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/globals"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/idutil"
 	"golang.org/x/sys/windows/svc"
 	"golang.zx2c4.com/wireguard/tun"
 	"io"
@@ -72,17 +72,10 @@ func SubMain(ops chan string, changes chan<- svc.Status) error {
 	interrupt = make(chan struct{}, 8)
 
 	// wire in a log file for csdk troubleshooting
-	logFile, err := os.OpenFile(config.Path()+"cziti.log", os.O_WRONLY|os.O_TRUNC|os.O_APPEND|os.O_CREATE, 0644)
-	if err != nil {
-		log.Warnf("could not open cziti.log for writing. no debug information will be captured.")
-	} else {
-		cziti.SetLog(logFile)
-		cziti.SetLogLevel(czitiLevel)
-		defer logFile.Close()
-	}
+	cziti.InitializeCLogger(czitiLevel)
 
 	// initialize the network interface
-	err = initialize(rts.state.TunIpv4, rts.state.TunIpv4Mask)
+	err := initialize(rts.state.TunIpv4, rts.state.TunIpv4Mask)
 
 	if err != nil {
 		log.Errorf("unexpected err: %v", err)
@@ -141,6 +134,7 @@ func SubMain(ops chan string, changes chan<- svc.Status) error {
 	ops <- "done"
 	return nil
 }
+
 func waitForStopRequest(ops <-chan string) {
 	sig := make(chan os.Signal)
 	signal.Notify(sig)
@@ -248,7 +242,7 @@ func initialize(ipv4 string, ipv4mask int) error {
 
 func setTunInfo(s *dto.TunnelStatus, ipv4 string, ipv4mask int) {
 	if strings.TrimSpace(ipv4) == "" {
-		log.Infof("ip not provided using default: %d", ipv4)
+		log.Infof("ip not provided using default: %v", ipv4)
 		ipv4 = Ipv4ip
 	}
 	if ipv4mask < 8 || ipv4mask > 24 {
@@ -430,18 +424,42 @@ func serveLogs(conn net.Conn) {
 		_, _ = w.WriteString("an unexpected error occurred while retrieving logs. look at the actual log file.")
 		return
 	}
+	writeLogToStream(file, w)
 
-	r := bufio.NewReader(file)
-	wrote, err := io.Copy(w, r)
+	file, err = os.OpenFile(config.LogFile(), os.O_RDONLY, 0644)
 	if err != nil {
-		log.Errorf("problem responding with log data")
+		log.Errorf("could not open log file at %s", config.LogFile())
+		_, _ = w.WriteString("an unexpected error occurred while retrieving logs. look at the actual log file.")
+		return
 	}
-	_, err = w.Write([]byte("end of logs\n"))
+	writeLogToStream(file, w)
+
+	file, err = os.OpenFile(config.Path()+"cziti.log", os.O_RDONLY, 0644)
+	if err != nil {
+		log.Errorf("could not open log file at %s", config.LogFile())
+		_, _ = w.WriteString("an unexpected error occurred while retrieving logs. look at the actual log file.")
+		return
+	}
+	writeLogToStream(file, w)
+
+	err = conn.Close()
+	if err != nil {
+		log.Error("error closing connection", err)
+	}
+}
+
+func writeLogToStream(file *os.File, writer *bufio.Writer) {
+	r := bufio.NewReader(file)
+	wrote, err := io.Copy(writer, r)
+	if err != nil {
+		log.Errorf("problem responding with log data for: %v", file)
+	}
+	_, err = writer.Write([]byte("end of logs\n"))
 	if err != nil {
 		log.Errorf("unexpected error writing log response: %v", err)
 	}
 
-	err = w.Flush()
+	err = writer.Flush()
 	if err != nil {
 		log.Errorf("unexpected error flushing log response: %v", err)
 	}
@@ -451,11 +469,6 @@ func serveLogs(conn net.Conn) {
 	if err != nil {
 		log.Error("error closing log file", err)
 	}
-
-	err = conn.Close()
-	if err != nil {
-		log.Error("error closing connection", err)
-	}
 }
 
 func serveEvents(conn net.Conn) {
diff --git a/service/ziti-tunnel/service/permissions.go b/service/ziti-tunnel/service/permissions.go
index e659919b..3eec543d 100644
--- a/service/ziti-tunnel/service/permissions.go
+++ b/service/ziti-tunnel/service/permissions.go
@@ -18,7 +18,7 @@
 package service
 
 import (
-	"github.com/netfoundry/ziti-foundation/util/stringz"
+	"github.com/openziti/foundation/util/stringz"
 	"os/user"
 )
 
diff --git a/service/ziti-tunnel/service/pkg-vars.go b/service/ziti-tunnel/service/pkg-vars.go
index b3624092..ca36cc19 100644
--- a/service/ziti-tunnel/service/pkg-vars.go
+++ b/service/ziti-tunnel/service/pkg-vars.go
@@ -21,8 +21,8 @@ import (
 	"golang.org/x/sys/windows/svc"
 	"sync"
 	"time"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/dto"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/globals"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/globals"
 )
 
 var pipeBase = `\\.\pipe\NetFoundry\tunneler\`
diff --git a/service/ziti-tunnel/service/service.go b/service/ziti-tunnel/service/service.go
index cc985156..7e0e303f 100644
--- a/service/ziti-tunnel/service/service.go
+++ b/service/ziti-tunnel/service/service.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"golang.org/x/sys/windows/svc"
 	"golang.org/x/sys/windows/svc/debug"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/globals"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/globals"
 )
 
 
diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go
index 4aa0fb00..e010af33 100644
--- a/service/ziti-tunnel/service/state.go
+++ b/service/ziti-tunnel/service/state.go
@@ -21,10 +21,10 @@ import (
 	"bufio"
 	"encoding/json"
 	"fmt"
-	"github.com/netfoundry/ziti-tunnel-win/service/cziti"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/config"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/dto"
-	"github.com/netfoundry/ziti-tunnel-win/service/ziti-tunnel/idutil"
+	"github.com/openziti/ziti-tunnel-win/service/cziti"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto"
+	"github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/idutil"
 	"golang.zx2c4.com/wireguard/tun"
 	"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
 	"net"
@@ -139,7 +139,7 @@ func (t *RuntimeState) CreateTun(ipv4 string, ipv4mask int) error {
 	luid := winipcfg.LUID(nativeTunDevice.LUID())
 
 	if strings.TrimSpace(ipv4) == "" {
-		log.Infof("ip not provided using default: %d", ipv4)
+		log.Infof("ip not provided using default: %v", ipv4)
 		ipv4 = Ipv4ip
 	}
 	if ipv4mask < 8 || ipv4mask > 24 {
diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go
index 69308499..babd11a0 100644
--- a/service/ziti-tunnel/version.go
+++ b/service/ziti-tunnel/version.go
@@ -3,9 +3,9 @@
 package main
 
 const (
-	Version   = "0.0.7"
-	Revision  = "8416b2241862"
-	Branch    = "jun5"
+	Version   = "0.0.13"
+	Revision  = "2a874f51d695"
+	Branch    = "master"
 	BuildUser = "Clint D"
-	BuildDate = "2020-06-05 12:52:45"
+	BuildDate = "2020-07-06 15:41:34"
 )
diff --git a/service/ziti-wintun/main.go b/service/ziti-wintun/main.go
index 8c18f59b..be5d0198 100644
--- a/service/ziti-wintun/main.go
+++ b/service/ziti-wintun/main.go
@@ -28,8 +28,8 @@ import (
 	user2 "os/user"
 	"path/filepath"
 	"syscall"
-	"github.com/netfoundry/ziti-tunnel-win/service/cziti"
-	"github.com/netfoundry/ziti-tunnel-win/service/cziti/windns"
+	"github.com/openziti/ziti-tunnel-win/service/cziti"
+	"github.com/openziti/ziti-tunnel-win/service/cziti/windns"
 )
 
 const bufferSize = 64 * 1024
diff --git a/version b/version
index 8cbf02c3..9beca35d 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.0.12
+0.0.15
\ No newline at end of file