diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index b8ff3b12a..2da31e33d 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -20,7 +20,7 @@
     <ManifestKeyFile>
     </ManifestKeyFile>
     <ManifestCertificateThumbprint>8CA4066C36C87B745E4016FDA715A6DB16FCFFA9</ManifestCertificateThumbprint>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <SignAssembly>false</SignAssembly>
     <ExpressionBlendVersion>3.0.1927.0</ExpressionBlendVersion>
     <TargetFrameworkProfile>
@@ -29,26 +29,24 @@
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
-    <PublishUrl>D:\Projects\beyondsoft\BeWoPlaner\Publish\</PublishUrl>
+    <PublishUrl>C:\publish\bewoplaner\</PublishUrl>
     <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
     <UpdateInterval>7</UpdateInterval>
     <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>false</MapFileExtensions>
-    <InstallUrl>https://app.ownsoft.de/</InstallUrl>
     <TargetCulture>de-DE</TargetCulture>
     <ProductName>BeWoPlaner</ProductName>
     <PublisherName>ownSoft GmbH</PublisherName>
     <MinimumRequiredVersion>2.0.1.268</MinimumRequiredVersion>
-    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <TrustUrlParameters>true</TrustUrlParameters>
-    <ApplicationRevision>269</ApplicationRevision>
+    <ApplicationRevision>275</ApplicationRevision>
     <ApplicationVersion>2.0.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -108,6 +106,10 @@
     <Compile Include="ViewModel\AddressVM.cs" />
     <Compile Include="ViewModel\AiConfigVM.cs" />
     <Compile Include="ViewModel\View\AiConversationChatViewModel.cs" />
+    <Compile Include="ViewModel\View\WindowViewModel.cs" />
+    <Compile Include="View\Core\WaitLayer3.xaml.cs">
+      <DependentUpon>WaitLayer3.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Detail\AI\AiConfigView.xaml.cs">
       <DependentUpon>AiConfigView.xaml</DependentUpon>
     </Compile>
@@ -118,6 +120,10 @@
     <Compile Include="View\Windows\AnimatedBeWoWindow.xaml.cs">
       <DependentUpon>AnimatedBeWoWindow.xaml</DependentUpon>
     </Compile>
+    <Page Include="View\Core\WaitLayer3.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\Detail\AI\AiConfigView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs
index b58bf6e66..d9ee21cb8 100644
--- a/BeWo/DebugConfig.cs
+++ b/BeWo/DebugConfig.cs
@@ -144,7 +144,7 @@ namespace BeWo
 						new DebugConfig()
 						{
 							DebugConfigMode = DebugConfigMode.FeatureAiModule,
-							AutoLogin = false,
+							AutoLogin = true,
 							SelectView = UIContext.Customer,
 							//SelectIndex = 8,
 							//DefaultLoginUsername = "m1",
diff --git a/BeWo/View/Core/WaitLayer3.xaml b/BeWo/View/Core/WaitLayer3.xaml
new file mode 100644
index 000000000..b796ba4ea
--- /dev/null
+++ b/BeWo/View/Core/WaitLayer3.xaml
@@ -0,0 +1,86 @@
+<UserControl
+    x:Class="BeWo.View.Core.WaitLayer3"
+    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:local="clr-namespace:BeWo.View.Core"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="..\..\Styles\ModernOrangeBlack.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+
+            <!--  Bouncing Dots Animation  -->
+            <Storyboard x:Key="BouncingDotsStoryboard" RepeatBehavior="Forever">
+                <DoubleAnimation
+                    AutoReverse="True"
+                    Storyboard.TargetName="Dot1"
+                    Storyboard.TargetProperty="(Canvas.Top)"
+                    From="20"
+                    To="0"
+                    Duration="0:0:0.5" />
+                <DoubleAnimation
+                    AutoReverse="True"
+                    BeginTime="0:0:0.1"
+                    Storyboard.TargetName="Dot2"
+                    Storyboard.TargetProperty="(Canvas.Top)"
+                    From="20"
+                    To="0"
+                    Duration="0:0:0.5" />
+                <DoubleAnimation
+                    AutoReverse="True"
+                    BeginTime="0:0:0.2"
+                    Storyboard.TargetName="Dot3"
+                    Storyboard.TargetProperty="(Canvas.Top)"
+                    From="20"
+                    To="0"
+                    Duration="0:0:0.5" />
+            </Storyboard>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Border
+        Padding="40"
+        Background="#FF252526"
+        CornerRadius="12">
+        <StackPanel>
+            <Canvas
+                Width="80"
+                Height="40"
+                Margin="0,0,0,20">
+                <Ellipse
+                    x:Name="Dot1"
+                    Canvas.Left="10"
+                    Canvas.Top="20"
+                    Width="12"
+                    Height="12"
+                    Fill="#FFFF6B35" />
+                <Ellipse
+                    x:Name="Dot2"
+                    Canvas.Left="34"
+                    Canvas.Top="20"
+                    Width="12"
+                    Height="12"
+                    Fill="#FFFF6B35" />
+                <Ellipse
+                    x:Name="Dot3"
+                    Canvas.Left="58"
+                    Canvas.Top="20"
+                    Width="12"
+                    Height="12"
+                    Fill="#FFFF6B35" />
+                <Canvas.Triggers>
+                    <EventTrigger RoutedEvent="Loaded">
+                        <BeginStoryboard Storyboard="{StaticResource BouncingDotsStoryboard}" />
+                    </EventTrigger>
+                </Canvas.Triggers>
+            </Canvas>
+            <TextBlock
+                HorizontalAlignment="Center"
+                FontSize="14"
+                Foreground="White"
+                Text="{Binding WaitingText}" />
+        </StackPanel>
+    </Border>
+</UserControl>
diff --git a/BeWo/View/Core/WaitLayer3.xaml.cs b/BeWo/View/Core/WaitLayer3.xaml.cs
new file mode 100644
index 000000000..83d853307
--- /dev/null
+++ b/BeWo/View/Core/WaitLayer3.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BeWo.View.Core
+{
+	/// <summary>
+	/// Interaktionslogik für WaitLayer3.xaml
+	/// </summary>
+	public partial class WaitLayer3 : UserControl
+	{
+		public WaitLayer3()
+		{
+			InitializeComponent();
+		}
+	}
+}
diff --git a/BeWo/View/Windows/AnimatedBeWoWindow.xaml b/BeWo/View/Windows/AnimatedBeWoWindow.xaml
index aed1982a1..174c1238f 100644
--- a/BeWo/View/Windows/AnimatedBeWoWindow.xaml
+++ b/BeWo/View/Windows/AnimatedBeWoWindow.xaml
@@ -2,6 +2,7 @@
     x:Class="BeWo.View.Windows.AnimatedBeWoWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:core="clr-namespace:BeWo.View.Core"
     Title="BeWoPlaner"
     MinWidth="300"
     MinHeight="300"
@@ -32,5 +33,18 @@
             MouseDoubleClick="RootGroupBox_OnMouseDoubleClick"
             MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown"
             Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" />
+        <Grid
+            x:Name="_WaitingLayer"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch"
+            Panel.ZIndex="1000"
+            Focusable="True"
+            IsHitTestVisible="True"
+            KeyboardNavigation.IsTabStop="True"
+            Visibility="{Binding IsWaiting, Converter={StaticResource BoolVisibilityConverter}}"
+            Background="#80000000">
+
+            <core:WaitLayer3 HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </Grid>
     </Grid>
 </Window>
diff --git a/BeWo/View/Windows/AnimatedBeWoWindow.xaml.cs b/BeWo/View/Windows/AnimatedBeWoWindow.xaml.cs
index 369de6bf3..15f09da7e 100644
--- a/BeWo/View/Windows/AnimatedBeWoWindow.xaml.cs
+++ b/BeWo/View/Windows/AnimatedBeWoWindow.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using BeWo.ViewModel.View;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -23,6 +24,7 @@ namespace BeWo.View.Windows
 	/// </summary>
 	public partial class AnimatedBeWoWindow : Window
 	{
+
 		private bool closeStoryBoardCompleted = false;
 		private bool isClosing = false;
 		private WaitLayer2 _WaitLayer;
@@ -39,10 +41,17 @@ namespace BeWo.View.Windows
 		}
 
 		public bool IsMaximizable = true;
-		public bool IsWaiting { get; set; } = false;
+
+		public WindowViewModel ViewModel 
+		{ 
+			get => DataContext as WindowViewModel; 
+			set => DataContext = value; 
+		}
 
 		public AnimatedBeWoWindow()
 		{
+			ViewModel = new WindowViewModel();
+
 			InitializeComponent();
 
 			CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) => Close()));
@@ -157,28 +166,18 @@ namespace BeWo.View.Windows
 
 		public void StartWaitingImmediately()
 		{
-			if (_WaitLayer == null)
-			{
-				_WaitLayer = new WaitLayer2();
-				Grid.SetColumnSpan(_WaitLayer, 3);
-				Grid.SetRowSpan(_WaitLayer, 3);
-				rootGrid.Children.Add(_WaitLayer);
-				Panel.SetZIndex(_WaitLayer, int.MaxValue);
-				//_WaitLayer.RefreshUI();
-			}
+			ViewModel.IsWaiting = true;
+			Keyboard.Focus(_WaitingLayer);
+			_WaitingLayer.Focus();
 		}
 
 		public void EndWaiting()
 		{
 			Dispatcher.BeginInvoke(
-				DispatcherPriority.Normal,
+				DispatcherPriority.Render,
 				(Action)delegate
 				{
-					if (_WaitLayer != null)
-					{
-						rootGrid.Children.Remove(_WaitLayer);
-						_WaitLayer = null;
-					}
+					ViewModel.IsWaiting = false;
 				});
 		}
 	}
diff --git a/BeWo/ViewModel/AbstractBaseVM.cs b/BeWo/ViewModel/AbstractBaseVM.cs
index c337cd304..0209cc57c 100644
--- a/BeWo/ViewModel/AbstractBaseVM.cs
+++ b/BeWo/ViewModel/AbstractBaseVM.cs
@@ -109,5 +109,16 @@ namespace BeWo.ViewModel
 			_IsDirty = true;
 			handler?.Invoke(sender, e);
 		}
+
+		protected bool SetProperty<T>(ref T field, T value, string propertyName, Func<T> originalValueProvider = null)
+		{
+			if (EqualityComparer<T>.Default.Equals(field, value))
+				return false;
+
+			field = value;
+
+			FirePropertyChanged(propertyName);
+			return true;
+		}
 	}
 }
\ No newline at end of file
diff --git a/BeWo/ViewModel/AbstractDCMapperVM.cs b/BeWo/ViewModel/AbstractDCMapperVM.cs
index 028071f01..9272d1e54 100644
--- a/BeWo/ViewModel/AbstractDCMapperVM.cs
+++ b/BeWo/ViewModel/AbstractDCMapperVM.cs
@@ -1,4 +1,5 @@
 using BS.Shared.DataContracts;
+using DevExpress.Xpf.Accordion;
 using System;
 using System.Collections.Generic;
 
@@ -85,7 +86,7 @@ namespace BeWo.ViewModel
 			}
 		}
 
-		protected bool SetProperty<T>(ref T field, T value, string propertyName, Func<T> originalValueProvider = null)
+		protected new bool SetProperty<T>(ref T field, T value, string propertyName, Func<T> originalValueProvider = null)
 		{
 			if (EqualityComparer<T>.Default.Equals(field, value))
 				return false;
diff --git a/BeWo/ViewModel/View/WindowViewModel.cs b/BeWo/ViewModel/View/WindowViewModel.cs
new file mode 100644
index 000000000..e5378eb3d
--- /dev/null
+++ b/BeWo/ViewModel/View/WindowViewModel.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BeWo.ViewModel.View
+{
+	public class WindowViewModel : AbstractBaseVM
+	{
+		private bool _IsWaiting = false;
+		private string _WaitingText = string.Empty;
+
+		public WindowViewModel()
+		{
+			WaitingText = "Bitte warten...";
+		}
+
+		public bool IsWaiting
+		{
+			get => _IsWaiting;
+			set => SetProperty(ref _IsWaiting, value, nameof(IsWaiting));
+		}
+
+		public string WaitingText
+		{
+			get => _WaitingText;
+			set => SetProperty(ref _WaitingText, value, nameof(WaitingText));
+		}
+	}
+}
diff --git a/BeWoAI.sln b/BeWoAI.sln
new file mode 100644
index 000000000..f9a4282df
--- /dev/null
+++ b/BeWoAI.sln
@@ -0,0 +1,214 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.33927.289
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{FEB0336B-F053-40B6-92DD-7DE56AB9408A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWo", "BeWo\BeWo.csproj", "{3FEBB560-9275-413A-9767-BB68C44EEBC3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} = {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} = {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Service", "Service\Service.csproj", "{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "Shared\Shared.csproj", "{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls", "Controls\Controls.csproj", "{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Report", "Report\Report.csproj", "{40D8B312-EA64-49E3-A31A-5E57ED4D5654}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host", "Host\Host.csproj", "{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportingService", "ReportService\ReportingService.csproj", "{663EFCB5-9E3E-4C76-97EE-3188E072634C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatController", "..\Chat\ChatController\ChatController.csproj", "{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dakota", "Dakota\Dakota.csproj", "{47331732-DD96-4075-869F-83AA9F3F9937}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B6039E62-D43E-477A-BE82-EADB1057A3A2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{CCD6B644-49E7-4A11-BD8F-607088A4AC83}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wohneinheit", "Wohneinheit", "{2F7893AD-34FC-40A2-838A-3D2D8596E9AC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WohneinheitUnitTest", "WohneinheitUnitTest\WohneinheitUnitTest.csproj", "{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Translation", "Translation", "{B331128C-7E9F-4BDC-B509-A8DAE1B94E5C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TranslationUnitTest", "TranslationUnitTest\TranslationUnitTest.csproj", "{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|.NET.Build.0 = Debug|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|.NET.ActiveCfg = Release|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|.NET.Build.0 = Debug|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|.NET.ActiveCfg = Release|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|.NET.Build.0 = Debug|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|.NET.ActiveCfg = Release|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|.NET.Build.0 = Debug|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|.NET.ActiveCfg = Release|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|.NET.Build.0 = Debug|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|.NET.ActiveCfg = Release|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|.NET.Build.0 = Debug|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|.NET.ActiveCfg = Release|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|.NET.Build.0 = Debug|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|.NET.ActiveCfg = Release|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|.NET.Build.0 = Debug|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|.NET.ActiveCfg = Release|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|.NET.Build.0 = Debug|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|.NET.ActiveCfg = Release|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|.NET.Build.0 = Release|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|.NET.Build.0 = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|.NET.ActiveCfg = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|.NET.Build.0 = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Debug|.NET.Build.0 = Debug|Any CPU
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Release|.NET.ActiveCfg = Release|Any CPU
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Release|.NET.Build.0 = Release|Any CPU
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|.NET.Build.0 = Debug|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|.NET.ActiveCfg = Release|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|.NET.Build.0 = Release|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{3FEBB560-9275-413A-9767-BB68C44EEBC3} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
+		{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{D5E53B0F-BF5A-41E8-93E2-0F32845FC729} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
+		{40D8B312-EA64-49E3-A31A-5E57ED4D5654} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{663EFCB5-9E3E-4C76-97EE-3188E072634C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
+		{47331732-DD96-4075-869F-83AA9F3F9937} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
+		{2F7893AD-34FC-40A2-838A-3D2D8596E9AC} = {CCD6B644-49E7-4A11-BD8F-607088A4AC83}
+		{7630915F-DFE4-45A4-A7B1-B6D19B0126C1} = {2F7893AD-34FC-40A2-838A-3D2D8596E9AC}
+		{B331128C-7E9F-4BDC-B509-A8DAE1B94E5C} = {CCD6B644-49E7-4A11-BD8F-607088A4AC83}
+		{83C43FEC-233D-49EF-BD23-BF842A3EBDF5} = {B331128C-7E9F-4BDC-B509-A8DAE1B94E5C}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5352BE53-F2FD-442F-85A8-4157599AA153}
+	EndGlobalSection
+EndGlobal
diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user
index f8b116048..932dd8add 100644
--- a/Host/Host.csproj.user
+++ b/Host/Host.csproj.user
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>BeWo2.0</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>C:\Projects\Bewo\BeWo - Main\Host\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress>false</Use64BitIISExpress>