diff --git a/WebClient/WpfWebClient/Home.xaml b/WebClient/WpfWebClient/Home.xaml
index 94e9aef..f557fc0 100644
--- a/WebClient/WpfWebClient/Home.xaml
+++ b/WebClient/WpfWebClient/Home.xaml
@@ -10,17 +10,15 @@
 
     <Grid Width="593" Height="565">
         <Label Content="Willkommen" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" FontFamily="Tahoma" FontSize="48" Height="61" Width="272"/>
-        <TextBlock HorizontalAlignment="Left" Margin="10,124,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="431" Width="573" FontSize="20"><Run Text="Haben Sie die Applikation zum ersten Mal gestartet"/><Run Text="?"/><LineBreak/><Run/><LineBreak/><Run Text="1. Erstellen Sie neue Patienten"/><LineBreak/><Run Text="2. "/><Run Text="Generieren "/><Run Text="Sie neue Bakterienstämme"/><Run Text=" "/><LineBreak/><Run/><LineBreak/><Run Text="Enter desired letters"/><Run Text=" per strain"/><Run Text=": "/><Run Text="&#x9;"/><InlineUIContainer>
+        <TextBlock HorizontalAlignment="Left" Margin="10,80,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="475" Width="573" FontSize="20"><Run Text="Haben Sie die Applikation zum ersten Mal gestartet"/><Run Text="?"/><LineBreak/><Run/><LineBreak/><Run Text="1. Erstellen Sie neue Patienten"/><LineBreak/><Run Text="2. "/><Run Text="Generieren "/><Run Text="Sie neue Bakterienstämme"/><Run Text=" "/><LineBreak/><Run/><LineBreak/><Run Text="Enter desired letters"/><Run Text=" per strain"/><Run Text=": "/><Run Text="&#x9;"/><InlineUIContainer>
                 <TextBox x:Name="txtNumLetters" Height="30" TextWrapping="Wrap" Text="5" Width="120"/>
             </InlineUIContainer><LineBreak/><Run Text="Enter desired"/><Run Text=" amount of"/><Run Text=" strains: "/><Run Text="&#x9;"/><InlineUIContainer>
                 <TextBox x:Name="txtNumStrains" Height="30" TextWrapping="Wrap" Text="100" Width="120"/>
             </InlineUIContainer><LineBreak/><LineBreak/><InlineUIContainer>
                 <Button x:Name="btnRandomStrainGenerator" Content="CREATE RANDOM STRAINS" Width="580" Height="34" Click="btnRandomStrainGenerator_Click"/>
-            </InlineUIContainer><Run Text="&#x9;"/><LineBreak/><Run Text="3. Erfassen Sie einen neuen Fall"/><Run Text=" oder erstellen Sie Testdaten mit einem "/><Run Text="K"/><Run Text="lick auf diesen Button: "/><InlineUIContainer>
-                <Button Content="GENERATE EXAMS" Width="283" Click="btnGenerateExams"/>
-            </InlineUIContainer><LineBreak/><Run Text="4. Erfassen Sie neue FoodPlaces oder erstellen Sie Testdaten mit einem Klick auf diesen Button: "/><InlineUIContainer>
-                <Button Content="GENERATE FOODPLACES" Width="284" Click="btnGenerateFoodPlaces"/>
-            </InlineUIContainer><LineBreak/></TextBlock>
+            </InlineUIContainer><Run Text="&#x9;"/><LineBreak/><Run Text="3. Erfassen Sie einen neuen Fall"/><Run Text=" oder erstellen Sie Testdaten. "/><Run/><LineBreak/><Run Text="4. "/><Run Text="Erfassen Sie neue FoodPlaces oder erstellen Sie Testdaten"/><Run Text="."/><LineBreak/><Run/><LineBreak/><Run/><LineBreak/><InlineUIContainer>
+                <Button Content="CREATE TESTDATA" Width="582" Click="btnCreateTestdata_Click"/>
+            </InlineUIContainer><LineBreak/><Run/><LineBreak/><LineBreak/></TextBlock>
 
     </Grid>
 </Page>
diff --git a/WebClient/WpfWebClient/Home.xaml.cs b/WebClient/WpfWebClient/Home.xaml.cs
index 9798e20..8214e44 100644
--- a/WebClient/WpfWebClient/Home.xaml.cs
+++ b/WebClient/WpfWebClient/Home.xaml.cs
@@ -43,7 +43,7 @@ namespace WpfWebClient
             int num_words = int.Parse(txtNumStrains.Text);
 
             // Make an array of the letters we will use.
-            char[] letters = "AeIoUbRaTdAtIlU".ToCharArray();
+            char[] letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".ToCharArray();
 
             // Make a random number generator.
             Random rand = new Random();
@@ -71,7 +71,7 @@ namespace WpfWebClient
                     foreach (var item in generatedStrains)
                     {
                         Strain s = new Strain();
-                        s.Name = item;
+                        s.Name = "EHEC-"+ item;
                         client.WriteStrain(s);
                     }
                 }
@@ -83,26 +83,13 @@ namespace WpfWebClient
             client.Close();
         }
 
-        private void btnGenerateExams(object sender, RoutedEventArgs e)
+
+        private void btnCreateTestdata_Click(object sender, RoutedEventArgs e)
         {
             // create new client connection
             WpfWebClient.ServiceReferenceEHEC.ServiceClient client = new WpfWebClient.ServiceReferenceEHEC.ServiceClient();
 
-            //to be continued
-
-
-            // Show success msgbox
-            System.Windows.MessageBox.Show("Success", "INFO", MessageBoxButton.OK, MessageBoxImage.Information);
-
-            client.Close();
-        }
-
-        private void btnGenerateFoodPlaces(object sender, RoutedEventArgs e)
-        {
-            // create new client connection
-            WpfWebClient.ServiceReferenceEHEC.ServiceClient client = new WpfWebClient.ServiceReferenceEHEC.ServiceClient();
-
-            //to be continued
+            // create a bunch of foodplaces
             var foodplaces = GenerateTestData.CreateFoodPlaces();
 
             foreach (var f in foodplaces)
@@ -110,10 +97,27 @@ namespace WpfWebClient
                 client.WriteFoodPlace(f);
             }
 
+            // create a bunch of people at foodplaces
+
+
+
+
+
+
+
+
+
+
+
+
             // Show success msgbox
             System.Windows.MessageBox.Show("Success", "INFO", MessageBoxButton.OK, MessageBoxImage.Information);
 
+
             client.Close();
+
+
+
         }
     }
 }