diff --git a/.gitignore b/.gitignore
index ef15bd2..361b1ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -361,4 +361,6 @@ MigrationBackup/
 
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
-IAF42_Kaulmann_CarmanagerV2.zip
+
+# Submissions folder (contains submission ZIPs)
+submissions/
\ No newline at end of file
diff --git a/CarManagerV3.sln b/CarManagerV3.sln
index 777b65d..5f6ce87 100644
--- a/CarManagerV3.sln
+++ b/CarManagerV3.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.14.36414.22
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarManagerV3", "CarManagerV2\CarManagerV3.csproj", "{93CA258B-A645-41A8-A24F-59036ABC173F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarManagerV3", "CarManagerV3\CarManagerV3.csproj", "{93CA258B-A645-41A8-A24F-59036ABC173F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/CarManagerV2/App.config b/CarManagerV3/App.config
similarity index 100%
rename from CarManagerV2/App.config
rename to CarManagerV3/App.config
diff --git a/CarManagerV2/Car.cs b/CarManagerV3/Car.cs
similarity index 100%
rename from CarManagerV2/Car.cs
rename to CarManagerV3/Car.cs
diff --git a/CarManagerV2/CarCard.Designer.cs b/CarManagerV3/CarCard.Designer.cs
similarity index 100%
rename from CarManagerV2/CarCard.Designer.cs
rename to CarManagerV3/CarCard.Designer.cs
diff --git a/CarManagerV2/CarCard.cs b/CarManagerV3/CarCard.cs
similarity index 100%
rename from CarManagerV2/CarCard.cs
rename to CarManagerV3/CarCard.cs
diff --git a/CarManagerV2/CarCard.resx b/CarManagerV3/CarCard.resx
similarity index 100%
rename from CarManagerV2/CarCard.resx
rename to CarManagerV3/CarCard.resx
diff --git a/CarManagerV2/CarDetailsForm.Designer.cs b/CarManagerV3/CarDetailsForm.Designer.cs
similarity index 100%
rename from CarManagerV2/CarDetailsForm.Designer.cs
rename to CarManagerV3/CarDetailsForm.Designer.cs
diff --git a/CarManagerV2/CarDetailsForm.cs b/CarManagerV3/CarDetailsForm.cs
similarity index 100%
rename from CarManagerV2/CarDetailsForm.cs
rename to CarManagerV3/CarDetailsForm.cs
diff --git a/CarManagerV2/CarDetailsForm.resx b/CarManagerV3/CarDetailsForm.resx
similarity index 100%
rename from CarManagerV2/CarDetailsForm.resx
rename to CarManagerV3/CarDetailsForm.resx
diff --git a/CarManagerV2/CarManagerV3.csproj b/CarManagerV3/CarManagerV3.csproj
similarity index 78%
rename from CarManagerV2/CarManagerV3.csproj
rename to CarManagerV3/CarManagerV3.csproj
index baa424d..7e0a20f 100644
--- a/CarManagerV2/CarManagerV3.csproj
+++ b/CarManagerV3/CarManagerV3.csproj
@@ -6,12 +6,27 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{93CA258B-A645-41A8-A24F-59036ABC173F}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>CarManagerV2</RootNamespace>
-    <AssemblyName>CarManagerV2</AssemblyName>
+    <RootNamespace>CarManagerV3</RootNamespace>
+    <AssemblyName>CarManagerV3</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -96,6 +111,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -110,5 +126,17 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/CarManagerV2/ImageManager.cs b/CarManagerV3/ImageManager.cs
similarity index 100%
rename from CarManagerV2/ImageManager.cs
rename to CarManagerV3/ImageManager.cs
diff --git a/CarManagerV2/MainForm.Designer.cs b/CarManagerV3/MainForm.Designer.cs
similarity index 100%
rename from CarManagerV2/MainForm.Designer.cs
rename to CarManagerV3/MainForm.Designer.cs
diff --git a/CarManagerV2/MainForm.cs b/CarManagerV3/MainForm.cs
similarity index 100%
rename from CarManagerV2/MainForm.cs
rename to CarManagerV3/MainForm.cs
diff --git a/CarManagerV2/MainForm.resx b/CarManagerV3/MainForm.resx
similarity index 100%
rename from CarManagerV2/MainForm.resx
rename to CarManagerV3/MainForm.resx
diff --git a/CarManagerV2/PleaseWait.Designer.cs b/CarManagerV3/PleaseWait.Designer.cs
similarity index 100%
rename from CarManagerV2/PleaseWait.Designer.cs
rename to CarManagerV3/PleaseWait.Designer.cs
diff --git a/CarManagerV2/PleaseWait.cs b/CarManagerV3/PleaseWait.cs
similarity index 100%
rename from CarManagerV2/PleaseWait.cs
rename to CarManagerV3/PleaseWait.cs
diff --git a/CarManagerV2/PleaseWait.resx b/CarManagerV3/PleaseWait.resx
similarity index 100%
rename from CarManagerV2/PleaseWait.resx
rename to CarManagerV3/PleaseWait.resx
diff --git a/CarManagerV2/Program.cs b/CarManagerV3/Program.cs
similarity index 100%
rename from CarManagerV2/Program.cs
rename to CarManagerV3/Program.cs
diff --git a/CarManagerV2/Properties/AssemblyInfo.cs b/CarManagerV3/Properties/AssemblyInfo.cs
similarity index 100%
rename from CarManagerV2/Properties/AssemblyInfo.cs
rename to CarManagerV3/Properties/AssemblyInfo.cs
diff --git a/CarManagerV2/Properties/Resources.Designer.cs b/CarManagerV3/Properties/Resources.Designer.cs
similarity index 83%
rename from CarManagerV2/Properties/Resources.Designer.cs
rename to CarManagerV3/Properties/Resources.Designer.cs
index e993b8d..54ae591 100644
--- a/CarManagerV2/Properties/Resources.Designer.cs
+++ b/CarManagerV3/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace CarManagerV2.Properties
-{
-
-
+namespace CarManagerV3.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace CarManagerV2.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", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    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()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CarManagerV2.Properties.Resources", typeof(Resources).Assembly);
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CarManagerV3.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.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/CarManagerV2/Properties/Resources.resx b/CarManagerV3/Properties/Resources.resx
similarity index 100%
rename from CarManagerV2/Properties/Resources.resx
rename to CarManagerV3/Properties/Resources.resx
diff --git a/CarManagerV2/Properties/Settings.Designer.cs b/CarManagerV3/Properties/Settings.Designer.cs
similarity index 82%
rename from CarManagerV2/Properties/Settings.Designer.cs
rename to CarManagerV3/Properties/Settings.Designer.cs
index 9e6d59d..95eb380 100644
--- a/CarManagerV2/Properties/Settings.Designer.cs
+++ b/CarManagerV3/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace CarManagerV2.Properties
-{
-
-
+namespace CarManagerV3.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.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
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/CarManagerV2/Properties/Settings.settings b/CarManagerV3/Properties/Settings.settings
similarity index 100%
rename from CarManagerV2/Properties/Settings.settings
rename to CarManagerV3/Properties/Settings.settings
diff --git a/CarManagerV2/SafeManager.cs b/CarManagerV3/SafeManager.cs
similarity index 100%
rename from CarManagerV2/SafeManager.cs
rename to CarManagerV3/SafeManager.cs
diff --git a/CarManagerV2/StateManager.cs b/CarManagerV3/StateManager.cs
similarity index 100%
rename from CarManagerV2/StateManager.cs
rename to CarManagerV3/StateManager.cs
diff --git a/IAF42_Kaulmann_CarmanagerV2old.zip b/IAF42_Kaulmann_CarmanagerV2old.zip
deleted file mode 100644
index dfb952d..0000000
Binary files a/IAF42_Kaulmann_CarmanagerV2old.zip and /dev/null differ