diff --git a/KanSan/KanSan.csproj.user b/KanSan/KanSan.csproj.user
index 928cd91..b1f9586 100644
--- a/KanSan/KanSan.csproj.user
+++ b/KanSan/KanSan.csproj.user
@@ -7,6 +7,9 @@
     </ApplicationDefinition>
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="UI\Kunde\UCKundeList.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="UI\Projekt\WindowProjektEdit.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -18,6 +21,9 @@
     <Page Update="MainWindow.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="UI\Kunde\UCKundeList.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="UI\Projekt\WindowProjektEdit.xaml">
       <SubType>Designer</SubType>
     </Page>
diff --git a/KanSan/MainWindow.xaml.cs b/KanSan/MainWindow.xaml.cs
index 385ae7e..39ea9b4 100644
--- a/KanSan/MainWindow.xaml.cs
+++ b/KanSan/MainWindow.xaml.cs
@@ -29,11 +29,20 @@ namespace KanSan
             InitializeComponent();
             this.Title = ProgrammHashVersion.GIT_HASH;
 
-            
-            UI.UCKundeEdit uCKundeEdit = new UI.UCKundeEdit();
-            ContentController.Content = uCKundeEdit;
+
+            /*UI.UCKundeEdit uCKundeEdit = new UI.UCKundeEdit();
+            ContentController.Content = uCKundeEdit;*/
+
+            UI.UCKundeList uCKundeList = new UI.UCKundeList();
+            uCKundeList.KundeAdded += UCKundeList_KundeAdded;
+            ContentController.Content = uCKundeList;
         }
 
+        private void UCKundeList_KundeAdded(object sender, UI.KundeAddedKlickEventArgs e)
+        {
+            UI.UCKundeEdit uCKundeEdit = new UI.UCKundeEdit(e.kunde);
+            ContentController.Content = uCKundeEdit;
+        }
     }
 
 }
diff --git a/KanSan/UI/Kunde/UCKundeEdit.xaml.cs b/KanSan/UI/Kunde/UCKundeEdit.xaml.cs
index 883368c..f36bdcc 100644
--- a/KanSan/UI/Kunde/UCKundeEdit.xaml.cs
+++ b/KanSan/UI/Kunde/UCKundeEdit.xaml.cs
@@ -24,17 +24,17 @@ namespace KanSan.UI
     {
         //private Kunde kunde = null;
         //private UnitOfWork unitOfWork = null;
-        public UCKundeEdit()
+        public UCKundeEdit(Kunde kunde = null)
         {
             InitializeComponent();
 
 
-            this.DataContext = new KundeViewModel();
+            this.DataContext = new KundenEditViewModel(kunde);
         }
 
         private void Speichern_Click(object sender, RoutedEventArgs e)
         {
-            ((KundeViewModel)DataContext).Speichern();
+            ((KundenEditViewModel)DataContext).Speichern();
             
         }
     }
diff --git a/KanSan/UI/Kunde/UCKundeList.xaml b/KanSan/UI/Kunde/UCKundeList.xaml
new file mode 100644
index 0000000..67ff8f9
--- /dev/null
+++ b/KanSan/UI/Kunde/UCKundeList.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="KanSan.UI.UCKundeList"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:KanSan.UI"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="50"/>
+        </Grid.RowDefinitions>
+        <DataGrid ItemsSource="{Binding Kunden}" />
+        <Button Grid.Row="1" Name="NeueKunde" Content="Neue Kunde anlegen" Click="NeueKunde_Click" />
+    </Grid>
+</UserControl>
diff --git a/KanSan/UI/Kunde/UCKundeList.xaml.cs b/KanSan/UI/Kunde/UCKundeList.xaml.cs
new file mode 100644
index 0000000..e8aaa35
--- /dev/null
+++ b/KanSan/UI/Kunde/UCKundeList.xaml.cs
@@ -0,0 +1,50 @@
+using KanSan.Base.Models;
+using KanSan.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Text;
+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 KanSan.UI
+{
+    /// <summary>
+    /// Interaktionslogik für UCKundeList.xaml
+    /// </summary>
+    public partial class UCKundeList : UserControl
+    {
+        
+        public UCKundeList()
+        {
+            InitializeComponent();
+            this.DataContext = new KundenListViewModel();
+        }
+
+        private void NeueKunde_Click(object sender, RoutedEventArgs e)
+        {
+            KundeAddedKlickEventArgs args = new KundeAddedKlickEventArgs();
+            args.kunde = (DataContext as KundenListViewModel).NeueKunde();
+            OnKlickedKunde(args);
+            
+        }
+        protected virtual void OnKlickedKunde(KundeAddedKlickEventArgs e)
+        {
+            EventHandler<KundeAddedKlickEventArgs> handler = KundeAdded;
+            if (handler != null)
+                handler(this, e);
+        }
+        public event EventHandler<KundeAddedKlickEventArgs> KundeAdded;
+    }
+
+    public class KundeAddedKlickEventArgs : EventArgs
+    {
+        public Kunde kunde { get; set; }
+    }
+}
diff --git a/KanSan/ViewModel/KundeViewModel.cs b/KanSan/ViewModel/KundenEditViewModel.cs
similarity index 89%
rename from KanSan/ViewModel/KundeViewModel.cs
rename to KanSan/ViewModel/KundenEditViewModel.cs
index 3835caa..1750bb3 100644
--- a/KanSan/ViewModel/KundeViewModel.cs
+++ b/KanSan/ViewModel/KundenEditViewModel.cs
@@ -9,7 +9,7 @@ using System.Text;
 
 namespace KanSan.ViewModel
 {
-    class KundeViewModel : PropertyChangedClass, INotifyPropertyChanged
+    class KundenEditViewModel : PropertyChangedClass, INotifyPropertyChanged
     {
         IUnitOfWork unitOfWork = new UnitOfWork(new KanSanContext());
 
@@ -88,9 +88,12 @@ namespace KanSan.ViewModel
         }
         #endregion
 
-        public KundeViewModel()
+        public KundenEditViewModel(Kunde kunde = null)
         {
-            _kunde = unitOfWork.KundenRepository.Get().First();
+            if (kunde == null)
+                _kunde = unitOfWork.KundenRepository.Get().First();
+            else
+                _kunde = kunde;
             
             vorname = _kunde.Vorname;
             nachname = _kunde.Nachname;
diff --git a/KanSan/ViewModel/KundenListViewModel.cs b/KanSan/ViewModel/KundenListViewModel.cs
new file mode 100644
index 0000000..b899ffc
--- /dev/null
+++ b/KanSan/ViewModel/KundenListViewModel.cs
@@ -0,0 +1,44 @@
+using KanSan.Base;
+using KanSan.Base.Interfaces;
+using KanSan.Base.Models;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+
+namespace KanSan.ViewModel
+{
+    class KundenListViewModel
+    {
+        IUnitOfWork unitOfWork = new UnitOfWork(new KanSanContext());
+        private List<Kunde> kunden;
+
+        public List<Kunde> Kunden
+        {
+            get
+            {
+                return kunden;
+            }
+        }
+
+        public KundenListViewModel()
+        {
+            kunden = unitOfWork.KundenRepository.Get().ToList();
+        }
+
+        public Kunde NeueKunde()
+        {
+            Kunde result = new Kunde();
+            result.GuidNr = Guid.NewGuid();
+            unitOfWork.KundenRepository.Insert(result);
+            unitOfWork.Commit();
+
+            IEnumerable<Kunde> kunden = unitOfWork.KundenRepository.Get(d => d.GuidNr.Equals(result.GuidNr));
+            if (kunden.Count() < 1)
+                throw new Exception("Kunde konnte nicht gefunden werden");
+
+            return kunden.First();
+        }
+    }
+}