diff --git a/VisualTeensy/App.xaml.cs b/VisualTeensy/App.xaml.cs
index bb3470a..025efd9 100644
--- a/VisualTeensy/App.xaml.cs
+++ b/VisualTeensy/App.xaml.cs
@@ -92,14 +92,14 @@ SetupData loadSetup()
             setupData.mru.load(Settings.Default.mruString);
             Helpers.arduinoPath = setupData.arduinoBase;
 
-            using (var reader = new StreamReader(Assembly.GetExecutingAssembly().GetManifestResourceStream("VisualTeensy.Embedded.makefile_make")))
-            {
-                setupData.makefile_fixed = reader.ReadToEnd();
-            }
-            using (var reader = new StreamReader(Assembly.GetExecutingAssembly().GetManifestResourceStream("VisualTeensy.Embedded.makefile_builder")))
-            {
-                setupData.makefile_builder = reader.ReadToEnd();
-            }
+            //using (var reader = new StreamReader(Assembly.GetExecutingAssembly().GetManifestResourceStream("VisualTeensy.Embedded.makefile_make")))
+            //{
+            //    setupData.makefile_fixed = reader.ReadToEnd();
+            //}
+            //using (var reader = new StreamReader(Assembly.GetExecutingAssembly().GetManifestResourceStream("VisualTeensy.Embedded.makefile_builder")))
+            //{
+            //    setupData.makefile_builder = reader.ReadToEnd();
+            //}
 
 
 
@@ -135,10 +135,11 @@ void saveSetup(SetupData setupData)
 
 
         protected override void OnStartup(StartupEventArgs e)
-        {
+        {          
+            CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.GetCultureInfo("en-US");
+         
             this.ShutdownMode = ShutdownMode.OnExplicitShutdown;
 
-            CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.GetCultureInfo("en-US");
 
             // create applicaton folder <user>\AppData\Local\VisualTeensy (if not yet existing)
             Directory.CreateDirectory(SetupData.vtAppFolder);
diff --git a/VisualTeensy/Properties/AssemblyInfo.cs b/VisualTeensy/Properties/AssemblyInfo.cs
index 657a60e..7505828 100644
--- a/VisualTeensy/Properties/AssemblyInfo.cs
+++ b/VisualTeensy/Properties/AssemblyInfo.cs
@@ -50,7 +50,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0")]
-[assembly: AssemblyFileVersion("1.1.0")]
+[assembly: AssemblyVersion("1.2.0")]
+[assembly: AssemblyFileVersion("1.2.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/VisualTeensy/ViewModel/MainWin/MainVM.cs b/VisualTeensy/ViewModel/MainWin/MainVM.cs
index e239449..e02003e 100644
--- a/VisualTeensy/ViewModel/MainWin/MainVM.cs
+++ b/VisualTeensy/ViewModel/MainWin/MainVM.cs
@@ -1,5 +1,7 @@
-using System.Collections.ObjectModel;
+using log4net;
+using System.Collections.ObjectModel;
 using System.IO;
+using System.Reflection;
 using System.Windows;
 using vtCore;
 using vtCore.Interfaces;
@@ -110,17 +112,19 @@ public MainVM(IProject project, LibManager libManager, SetupData setup)
                 projecTabVM.OnPropertyChanged("");
             };
 
-            mruList = new ObservableCollection<MruItemVM>();
+            mruList = new ObservableCollection<MruItemVM>();            
             foreach (var prj in setup.mru.projects)
             {
                 mruList.Add(new MruItemVM(prj, this));
             }
-            //var mruList = setup.mru.projects?.Select(p => new MruItemVM(p, this));
-            //if(mruList != null)  mruList = new ObservableCollection<MruItemVM>(mruList);
+            log.Info($"MRU list loaded ({mruList.Count} entries)");
+            log.Info("constructed");
         }
 
         public LibManager libManager { get; }
         public SetupData setup { get; }
         public IProject project { get; }
+
+        private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
     }
 }
diff --git a/VisualTeensy/ViewModel/ProjectTab/ProjectTabVM.cs b/VisualTeensy/ViewModel/ProjectTab/ProjectTabVM.cs
index 6089dd6..7378021 100644
--- a/VisualTeensy/ViewModel/ProjectTab/ProjectTabVM.cs
+++ b/VisualTeensy/ViewModel/ProjectTab/ProjectTabVM.cs
@@ -4,7 +4,8 @@
 using System.Linq;
 using vtCore.Interfaces;
 using vtCore;
-
+using log4net;
+using System.Reflection;
 
 namespace ViewModel
 {
@@ -76,14 +77,6 @@ void doClose(object o)
         {
             // model.saveSettings();
         }
-
-        public RelayCommand cmdCoreSelected { get; private set; }
-        void doCoreSelected(object o)
-        {
-            project.coreStrategy = (CoreStrategies)o;
-        }
-
-
         #endregion
 
         #region Properties ----------------------------------------------------
@@ -102,28 +95,16 @@ public BoardVM selectedBoard
             }
         }
 
-
         public bool isMakefileBuild => project.buildSystem == BuildSystem.makefile;
-        //    set
-        //    {
-        //        if (value != project.isMakefileBuild)
-        //        {
-        //            project.isMakefileBuild = value;
-        //            OnPropertyChanged();
-        //        }
-        //    }
-        //}
-
-                            
-        public bool quickSetup
+
+        public SetupTypes setupType
         {
-            get => project.selectedConfiguration.setupType == SetupTypes.quick ? true : false;
+            get => project.selectedConfiguration.setupType;
             set
             {
-                SetupTypes newType = value == true ? SetupTypes.quick : SetupTypes.expert;  // hack, valueConverter would be better
-                if (project.selectedConfiguration.setupType != newType)
+                if (project.selectedConfiguration.setupType != value)
                 {
-                    project.selectedConfiguration.setupType = newType;
+                    project.selectedConfiguration.setupType = value;
                     updateAll();
                     OnPropertyChanged("");
                 }
@@ -140,7 +121,21 @@ public bool hasDebugSupport
                 OnPropertyChanged("");
             }
         }
-
+        
+        public LibStrategy coreStragegy
+        {
+            get => project.selectedConfiguration.coreStrategy;
+            set
+            {
+                if (value != project.selectedConfiguration.coreStrategy)
+                {
+                    project.selectedConfiguration.coreStrategy = value;
+                    updateFiles();
+                    OnPropertyChanged("");
+                }
+            }
+        }
+        
         public string makefileExtension
         {
             get => project.selectedConfiguration.makefileExtension;
@@ -210,46 +205,7 @@ public String arduinoBase
                 }
             }
         }
-        //public String boardTxtPath
-        //{
-        //    get => project.selectedConfiguration.boardTxtPath;
-        //    set
-        //    {
-        //        if (value != project.selectedConfiguration.boardTxtPath)
-        //        {
-        //            project.selectedConfiguration.boardTxtPath = value.Trim();
-        //            updateAll();
-        //            OnPropertyChanged("");
-        //        }
-        //    }
-        //}
-        //public bool copyBoardTxt
-        //{
-        //    get => project.selectedConfiguration.copyBoardTxt;
-        //    set
-        //    {
-        //        if (value != project.selectedConfiguration.copyBoardTxt)
-        //        {
-        //            project.selectedConfiguration.copyBoardTxt = value;
-        //            OnPropertyChanged();
-        //            updateFiles();
-        //        }
-        //    }
-        //}
-
-        public bool copyCore
-        {
-            get => project.selectedConfiguration.copyCore;
-            set
-            {
-                if (value != project.selectedConfiguration.copyCore)
-                {
-                    project.selectedConfiguration.copyCore = value;
-                    OnPropertyChanged();
-                    updateFiles();
-                }
-            }
-        }
+               
         public String corePath
         {
             get => project.selectedConfiguration.coreBase.path;
@@ -303,13 +259,13 @@ public ProjectTabVM(IProject project, LibManager libManager, SetupData setup)
             settFile = ProjectSettings.generate(project);
             debugFile = DebugFile.generate(project, setup);
 
-
-
             cmdGenerate = new RelayCommand(doGenerate);//, o => project.pathError == null && !String.IsNullOrWhiteSpace(project.selectedConfiguration.makefile) && !String.IsNullOrWhiteSpace(project.tasks_json) && !String.IsNullOrWhiteSpace(project.props_json));
             cmdClose = new RelayCommand(doClose);
-            cmdCoreSelected = new RelayCommand(doCoreSelected);
-
+          
             updateBoards();
+            OnPropertyChanged("");
+
+            log.Info("constructed");
         }
 
         internal void updateAll()
@@ -320,7 +276,7 @@ internal void updateAll()
         }
         internal void updateFiles()
         {
-           
+            
 
             makefile = Makefile.generate(project, libManager, setup);
             taskFile = TaskFile.generate(project, setup);
@@ -365,6 +321,9 @@ protected void Message(string message)
         public IProject project;
         LibManager libManager;
         SetupData setup;
+
+
+        private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
     }
 }
 
diff --git a/VisualTeensy/ViewModel/SaveWin/SaveWinVM.cs b/VisualTeensy/ViewModel/SaveWin/SaveWinVM.cs
index 0523e38..230a28e 100644
--- a/VisualTeensy/ViewModel/SaveWin/SaveWinVM.cs
+++ b/VisualTeensy/ViewModel/SaveWin/SaveWinVM.cs
@@ -23,10 +23,10 @@ async Task doSave()
             while (!taskVMs.IsCurrentAfterLast)
             {
                 var taskVM = (TaskVM)taskVMs.CurrentItem;
-                log.Info(taskVM.title);
+                log.Info(taskVM.title + " started...");
 
                 await taskVM.action();
-                await Task.Delay(50);
+                await Task.Delay(150);
                 log.Info($"{taskVM.title} done");
 
                 taskVMs.MoveCurrentToNext();
diff --git a/VisualTeensy/ViewModel/SetupTab/SetupTabVM.cs b/VisualTeensy/ViewModel/SetupTab/SetupTabVM.cs
index eda7e91..aba0a23 100644
--- a/VisualTeensy/ViewModel/SetupTab/SetupTabVM.cs
+++ b/VisualTeensy/ViewModel/SetupTab/SetupTabVM.cs
@@ -1,7 +1,9 @@
-using System;
+using log4net;
+using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Drawing;
+using System.Reflection;
 using System.Windows.Data;
 using vtCore;
 using vtCore.Interfaces;
@@ -277,12 +279,13 @@ public int selectedFile
             get => _selectedFile;
             set => SetProperty(ref _selectedFile, value);
         }
-        int _selectedFile=0;
+        int _selectedFile = 0;
 
         public RelayCommand cmdAddFile { get; private set; }
         void doAddFile(object f)
         {
             string filename = f as String;
+            log.Info($"add additional file {filename}");
             setup.additionalFiles.Add(filename);
             additionalFilesView.Refresh();
         }
@@ -292,6 +295,7 @@ void doDelFile(object o)
         {
             if (selectedFile >= 0)
             {
+                log.Info($"delete additional file {setup.additionalFiles[selectedFile]}");
                 setup.additionalFiles.RemoveAt(selectedFile);
                 additionalFilesView.Refresh();
             }
@@ -309,10 +313,14 @@ public SetupTabVM(IProject project, SetupData setup)
             // additionalFiles = new ObservableCollection<string>(setup.additionalFiles);
 
             additionalFilesView = CollectionViewSource.GetDefaultView(setup.additionalFiles);
+
+            log.Info("constructed");
         }
 
         private readonly SetupData setup;
         private readonly IProject project;
+
+        private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
     }
 }
 
diff --git a/VisualTeensy/Views/Converters/EnumBooleanConverter.cs b/VisualTeensy/Views/Converters/EnumBooleanConverter.cs
new file mode 100644
index 0000000..2aa5913
--- /dev/null
+++ b/VisualTeensy/Views/Converters/EnumBooleanConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace VisualTeensy
+{
+    public class EnumBooleanConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value.Equals(parameter);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return ((bool)value) ? parameter : Binding.DoNothing;
+        }
+    }
+}
diff --git a/VisualTeensy/Views/ProjectTab.xaml b/VisualTeensy/Views/ProjectTab.xaml
index 44fa4a3..ab60c04 100644
--- a/VisualTeensy/Views/ProjectTab.xaml
+++ b/VisualTeensy/Views/ProjectTab.xaml
@@ -22,6 +22,8 @@ d:DataContext="{d:DesignInstance vm:ProjectTabVM, IsDesignTimeCreatable=False}"
 d:DesignHeight="800" d:DesignWidth="1000">
 
     <UserControl.Resources>
+        <!--<local:EnumBooleanConverter x:Key="EnumBooleanConverter"/>-->
+        <local:EnumBooleanConverter x:Key="EnumBooleanConverter"/>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
     </UserControl.Resources>
 
@@ -55,12 +57,18 @@ d:DesignHeight="800" d:DesignWidth="1000">
 
             <TextBlock Grid.Row="0" Grid.Column="0"  FontSize="18" Text="Configuration" Margin="0,0,0,0" HorizontalAlignment="Left" Foreground="{DynamicResource PrimaryHueDarkBrush}" />
             <StackPanel Grid.Row="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,28" >
-                <RadioButton x:Name="radioButton"  Content="Quick Setup" IsChecked="{Binding quickSetup}" Visibility="{Binding isMakefileBuild, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}" >
+                <RadioButton x:Name="radioButton"  Content="Quick Setup" 
+                             IsChecked="{Binding setupType, ConverterParameter={x:Static if:SetupTypes.quick}, Converter={StaticResource EnumBooleanConverter}}"
+                             Visibility="{Binding isMakefileBuild, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}" >
                     <RadioButton.ToolTip>
                         Quick Setup uses your Arduino installation to generate the project.
                     </RadioButton.ToolTip>
                 </RadioButton>
-                <RadioButton x:Name="radioButton1"  Content="Expert Setup" IsChecked="True" Margin="10,0,40,0" Visibility="{Binding isMakefileBuild, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}" >
+                <RadioButton 
+                    x:Name="radioButton1"  Content="Expert Setup" 
+                    IsChecked="{Binding setupType, ConverterParameter={x:Static if:SetupTypes.expert}, Converter={StaticResource EnumBooleanConverter}}"
+                    Margin="10,0,40,0" 
+                    Visibility="{Binding isMakefileBuild, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}" >
                     <RadioButton.ToolTip>
                         Expert Setup allows to choose the compiler and used core libraries independently of your Arduino installation.
                     </RadioButton.ToolTip>
@@ -102,21 +110,29 @@ d:DesignHeight="800" d:DesignWidth="1000">
                 <Label   Content="Compiler (gcc-arm-none-eabi):" FontWeight="SemiBold" FontSize="12"  Foreground="{DynamicResource PrimaryHueDarkBrush}" Padding="0" Margin="0,25,0,0" />
                 <local:PSelector SelectedPath="{Binding compilerPath, ValidatesOnDataErrors=True}" Style="{DynamicResource ValidatingControl}" isFolderDialog="True" />
 
-                <Label Content="Teensyduino Core" FontSize="12" FontWeight="SemiBold"  Foreground="{DynamicResource PrimaryHueDarkBrush}" Padding="0" Margin="0,20,0,5"  />
-                <RadioButton x:Name="rbLinkCore" GroupName="core" Content="Link to local core" Command="{Binding cmdCoreSelected, Mode=OneWay}" CommandParameter="{x:Static if:CoreStrategies.link}" Margin="10,5,0,0" IsChecked="True"/>
+                <Label Content="Teensyduino core" FontSize="12" FontWeight="SemiBold"  Foreground="{DynamicResource PrimaryHueDarkBrush}" Padding="0" Margin="0,20,0,5"  />
+                <RadioButton 
+                    x:Name="rbLinkCore" GroupName="core" 
+                    Content="Link to local core" Margin="10,5,0,0" 
+                    IsChecked="{Binding coreStragegy, ConverterParameter={x:Static if:LibStrategy.link}, Converter={StaticResource EnumBooleanConverter}}"/>
                 <local:PSelector SelectedPath="{Binding corePath, ValidatesOnDataErrors=True}" Style="{DynamicResource ValidatingControl}" isFolderDialog="True" Margin="35,0,0,0" Visibility="{Binding IsChecked, Converter={StaticResource BooleanToVisibilityConverter}, ElementName=rbLinkCore}" >
                     <local:PSelector.ToolTip>
                         Folder to copy the core library from. &#x0a;
                         Typically this folder has boards.txt, platform.txt and board specific folders for the corresponding core libraries 
                     </local:PSelector.ToolTip>
                 </local:PSelector>
-                <RadioButton x:Name="rbCopyCore" Content="Copy local core to project" Command="{Binding cmdCoreSelected, Mode=OneWay}" CommandParameter="{x:Static if:CoreStrategies.copy}"  GroupName="core" Margin="10,5,0,0" />
+                <RadioButton 
+                    x:Name="rbCopyCore"  GroupName="core" Margin="10,5,0,0" 
+                    Content="Copy local core into project"                     
+                    IsChecked="{Binding coreStragegy, ConverterParameter={x:Static if:LibStrategy.copy}, Converter={StaticResource EnumBooleanConverter}}"/>
                 <local:PSelector SelectedPath="{Binding corePath, ValidatesOnDataErrors=True}" Style="{DynamicResource ValidatingControl}" isFolderDialog="True" Margin="35,0,0,0" Visibility="{Binding IsChecked, Converter={StaticResource BooleanToVisibilityConverter}, ElementName=rbCopyCore}"  />
-                <RadioButton x:Name="rbCloneCore" Content="Clone core from gitHub into project"  Command="{Binding cmdCoreSelected, Mode=OneWay}" CommandParameter="{x:Static if:CoreStrategies.clone}" GroupName="core"   Margin="10,5,0.4,0" />
-
-                <CheckBox Content="Embedd in project (recommended)" FontSize="10" IsChecked="{Binding copyCore}" Visibility="Collapsed"/>
-
-
+                <RadioButton 
+                    x:Name="rbCloneCore" 
+                    Content="Clone core from gitHub into project"  
+                    GroupName="core"  
+                    Margin="10,5,0.4,0"
+                    IsChecked="{Binding coreStragegy, ConverterParameter={x:Static if:LibStrategy.clone}, Converter={StaticResource EnumBooleanConverter}}"/>
+                    
                 <Label   Content="Additional entries to makefile:" FontWeight="SemiBold" FontSize="12" Foreground="{DynamicResource PrimaryHueDarkBrush}" Padding="0" Margin="0,25,0,0" />
             </StackPanel>
             <TextBox Grid.Row="5" Grid.ColumnSpan="2" VerticalContentAlignment="Stretch" BorderThickness="1" AcceptsReturn="True" AcceptsTab="True" TextWrapping="NoWrap" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Auto" FontFamily="Courier New" FontSize="13"  Visibility="{Binding IsChecked, Converter={StaticResource BooleanToVisibilityConverter}, ElementName=radioButton1}" Text="{Binding makefileExtension, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Delay=100}"/>
diff --git a/VisualTeensy/VisualTeensy.csproj b/VisualTeensy/VisualTeensy.csproj
index 9736f34..491d31e 100644
--- a/VisualTeensy/VisualTeensy.csproj
+++ b/VisualTeensy/VisualTeensy.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.2.0.306\build\net46\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.306\build\net46\LibGit2Sharp.NativeBinaries.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -69,9 +70,7 @@
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-  </PropertyGroup>
+  <PropertyGroup />
   <PropertyGroup>
     <ApplicationIcon>app.ico</ApplicationIcon>
   </PropertyGroup>
@@ -87,10 +86,16 @@
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
+  <PropertyGroup />
+  <PropertyGroup />
+  <PropertyGroup />
   <ItemGroup>
     <Reference Include="GongSolutions.Wpf.DragDrop, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll</HintPath>
     </Reference>
+    <Reference Include="LibGit2Sharp, Version=0.26.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibGit2Sharp.0.26.2\lib\net46\LibGit2Sharp.dll</HintPath>
+    </Reference>
     <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
     </Reference>
@@ -139,6 +144,7 @@
     <Compile Include="ViewModel\SaveWin\TaskVM.cs" />
     <Compile Include="ViewModel\SetupTab\SetupTabVM.cs" />
     <Compile Include="ViewModel\StartupSettingsVM.cs" />
+    <Compile Include="Views\Converters\EnumBooleanConverter.cs" />
     <Compile Include="Views\Converters\VisibilityConverter.cs" />
     <Compile Include="Views\Converters\ColorBrushConverter.cs" />
     <Compile Include="Views\FileDisplayWindow.xaml.cs">
@@ -314,7 +320,20 @@
   <PropertyGroup>
     <PostBuildEvent>if $(ConfigurationName) == Release (powershell Compress-Archive -Path '$(TargetDir)*.dll', '$(TargetDir)*.exe', '$(TargetDir)*.config' -DestinationPath '$(TargetDir)\VisualTeensy.zip' -Force)</PostBuildEvent>
   </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <Target Name="RemoveNonWindowsLibGit2SharpLibraries" BeforeTargets="_DeploymentComputeClickOnceManifestInfo">
+    <ItemGroup>
+      <ContentWithTargetPath Remove="@(ContentWithTargetPath)" Condition="'%(Extension)' == '.so'" />
+      <ContentWithTargetPath Remove="@(ContentWithTargetPath)" Condition="'%(Extension)' == '.dylib'" />
+      <ContentWithTargetPath Remove="@(ContentWithTargetPath)" Condition="'%(Filename)%(Extension)' == 'LibGit2Sharp.dll.config'" />
+    </ItemGroup>
+  </Target>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.2.0.306\build\net46\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.2.0.306\build\net46\LibGit2Sharp.NativeBinaries.props'))" />
+  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
diff --git a/VisualTeensy/packages.config b/VisualTeensy/packages.config
index c512512..41f98da 100644
--- a/VisualTeensy/packages.config
+++ b/VisualTeensy/packages.config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="gong-wpf-dragdrop" version="1.1.0" targetFramework="net461" />
+  <package id="LibGit2Sharp" version="0.26.2" targetFramework="net461" />
+  <package id="LibGit2Sharp.NativeBinaries" version="2.0.306" targetFramework="net461" />
   <package id="log4net" version="2.0.12" targetFramework="net461" />
   <package id="MaterialDesignColors" version="1.1.3" targetFramework="net47" />
   <package id="MaterialDesignThemes" version="2.4.1.1101" targetFramework="net461" />
diff --git a/vtCore/Implementation/Configuration.cs b/vtCore/Implementation/Configuration.cs
index 10fda07..974c93d 100644
--- a/vtCore/Implementation/Configuration.cs
+++ b/vtCore/Implementation/Configuration.cs
@@ -58,6 +58,8 @@ public string compiler
         // core --------------------------------------
         public CheckedPath coreBase { get; } = new CheckedPath("boards.txt", optional: false);
         public bool copyCore { get; set; }
+        public LibStrategy coreStrategy { get; set; }
+
         public bool localCore { get; set; }
         public string core
         {
diff --git a/vtCore/Implementation/FileHelpers.cs b/vtCore/Implementation/FileHelpers.cs
index dedc073..e8eb458 100644
--- a/vtCore/Implementation/FileHelpers.cs
+++ b/vtCore/Implementation/FileHelpers.cs
@@ -1,4 +1,5 @@
-using log4net;
+using LibGit2Sharp;
+using log4net;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -78,7 +79,6 @@ public static string findTyToolsFolder()
 
             return null;
         }
-
         public static string findJLinkFolder()
         {
             string folder;
@@ -97,7 +97,6 @@ public static string findJLinkFolder()
 
             return null;
         }
-
         public static string findCLIFolder()
         {
             string folder;
@@ -254,7 +253,7 @@ public async static Task downloadLibrary(IProjectLibrary lib, DirectoryInfo libB
             if (!libBase.Exists) libBase.Create();
 
 
-            var libDir = new DirectoryInfo(Path.Combine(libBase.FullName,lib.targetFolder));
+            var libDir = new DirectoryInfo(Path.Combine(libBase.FullName, lib.targetFolder));
             if (libDir.Exists) libDir.Delete(true);
 
             // we will save the *.zip in a temp file and unzip into %temp%/vslib            
@@ -290,6 +289,8 @@ public async static Task downloadLibrary(IProjectLibrary lib, DirectoryInfo libB
             }
         }
 
+      
+
 
         [DllImport("kernel32", EntryPoint = "GetShortPathName", CharSet = CharSet.Auto, SetLastError = true)]
         private static extern int getShortPathName(string longPath, StringBuilder shortPath, int bufSize);
diff --git a/vtCore/Implementation/GitHelpers.cs b/vtCore/Implementation/GitHelpers.cs
new file mode 100644
index 0000000..7e9d80d
--- /dev/null
+++ b/vtCore/Implementation/GitHelpers.cs
@@ -0,0 +1,24 @@
+using LibGit2Sharp;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace vtCore.Implementation
+{
+    internal class GitHelpers
+    {
+        public static string getGitRemote(string folder)
+        {
+            folder += @"\.git\";
+                        
+            if (Repository.Discover(folder) == folder)  // folder is git repo
+            {
+                using (var repo = new Repository(folder))
+                {   
+                    return repo.Config.GetValueOrDefault<string>("remote.origin.url"); 
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/vtCore/Implementation/Libraries/GitLibrary.cs b/vtCore/Implementation/Libraries/GitLibrary.cs
new file mode 100644
index 0000000..f79979c
--- /dev/null
+++ b/vtCore/Implementation/Libraries/GitLibrary.cs
@@ -0,0 +1,55 @@
+using LibGit2Sharp;
+using log4net;
+using System;
+using System.IO;
+using System.Reflection;
+using System.Threading.Tasks;
+using vtCore.Implementation;
+using vtCore.Interfaces;
+
+namespace vtCore
+{
+    internal class GitLibrary : Library, IProjectLibrary
+    {
+        public enum gitError
+        {
+            OK, folderExists, folderNoGitRepo, wrongGitRepo, canNotClone,
+        }
+
+        public GitLibrary(string repoURL, string target)
+        {
+            this.url = repoURL;
+            this.targetFolder = target;
+
+            alreadyCloned = (url == GitHelpers.getGitRemote(target));
+        }
+
+        public bool alreadyCloned { get; }
+        public string targetFolder { get; set; }
+        public string url { get; set; }
+
+        public async Task<GitError> clone()
+        {
+            if (alreadyCloned) return GitError.OK;
+
+            try
+            {
+                if (Directory.Exists(targetFolder))
+                {
+                    log.Info($"{targetFolder} doesn't contain a valid repository -> delete");
+                    Directory.Delete(targetFolder, true);  
+
+                }
+                await Task.Run(() => Repository.Clone(url, targetFolder));
+                return GitError.OK;
+            }
+            catch (Exception ex)
+            {
+                log.Error(ex.Message, ex);
+                return GitError.Unexpected;
+            }
+        }
+        private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+    }
+}
+
diff --git a/vtCore/Implementation/Libraries/LibManager.cs b/vtCore/Implementation/Libraries/LibManager.cs
index 5c222a4..77a96b7 100644
--- a/vtCore/Implementation/Libraries/LibManager.cs
+++ b/vtCore/Implementation/Libraries/LibManager.cs
@@ -40,7 +40,7 @@ public void update()
             if (rvm.libraries != null) repositories.Add(rvm);
         }
 
-        private SetupData setup;
+        private readonly SetupData setup;
     }
 }
 
diff --git a/vtCore/Implementation/Libraries/LibraryReader.cs b/vtCore/Implementation/Libraries/LibraryReader.cs
index 00dbe15..c8c2ba4 100644
--- a/vtCore/Implementation/Libraries/LibraryReader.cs
+++ b/vtCore/Implementation/Libraries/LibraryReader.cs
@@ -81,64 +81,6 @@ public static ILookup<string, ILibrary> parseIndexJsonRepository(string library_
         }
 
 
-
-        //public static ILookup<string, Library> parseLocalRepository(string repoBase)
-        //{
-        //    return Directory.GetDirectories(repoBase)
-        //        .Select(libFolder => parseLibProps(libFolder))
-        //        .ToLookup(k => k.name);
-        //}
-
-        //static Library parseLibProps(string libFolder)
-        //{
-        //    var lib = new Library();
-
-        //    lib.sourceUri = new Uri(libFolder);
-        //    //lib.path = Path.GetFileName(libFolder);
-
-        //    var libProps = Path.Combine(libFolder, "library.properties");
-
-        //    if (File.Exists(libProps))
-        //    {
-        //       // lib.source = lib.path;
-        //      //  lib.sourceType = Library.SourceType.localFolder;
-        //      //  lib.isLocal = true;
-
-        //        char[] keySep = { '=' };
-        //        var props = File.ReadAllLines(libProps)
-        //            .Select(line => line.Split(keySep, StringSplitOptions.RemoveEmptyEntries))
-        //            .Where(line => line.Count() == 2)
-        //            .ToDictionary(keySelector: line => line[0].Trim().ToLower(), elementSelector: line => line[1].Trim());
-
-        //        lib.name = props.GetValueOrDefault("name");
-        //        lib.version = props.GetValueOrDefault("version");
-        //        lib.author = props.GetValueOrDefault("author");
-        //        lib.maintainer = props.GetValueOrDefault("maintainer");
-        //        lib.sentence = props.GetValueOrDefault("sentence");
-        //        lib.paragraph = props.GetValueOrDefault("paragraph");
-        //        lib.category = props.GetValueOrDefault("category");
-        //        lib.website = props.GetValueOrDefault("url");
-
-
-        //    }
-        //    else
-        //    {
-        //        lib.name = Path.GetFileName(libFolder);
-        //        //  path = Path.GetFileName(libFolder);
-        //        //lib.sourceType = Library.SourceType.localFolder;
-        //        //lib.source = libFolder;
-        //        lib.sentence = "no information";
-        //        lib.version = "?";
-        //    }
-
-        //    if (String.IsNullOrWhiteSpace(lib.website))
-        //    {
-        //        lib.website = lib.sourceUri.AbsolutePath;
-        //    }
-
-        //    return lib;
-        //}
-
         public static string getValueOrDefault(this IDictionary<string, string> dictionary, string key)
         {
             return dictionary.TryGetValue(key, out string value) ? value.Trim() : null;
diff --git a/vtCore/Implementation/Project Generators/AtomGenerator.cs b/vtCore/Implementation/Project Generators/AtomGenerator.cs
index 0304164..cc386f9 100644
--- a/vtCore/Implementation/Project Generators/AtomGenerator.cs	
+++ b/vtCore/Implementation/Project Generators/AtomGenerator.cs	
@@ -20,7 +20,7 @@ public IReadOnlyList<ITask> getTasks(IProject project, LibManager libManager, Se
             tasks.Add(new GenerateTasks(project, setup));
             tasks.Add(new CopyLibs(project));
 
-            if (project.selectedConfiguration.copyCore)
+            if (project.selectedConfiguration.coreStrategy == LibStrategy.copy)  ///Todo: other settings....
             {
                 tasks.Add(new CopyCore(project));
             }
@@ -102,10 +102,6 @@ static public async Task ardGenerator(IProject project, LibManager libManager, S
                 progressHandler.Report("OK");
                 await Task.Delay(1);
             }
-
-            //var bat = project.path + "\\build.bat";
-            //File.WriteAllText(bat, builder_build_bat.generate(project,setup));
-
         }
 
         static public async Task mkGenerator(IProject project, LibManager libManager, SetupData setup, IProgress<string> progressHandler)
diff --git a/vtCore/Implementation/Project Generators/CodeGenerator.cs b/vtCore/Implementation/Project Generators/CodeGenerator.cs
index a4a7510..3f063c0 100644
--- a/vtCore/Implementation/Project Generators/CodeGenerator.cs	
+++ b/vtCore/Implementation/Project Generators/CodeGenerator.cs	
@@ -21,10 +21,11 @@ public static IReadOnlyList<ITask> getTasks(IProject project, LibManager libMana
                     if (project.buildSystem == BuildSystem.makefile)
                     {
                         tasks.Add(new CopyLibs(project));
-                        if (project.selectedConfiguration.copyCore)
+                        switch(project.selectedConfiguration.coreStrategy)
                         {
-                            tasks.Add(new CopyCore(project));
-                        }
+                            case LibStrategy.copy: tasks.Add(new CopyCore(project)); break;
+                            case LibStrategy.clone: tasks.Add(new CloneCore(project)); break;
+                        }                      
                     }
                     if(project.debugSupport == DebugSupport.cortex_debug)
                     {
@@ -45,175 +46,6 @@ public static IReadOnlyList<ITask> getTasks(IProject project, LibManager libMana
             }
 
             return tasks;
-        }
-
-        // static string mainFile;
-
-        //public async Task generate(IProject p, LibManager l, SetupData s, IProgress<string> progressHandler)
-        //{
-
-        //    return;
-
-        //    //progressHandler.Report("Check or create folders");
-        //    var vsCodeFolder = Path.Combine(project.path, ".vscode");
-        //    var vsTeensyFolder = Path.Combine(project.path, ".vsteensy");
-        //    //var buildFolder = Path.Combine(project.path, vsTeensyFolder, "build");
-        //    //Directory.CreateDirectory(vsCodeFolder);
-        //    //Directory.CreateDirectory(vsTeensyFolder);
-        //    //if (Directory.Exists(buildFolder)) Directory.Delete(buildFolder, true);
-        //    //Directory.CreateDirectory(buildFolder);
-
-        //    // await Task.Delay(1);
-        //    //progressHandler.Report("OK");
-
-        //    // Intellisense -----------------------------------------------------------------------
-        //    //progressHandler.Report("Generate c_cpp_properties.json");
-        //    //var c_cpp_propsFile = Path.Combine(vsCodeFolder, "c_cpp_properties.json");
-        //    //var c_cpp_props = IntellisenseFile.generate(project, libManager, setup);
-        //    //File.WriteAllText(c_cpp_propsFile, c_cpp_props);
-        //    //progressHandler.Report("OK");
-        //    //await Task.Delay(1);
-
-        //    //// Settings ---------------------------------------------------------------------------
-        //    //progressHandler.Report("Generate vsteensy.json");
-        //    //var settingsFile = Path.Combine(vsTeensyFolder, "vsteensy.json");
-        //    //var projectSettingsJson = ProjectSettings.generate(project);
-        //    //File.WriteAllText(settingsFile, projectSettingsJson);
-        //    //progressHandler.Report("OK");
-        //    //await Task.Delay(1);
-
-        //    // Makefile ---------------------------------------------------------------------------
-        //    //progressHandler.Report("Generate makefile");
-        //    //var makefile = Path.Combine(project.path, "makefile");
-        //    //File.WriteAllText(makefile, Makefile.generate(project, libManager, setup));
-        //    //progressHandler.Report("OK");
-        //    //await Task.Delay(1);
-
-        //    // Task_json --------------------------------------------------------------------------
-        //    //progressHandler.Report("Generate tasks.json");
-        //    //var taskJsonFile = Path.Combine(vsCodeFolder, "tasks.json");
-        //    //var tasks_json = TaskFile.generate(project, libManager, setup);
-        //    //File.WriteAllText(taskJsonFile, tasks_json);
-        //    //progressHandler.Report("OK");
-        //    //await Task.Delay(1);
-
-        //    // Debugging --------------------------------------------------------------------------
-        //    if (project.debugSupport != DebugSupport.none)
-        //    {
-        //        progressHandler.Report("Generate flash.jlink");
-        //        var flashJinkFile = Path.Combine(vsTeensyFolder, "flash.jlink");
-        //        var flash_jlink = JLinkUploadScript.generate(project, setup);
-        //        File.WriteAllText(flashJinkFile, flash_jlink);
-        //        progressHandler.Report("OK");
-        //        await Task.Delay(1);
-
-        //        progressHandler.Report("Generate launch.json");
-        //        var launchJsonFile = Path.Combine(vsCodeFolder, "launch.json");
-        //        var launch_json = DebugFile.generate(project, setup);
-        //        File.WriteAllText(launchJsonFile, launch_json);
-        //        progressHandler.Report("OK");
-        //        await Task.Delay(1);
-        //    }
-
-        //    // BuildSystem Makefile ---------------------------------------------------------------
-        //    if (project.buildSystem == BuildSystem.makefile)
-        //    {
-        //        DirectoryInfo source, target;
-
-        //        target = new DirectoryInfo(Path.Combine(project.path, "src"));
-        //        target.Create();
-
-        //        //FileInfo mainFile = new FileInfo(Path.Combine(target.FullName, "main.cpp"));
-        //        ////mainFile = Path.Combine(srcFolder, "main.cpp");
-        //        //if (!mainFile.Exists)
-        //        ////if (!File.Exists(mainFile))
-        //        //{
-        //        //    progressHandler.Report($"{mainFile.Name} generated");
-        //        //    File.WriteAllText(mainFile.FullName, Strings.mainCpp);
-        //        //    progressHandler.Report($"OK");
-        //        //    await Task.Delay(1);
-        //        //}
-
-        //        //// copy core ----------------------------------------------------------------------                
-        //        //DirectoryInfo coreFolder = new DirectoryInfo(Path.Combine(project.path, "core"));
-        //        //if (coreFolder.Exists) coreFolder.Delete(true);
-
-        //        //if (project.selectedConfiguration.copyCore)
-        //        //{
-        //        //    source = new DirectoryInfo(project.selectedConfiguration.core);
-        //        //    Helpers.copyFilesRecursively(source, coreFolder);
-        //        //}
-
-        //        // copy local libraries -----------------------------------------------------------
-        //        if (project.selectedConfiguration.localLibs.Any())
-        //        {
-        //            DirectoryInfo libFolder = new DirectoryInfo(Path.Combine(project.path, "lib"));
-        //            libFolder.Create();
-
-        //            foreach (Library library in project.selectedConfiguration.localLibs)
-        //            {
-        //                if (library.sourceType != Library.SourceType.net)
-        //                {
-        //                    target = new DirectoryInfo(Path.Combine(libFolder.FullName, library.path));
-        //                    source = new DirectoryInfo(library.source);
-        //                    if (source.FullName != target.FullName)
-        //                    {
-        //                        if (target.Exists) target.Delete();
-
-        //                        progressHandler.Report($"Copy library {library.name}");
-        //                        await Task.Delay(1);
-
-        //                        Helpers.copyFilesRecursively(source, target);
-
-        //                        progressHandler.Report($"OK");
-        //                        await Task.Delay(1);
-        //                    }
-        //                }
-        //                else
-        //                {
-        //                    progressHandler.Report($"Download library {library.name}");
-        //                    await Task.Delay(1);
-
-        //                    Helpers.downloadLibrary(library, libFolder.FullName);
-
-        //                    progressHandler.Report($"OK");
-        //                    await Task.Delay(1);
-        //                }
-        //            }
-        //        }
-
-
-        //    }
-        //    else    // BuildSystem Arduino Builder-------------------------------------------------
-        //    {
-        //        mainFile = Path.Combine(project.path, project.name + ".ino");
-        //        if (!File.Exists(mainFile))
-        //        {
-        //            progressHandler.Report($"{mainFile} generated");
-        //            File.WriteAllText(mainFile, Strings.sketchIno);
-        //            progressHandler.Report("OK");
-        //            await Task.Delay(1);
-        //        }
-        //    }
-        //    progressHandler.Report("Start vsCode");
-        //    await Task.Delay(1);
-        //    Starter.start_vsCode(project.path, mainFile);
-        //    progressHandler.Report("OK");
-        //}
-
-
-        //static public void ardGenerator(IProject project, LibManager libManager, SetupData setup)
-        //{
-
-
-        //}
-
-        //static public void mkGenerator(IProject project, LibManager libManager, SetupData setup)
-        //{
-
-
-        //    // copy makefile ----------------------------------------------------------------------
-
-        //}
+        }  
     }
 }
diff --git a/vtCore/Implementation/Project Generators/Makefiles/Makefile.cs b/vtCore/Implementation/Project Generators/Makefiles/Makefile.cs
index 796f207..2062274 100644
--- a/vtCore/Implementation/Project Generators/Makefiles/Makefile.cs	
+++ b/vtCore/Implementation/Project Generators/Makefiles/Makefile.cs	
@@ -1,4 +1,6 @@
-using vtCore.Interfaces;
+using log4net;
+using System.Reflection;
+using vtCore.Interfaces;
 
 namespace vtCore
 {
@@ -6,8 +8,10 @@ public class Makefile
     {
         public static string generate(IProject project, LibManager libManager, SetupData setup)
         {
+            log.Info($"generate, mode: {project.buildSystem}");
+
             if (project.buildSystem == BuildSystem.makefile)
-            {
+            {                
                 return Makefile_Make.generate(project, libManager, setup);
             }
             else
@@ -15,5 +19,7 @@ public static string generate(IProject project, LibManager libManager, SetupData
                 return Makefile_Builder.generate(project, libManager, setup);
             }
         }
+
+        private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
     }
 }
diff --git a/vtCore/Implementation/Project Generators/Makefiles/Makefile_Builder.cs b/vtCore/Implementation/Project Generators/Makefiles/Makefile_Builder.cs
index a60049e..ae40b38 100644
--- a/vtCore/Implementation/Project Generators/Makefiles/Makefile_Builder.cs	
+++ b/vtCore/Implementation/Project Generators/Makefiles/Makefile_Builder.cs	
@@ -18,7 +18,7 @@ static public string generate(IProject project, LibManager libManager, SetupData
             StringBuilder mf = new StringBuilder();
 
             mf.Append("#******************************************************************************\n");
-            mf.Append("# Generated by VisualTeensy (https://github.com/luni64/VisualTeensy)\n");
+            mf.Append("# Generated by VisualTeensy (https://github.com/luni64/VisualTeensy)   {DateTime.Now.ToShortDateString()} {DateTime.Now.ToShortTimeString()}\n");
             mf.Append("#\n");
             mf.Append($"# {"Board",-18} {cfg.selectedBoard.name}\n");
             foreach (var o in cfg.selectedBoard.optionSets)
@@ -26,7 +26,7 @@ static public string generate(IProject project, LibManager libManager, SetupData
                 mf.Append($"# {o.name,-18} {o.selectedOption?.name}\n");
             }
             mf.Append("#\n");
-            mf.Append($"# {DateTime.Now.ToShortDateString()} {DateTime.Now.ToShortTimeString()}\n");
+            mf.Append($"# ");
             mf.Append("#******************************************************************************\n");
 
             mf.Append($"SHELL            := cmd.exe\nexport SHELL\n\n");
diff --git a/vtCore/Implementation/Project Generators/Makefiles/Makefile_Make.cs b/vtCore/Implementation/Project Generators/Makefiles/Makefile_Make.cs
index 03abc1f..c72d3a0 100644
--- a/vtCore/Implementation/Project Generators/Makefiles/Makefile_Make.cs	
+++ b/vtCore/Implementation/Project Generators/Makefiles/Makefile_Make.cs	
@@ -21,7 +21,7 @@ static public string generate(IProject project, LibManager libManager, SetupData
 
             StringBuilder mf = new StringBuilder();
             mf.Append($"#******************************************************************************\n");
-            mf.Append($"# Generated by VisualTeensy V{v.Major}.{v.Minor}.{v.Build} \n");
+            mf.Append($"# Generated by VisualTeensy V{v.Major}.{v.Minor}.{v.Build} on {DateTime.Now.ToShortDateString()} at {DateTime.Now.ToShortTimeString()}\n");        
             mf.Append("#\n");
             mf.Append($"# {"Board",-18} {board.name}\n");
             foreach (var o in board.optionSets)
@@ -29,7 +29,7 @@ static public string generate(IProject project, LibManager libManager, SetupData
                 mf.Append($"# {o.name,-18} {o.selectedOption?.name}\n");
             }
             mf.Append("#\n");
-            mf.Append($"# {DateTime.Now.ToShortDateString()} {DateTime.Now.ToShortTimeString()}\n");
+          //  mf.Append($"# {DateTime.Now.ToShortDateString()} {DateTime.Now.ToShortTimeString()}\n");
             mf.Append($"# https://github.com/luni64/VisualTeensy\n");
             mf.Append("#******************************************************************************\n");
 
@@ -64,8 +64,20 @@ static public string generate(IProject project, LibManager libManager, SetupData
             }
             else
             {
-                mf.Append($"CORE_BASE        := {((cfg.copyCore || (Path.GetDirectoryName(cfg.coreBase.path) == project.path)) ? "core" : Helpers.getShortPath(cfg.core))}\n");
+                switch (cfg.coreStrategy)
+                {
+                    case LibStrategy.link:
+                        mf.Append($"CORE_BASE        := {Helpers.getShortPath(Path.Combine(cfg.coreBase.path , "cores", cfg.selectedBoard.core))}\n");
+                        break;
+
+                    case LibStrategy.copy:
+                    case LibStrategy.clone:
+                        mf.Append($"CORE_BASE        := {Path.Combine("cores", cfg.selectedBoard.core)}\n");
+                        break;
+
+                }
                 mf.Append($"GCC_BASE         := {cfg.compiler}\n");
+                               
                 if (!String.IsNullOrWhiteSpace(setup.uplPjrcBase.path)) mf.Append($"UPL_PJRC_B       := {setup.uplPjrcBase.shortPath}\n");
                 //mf.Append($"UPL_PJRC_B       := {setup.uplPjrcBase.shortPath}\n");
             }
diff --git a/vtCore/Implementation/Project Generators/TaskFiles/TaskFile.cs b/vtCore/Implementation/Project Generators/TaskFiles/TaskFile.cs
index 1c7679d..bfbbd1c 100644
--- a/vtCore/Implementation/Project Generators/TaskFiles/TaskFile.cs	
+++ b/vtCore/Implementation/Project Generators/TaskFiles/TaskFile.cs	
@@ -1,4 +1,6 @@
-using vtCore.Interfaces;
+using log4net;
+using System.Reflection;
+using vtCore.Interfaces;
 
 namespace vtCore
 {
@@ -6,6 +8,8 @@ public class TaskFile
     {
         public static string generate(IProject project, SetupData setup)
         {
+            log.Info($"generate, target: {project.target} ");
+
             switch (project.target)
             {
                 case Target.vsCode:
@@ -24,5 +28,7 @@ public static string generate(IProject project, SetupData setup)
                     return "Error";
             }
         }
+        private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
     }
+    
 }
diff --git a/vtCore/Implementation/Project Generators/Tasks.cs b/vtCore/Implementation/Project Generators/Tasks.cs
index ec9a837..59d7733 100644
--- a/vtCore/Implementation/Project Generators/Tasks.cs	
+++ b/vtCore/Implementation/Project Generators/Tasks.cs	
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using vtCore.Interfaces;
@@ -267,15 +266,15 @@ public GenerateSketch(IProject project)
     //--------------------------------------------------------------------------------------------
     class CopyCore : ITask
     {
-        public string title => $"Copy core libraries";
-        public string description => $"from: {sourceUri.LocalPath} to: ./core/";
+        public string title => $"Copy teensyduino core";
+        public string description => $"from: {sourceUri.LocalPath} to: ./cores";
 
         public string status => done ? "OK" : Directory.Exists(targetUri.LocalPath) ? "Exists" : "Copy";
 
         public CopyCore(IProject project)
         {
-            sourceUri = new Uri(project.selectedConfiguration.core);
-            targetUri = new Uri(Path.Combine(project.path, "core"));
+            sourceUri = new Uri(Path.Combine(project.selectedConfiguration.coreBase.path, "cores"));
+            targetUri = new Uri(Path.Combine(project.path, "cores"));
             done = false;
         }
 
@@ -294,6 +293,39 @@ public CopyCore(IProject project)
         private readonly Uri sourceUri;
     }
 
+    class CloneCore : ITask
+    {
+        public string title => $"Clone teensyduino core";
+        public string description { get; } 
+        public string status { get; private set; }
+
+        public CloneCore(IProject project)
+        {
+            this.project = project;
+
+            var coreURL = "https://github.com/PaulStoffregen/cores.git";
+            var targetFolder = Path.Combine(project.path, "cores");
+            coreLib = new GitLibrary(coreURL, targetFolder);
+
+            status = coreLib.alreadyCloned ? "Nothing to do (already cloned)" : "Clone";
+            description = $"from: {coreURL} to: ./cores";
+        }
+
+        public Func<Task> action => async () =>
+        {
+            if (!coreLib.alreadyCloned)
+            {
+                await project.gitInitAsync();
+                await coreLib.clone();
+            }            
+            status = "OK";
+        };
+               
+        GitLibrary coreLib;
+        IProject project;
+    }
+
+
     //--------------------------------------------------------------------------------------------
     // Copy local libraries
     //--------------------------------------------------------------------------------------------
@@ -318,9 +350,9 @@ public CopyLibs(IProject project)
             foreach (IProjectLibrary library in project.selectedConfiguration.localLibs)
             {
                 if (library.isLocalSource)
-                {                   
-                    DirectoryInfo tgtFolder = new DirectoryInfo(Path.Combine(project.libBase,library.targetFolder));
-                    DirectoryInfo srcFolder = new DirectoryInfo(library.sourceUri.LocalPath);                 
+                {
+                    DirectoryInfo tgtFolder = new DirectoryInfo(Path.Combine(project.libBase, library.targetFolder));
+                    DirectoryInfo srcFolder = new DirectoryInfo(library.sourceUri.LocalPath);
                     Helpers.copyFilesRecursively(srcFolder, tgtFolder);
                 }
                 else if (library.isWebSource)
@@ -343,7 +375,7 @@ public CopyLibs(IProject project)
     class CopyAdditionalFiles : ITask
     {
         public string title => $"Copy additional files";
-        public string description =>fileList;
+        public string description => fileList;
 
         public string status => done ? "OK" : "Copy";
 
@@ -364,9 +396,9 @@ public CopyAdditionalFiles(IProject project, SetupData setup)
 
         public Func<Task> action => async () =>
         {
-            foreach(var sourceFile in setup.additionalFiles)
+            foreach (var sourceFile in setup.additionalFiles)
             {
-                if(File.Exists(sourceFile))
+                if (File.Exists(sourceFile))
                 {
                     string destFile = Path.Combine(project.path, Path.GetFileName(sourceFile));
                     if (!File.Exists(destFile))
diff --git a/vtCore/Implementation/Project.cs b/vtCore/Implementation/Project.cs
index 4ca6811..7d33e60 100644
--- a/vtCore/Implementation/Project.cs
+++ b/vtCore/Implementation/Project.cs
@@ -1,8 +1,12 @@
-using Newtonsoft.Json;
+using LibGit2Sharp;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Security.Policy;
+using System.Threading.Tasks;
 using vtCore.Interfaces;
 
 namespace vtCore
@@ -20,7 +24,7 @@ public static LibManager makeLibManager(SetupData setup)
     }
 
     internal class Project : IProject
-    {    
+    {
         public IEnumerable<IConfiguration> configurations => _configurations;
         public IConfiguration selectedConfiguration => _selectedConfiguration;
 
@@ -29,7 +33,7 @@ internal class Project : IProject
         public Target target { get; set; } = Target.vsCode;
         public BuildSystem buildSystem { get; set; } = BuildSystem.makefile;
         public DebugSupport debugSupport { get; set; } = DebugSupport.none;
-        public CoreStrategies coreStrategy { get; set; } = CoreStrategies.copy;
+        public LibStrategy coreStrategy { get; set; } = LibStrategy.copy;
 
         // public bool isMakefileBuild { get; set; } = true;
 
@@ -51,7 +55,7 @@ public string pathError
         public string cleanName => name.Replace(" ", "_");
         public string mainSketchPath => buildSystem == BuildSystem.makefile ? Path.Combine(path, "src", "main.cpp") : Path.Combine(path, cleanName + ".ino");
         public bool isNew { get; set; }
-       
+
         public void newProject()
         {
             isNew = true;
@@ -70,7 +74,7 @@ public void newProject()
             var sc = Configuration.getDefault(setup);
 
             _selectedConfiguration = sc;
-            _configurations.Add(sc);           
+            _configurations.Add(sc);
 
             var dummyConfig = Configuration.getDefault(setup);
             dummyConfig.name = "Testdummy";
@@ -93,7 +97,7 @@ public void openProject(string projectPath)
             {
                 openExistingFolder(vsTeensyJsonPath);
             }
-            isNew = false; 
+            isNew = false;
         }
 
         public Project(SetupData setup, LibManager libManager)
@@ -102,7 +106,7 @@ public Project(SetupData setup, LibManager libManager)
             this.libManager = libManager;
             this._configurations = new List<IConfiguration>();
         }
-                
+
         private void openNewFolder()
         {
             buildSystem = BuildSystem.makefile;
@@ -113,14 +117,17 @@ private void openNewFolder()
             _configurations.Add(sc);
             _selectedConfiguration = sc;
         }
+
         private void openExistingFolder(string vsTeensyJsonPath)
         {
             try
             {  // read vsTeensy.json
                 var fileContent = JsonConvert.DeserializeObject<ProjectTransferData>(File.ReadAllText(vsTeensyJsonPath));
 
-                if (fileContent == null || fileContent.version != "1" || fileContent.configurations.Count == 0)
+
+                if (fileContent == null || !uint.TryParse(fileContent.version, out uint ver) || ver < 1 || fileContent.configurations.Count == 0)
                 {
+                    
                     openNewFolder();
                 }
                 else
@@ -133,13 +140,19 @@ private void openExistingFolder(string vsTeensyJsonPath)
                     {
                         var configuration = (Configuration)cfg;
                         configuration.setup = this.setup;       /// hack, look for better solution
-                        
+
+
+                        if (ver == 1)
+                        {
+                            configuration.coreStrategy = configuration.copyCore ? LibStrategy.copy : LibStrategy.link;
+                        }
+
 
                         // add shared libraries ---------------------
                         if (cfg.sharedLibraries != null)
                         {
                             var sharedLibraries = libManager.sharedRepository?.libraries.Select(version => version.FirstOrDefault()); //flatten out list by selecting first version. Shared libraries  can only have one version
-                            
+
                             foreach (var cfgSharedLib in cfg.sharedLibraries)
                             {
                                 var library = sharedLibraries?.FirstOrDefault(lib => lib.sourceFolderName == cfgSharedLib); // find the corresponding lib
@@ -158,7 +171,7 @@ private void openExistingFolder(string vsTeensyJsonPath)
                         {
                             foreach (var lib in localLibs)
                             {
-                                var pl =  ProjectLibrary.cloneFromLib(lib);                                                              
+                                var pl = ProjectLibrary.cloneFromLib(lib);
                                 pl.targetFolder = Path.GetFileName(lib.sourceUri.LocalPath);
                                 configuration.localLibs.Add(pl);
                             }
@@ -196,10 +209,31 @@ private void openExistingFolder(string vsTeensyJsonPath)
                 return;
             }
         }
+
+        
+        public async Task<GitError> gitInitAsync()
+        {
+            var projectRepo = Repository.Discover(path);
+
+            if (projectRepo == path + "\\.git\\")  // project is already a git repo -> nothing to do
+            {
+                return GitError.OK;
+            }
+
+            if (String.IsNullOrWhiteSpace(projectRepo))  // project is not a git repo -> initialize
+            {
+                //string newRepo =  Repository.Init(path);
+                string newRepo = await Task.Run(() => Repository.Init(path));
+                if (newRepo == path + "\\.git\\") return GitError.OK;  
+            }
+
+            return GitError.Unexpected;
+        }
+
         private List<IConfiguration> _configurations { get; }
         private IConfiguration _selectedConfiguration { get; set; }
         private readonly SetupData setup;
-        private bool _isNew = true;
+       // private bool _isNew = true;
     }
 }
 
diff --git a/vtCore/Implementation/vtTransferData.cs b/vtCore/Implementation/vtTransferData.cs
index e305be6..f9f82fd 100644
--- a/vtCore/Implementation/vtTransferData.cs
+++ b/vtCore/Implementation/vtTransferData.cs
@@ -32,8 +32,6 @@ public vtBoard(IBoard board)
             {
                 name = board?.name;
                 options = board?.optionSets?.ToDictionary(o => o.name, o => o.selectedOption?.name ?? o.options.FirstOrDefault()?.name);
-               
-                
             }
             public string name { get; set; }
             public Dictionary<string, string> options { get; set; } = new Dictionary<string, string>();
@@ -71,19 +69,20 @@ public class vtConfiguration
             [JsonProperty(Order = 7)]
             public string makefileExtension { get; set; }
 
-            //[JsonProperty(Order = 8)]
-            //public bool copyBoardTxt { get; set; }
-
             [JsonProperty(Order = 9)]
-            public bool copyCore { get; set; }
+            public bool copyCore { get; set; } = false;
 
             [JsonProperty(Order = 10)]
-            public IEnumerable<string> sharedLibraries { get; set; }
+            [JsonConverter(typeof(StringEnumConverter))]
+            public LibStrategy coreStrategy { get; set; }
 
             [JsonProperty(Order = 11)]
-            public IEnumerable<string> projectLibraries { get; set; }
+            public IEnumerable<string> sharedLibraries { get; set; }
 
             [JsonProperty(Order = 12)]
+            public IEnumerable<string> projectLibraries { get; set; }
+
+            [JsonProperty(Order = 13)]
             public vtBoard board { get; set; }
             
             public vtConfiguration(IConfiguration configuration)
@@ -105,7 +104,9 @@ public vtConfiguration(IConfiguration configuration)
                 makefileExtension = configuration.makefileExtension;
                 compilerBase = configuration.compilerBase.path;
                 coreBase = configuration.coreBase.path;
-                copyCore = configuration.copyCore;
+                //copyCore = configuration.copyCore;
+                coreStrategy = configuration.coreStrategy;
+                
                 //  boardTxtPath = configuration.boardTxtPath;
                 //  copyBoardTxt = configuration.copyBoardTxt;
                 board = new vtBoard(configuration.selectedBoard);
@@ -125,10 +126,13 @@ public static explicit operator Configuration(vtConfiguration vtConf)
                 conf.compilerBase.path = vtConf.compilerBase;
                 conf.coreBase.path = vtConf.coreBase;
                 conf.copyCore = vtConf.copyCore;
+                conf.coreStrategy = vtConf.coreStrategy;
                 conf.makefileExtension = vtConf.makefileExtension;
                 conf.guid = vtConf.guid != null ? vtConf.guid : Guid.NewGuid().ToString();
                 return conf;
             }
+
+            public bool ShouldSerializecopyCore() => false;            
         }
 
         [JsonProperty(Order = 1)]
@@ -152,7 +156,7 @@ public static explicit operator Configuration(vtConfiguration vtConf)
         internal ProjectTransferData(IProject project)
         {
             this.model = project;
-            version = "1";
+            version = "2";
             target = project.target;
             buildSystem = project.buildSystem;
             debugSupport = project.debugSupport;
diff --git a/vtCore/Interfaces/IConfiguration.cs b/vtCore/Interfaces/IConfiguration.cs
index 992a993..cd4f559 100644
--- a/vtCore/Interfaces/IConfiguration.cs
+++ b/vtCore/Interfaces/IConfiguration.cs
@@ -10,20 +10,16 @@ public enum SetupTypes
     public interface IConfiguration
     {
         bool isOk { get; }
-
-        //  IFolders folders { get; }
+             
         SetupTypes setupType { get; set; }
         string name { get; set; }
         string guid { get; }
         
-        CheckedPath coreBase { get; }
-        bool localCore { get; set; }
-        bool copyCore { get; set; }
+        CheckedPath coreBase { get; }       
+        LibStrategy coreStrategy { get; set; }
 
         string core { get; }
-
-        //string boardTxtPath { get; set; }
-        //bool copyBoardTxt { get; set; }
+               
 
         string compiler { get; }
         CheckedPath compilerBase { get; }
@@ -31,11 +27,9 @@ public interface IConfiguration
 
         List<IBoard> boards { get; }
         IBoard selectedBoard { get; set; }
-
         List<IProjectLibrary> sharedLibs { get; }
         List<IProjectLibrary> localLibs { get; }
-        //List<Library> projectLibs { get; }
-
+       
         void parseBoardsTxt(string bt);
 
         string makefile { get; }
diff --git a/vtCore/Interfaces/IProject.cs b/vtCore/Interfaces/IProject.cs
index 25376e1..6243a49 100644
--- a/vtCore/Interfaces/IProject.cs
+++ b/vtCore/Interfaces/IProject.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace vtCore.Interfaces
 {
@@ -22,31 +23,38 @@ public enum DebugSupport
         cortex_debug
     }
 
-    public enum CoreStrategies
+    public enum LibStrategy
     {
         copy, link, clone
     }
 
+    public enum GitError
+    {
+        OK, 
+        Unexpected,
+    }
+   
     public interface IFolders
     {
         CheckedPath compiler { get; }
         //CheckedPath coreBase { get; }
         //CheckedPath sharedLibs { get; }
     }
-
+            
 
     public interface IProject
     {
         string name { get; }
         string cleanName { get; }
+        bool isNew { get; set; }
+        void openProject(string path);
+        void newProject();
+        Task<GitError> gitInitAsync();
+
 
         IEnumerable<IConfiguration> configurations { get; }
         IConfiguration selectedConfiguration { get; }
 
-        void openProject(string path);
-        void newProject();
-
-        bool isNew { get; set; }
 
         string path { get; set; }
         string pathError { get; }
@@ -56,7 +64,6 @@ public interface IProject
 
         Target target { get; set; }
         BuildSystem buildSystem { get; set; }
-        DebugSupport debugSupport { get; set; }
-        CoreStrategies coreStrategy { get; set; }
+        DebugSupport debugSupport { get; set; }      
     }
 }
diff --git a/vtCore/Interfaces/IProjectLibrary.cs b/vtCore/Interfaces/IProjectLibrary.cs
index 05aa5c4..f4bd7a7 100644
--- a/vtCore/Interfaces/IProjectLibrary.cs
+++ b/vtCore/Interfaces/IProjectLibrary.cs
@@ -5,9 +5,7 @@
 namespace vtCore.Interfaces
 {
     public interface IProjectLibrary : ILibrary
-    {
-     //   static IProjectLibrary  cloneFromLib(ILibrary lib);
-        //string targetFolderName { get; }
+    {   
         string targetFolder { get; set; }
     }
 }
diff --git a/vtCore/vtCore.csproj b/vtCore/vtCore.csproj
index aa71781..ac5842e 100644
--- a/vtCore/vtCore.csproj
+++ b/vtCore/vtCore.csproj
@@ -13,8 +13,10 @@
   <ItemGroup>
     <Compile Remove="Implementation\Folders.cs" />
   </ItemGroup>
- 
+
   <ItemGroup>
+    <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
+    <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="2.0.306" />
     <PackageReference Include="log4net" Version="2.0.12" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>