diff --git a/Start_Windows/game.c b/Start_Windows/game.c
index d98ba94..0aced40 100644
--- a/Start_Windows/game.c
+++ b/Start_Windows/game.c
@@ -14,98 +14,121 @@
 int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount)
 {
    srand(time(NULL));
+   unsigned int placedWordsCount = 0;
+   // salad = spielfeld (100*100)
+   // searchFieldLen = salad Size = 20
+   // words = array mit den zu plazierenden wörtern
+   // anzahl an zu plazierenden wörtern
+   const char buchstaben[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+   const int anzahlBuchstaben = 26;
 
-   const char buchstaben[26] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+   for (int i = 0; i < MAX_SEARCH_FIELD_LEN; i++)
+   {
+      for (int j = 0; j < MAX_SEARCH_FIELD_LEN; j++)
+      {
+         salad[i][j] = EMPTY_CHAR;
+      }
+   }
 
-   int placedWords = 0;
+   typedef enum
+      {
+         VERTIKAL,
+         HORIZONTAL
+      } Richtung;
 
    for (int i = 0; i < wordCount; i++)
    {
-
-      int vertikal = rand() % 2;
-
-      size_t länge = strlen(words[i]);
-      int positionX;
-      int positionY;
+      Richtung vertikal_horizontal = rand() % 2; // 1 = vertikal //0 = horizontal
+      int leange = strlen(words[i]);
+      int positionX = 0;
+      int positionY = 0;
+      int voll = 0;
       int tries = 0;
-      int belegt;
 
-      while (tries <= MAX_RAND_TRIES_PER_WORD)
+      if (vertikal_horizontal == VERTIKAL)
       {
-         if (vertikal)
+
+         tries = 0;
+         do
          {
+            voll = 0;
             positionX = rand() % (searchFieldLen);
-            positionY = rand() % (searchFieldLen - länge);
-
-            for (int y = positionY; y < (länge + positionY); y++)
-            {
-               if (salad[y][positionX] != '0')
+            positionY = rand() % (searchFieldLen - leange);
+            for (int j = positionY; j < positionY + leange; j++)
+            { // überprüfung ob alle positionen 0 sind
+               if (salad[j][positionX] != EMPTY_CHAR)
                {
-                  tries++;
-                  belegt = 1;
-                  break;
+                  voll = 1;
                }
             }
-
-            if(belegt){
-               continue;
-               belegt = 0;
-            }
-
-
-            for (int y = positionY, j = 0; y < (länge + positionY); y++, j++)
-            {
-               salad[y][positionX] = words[i][j];
-            }
-            placedWords++;
-            break; // Wort wurde hinzugefügt, while Schleife wird verlassen
-         }
-         else
+            tries++;
+         } while (voll == 1 && tries <= MAX_RAND_TRIES_PER_WORD);
+         if (voll == 0)
          {
-            positionX = rand() % (searchFieldLen - länge);
-            positionY = rand() % (searchFieldLen);
+            for (int k = positionY, l = 0; k < positionY + leange; k++, l++)
+            { // buchstaben holen und setzen
+               salad[k][positionX] = words[i][l];
+            }
+            placedWordsCount++;
+         }
+         else if (voll == 1)
+            printf("Das Wort '%s' konnte nicht plaziert werden", words[i]);
+      }
+      else if (vertikal_horizontal == HORIZONTAL)
+      {
 
-            for (int x = positionX; x < (länge + positionX); x++)
-            {
-               if (salad[positionY][x] != '0')
+         tries = 0;
+         do
+         {
+            voll = 0;
+            positionY = rand() % (searchFieldLen);
+            positionX = rand() % (searchFieldLen - leange);
+            for (int j = positionX; j < positionX + leange; j++)
+            { // überprüfung ob alle positionen 0 sind
+               if (salad[positionY][j] != EMPTY_CHAR)
                {
-                  tries++;
-                  break;
+                  voll = 1;
                }
             }
-
-            if(belegt){
-               continue;
-               belegt = 0;
+            tries++;
+         } while (voll == 1 && tries <= MAX_RAND_TRIES_PER_WORD);
+         if (voll == 0)
+         {
+            for (int k = positionX, l = 0; k < positionX + leange; k++, l++)
+            { // buchstaben holen und setzen
+               salad[positionY][k] = words[i][l];
             }
+            placedWordsCount++;
+         }
+         else if (voll == 1)
+            printf("Das Wort '%s' konnte nicht plaziert werden", words[i]);
+      }
+      else
+         printf("Fehler bei Vertikal Horizontal Wert: %d", vertikal_horizontal);
+   }
 
-            for (int x = positionX, j = 0; x < (länge + positionX); x++, j++)
-            {
-               salad[positionY][x] = words[i][j];
-            }
-            placedWords++;
-            break; // Wort wurde hinzugefügt, while Schleife wird verlassen
+   for (int i = 0; i < searchFieldLen; i++)
+   {
+      for (int j = 0; j < searchFieldLen; j++)
+      {
+         if (salad[i][j] == EMPTY_CHAR)
+         {
+            salad[i][j] = buchstaben[rand() % anzahlBuchstaben];
          }
       }
    }
 
-   for(int i = 0; i< searchFieldLen;i++){
-      for(int j = 0; j< searchFieldLen;j++){
-         if(salad[i][j] == '0'){
-            salad[i][j] = buchstaben[rand() % 26];
-         }
-      }
-   }
-
-   return placedWords;
+   return placedWordsCount;
 }
 
 // Prints the word salad to console
 void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
 {
-   for(int i = 0; i< searchFieldLen;i++){
-      for(int j = 0; j< searchFieldLen;j++){
-         printf("%c",salad[i][j]);
+   for (int i = 0; i < searchFieldLen; i++)
+   {
+      for (int j = 0; j < searchFieldLen; j++)
+      {
+         printf(" %c", salad[i][j]);
       }
       printf("\n");
    }
diff --git a/Start_Windows/game.o b/Start_Windows/game.o
index 1c87a6b..58e4bb4 100644
Binary files a/Start_Windows/game.o and b/Start_Windows/game.o differ
diff --git a/Start_Windows/graphicalGame.o b/Start_Windows/graphicalGame.o
deleted file mode 100644
index 4537920..0000000
Binary files a/Start_Windows/graphicalGame.o and /dev/null differ
diff --git a/Start_Windows/input.c b/Start_Windows/input.c
index 90cb0cb..8271f26 100644
--- a/Start_Windows/input.c
+++ b/Start_Windows/input.c
@@ -31,6 +31,11 @@ int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
                 return count;
             }
 
+            //hier müsste man den token string in großbuchstaben formatieren
+            for (int i = 0; i < strlen(token); i++)
+            {
+                token[i] = toupper(token[i]);
+            }
             strncpy(words[count], token, MAX_WORD_LEN-1);
             words[count][MAX_WORD_LEN-1] = '\0';
         
@@ -43,4 +48,14 @@ int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
     }
     
     return count;
-}
\ No newline at end of file
+}
+
+
+// 00M 01a 02x              
+// 10W 11a 12l 13t 14e 15r  
+// 20T 21o 22b 23i 24a 25s 
+
+// array[3][2]
+// 00 01
+// 10 11
+// 20 21
diff --git a/Start_Windows/input.o b/Start_Windows/input.o
index 4cde895..d0a0969 100644
Binary files a/Start_Windows/input.o and b/Start_Windows/input.o differ
diff --git a/Start_Windows/main.c b/Start_Windows/main.c
index 3ea455a..937c461 100644
--- a/Start_Windows/main.c
+++ b/Start_Windows/main.c
@@ -29,14 +29,6 @@ int main(int argc, char *argv[])
             unsigned int placedWords = 0;
             char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN]; // 2D array to store the word salad
 
-            for (int i = 0; i < MAX_SEARCH_FIELD_LEN; i++)
-            {
-                for (int j = 0; j < MAX_SEARCH_FIELD_LEN; j++)
-                {
-                    wordSalad[i][j] = '0';
-                }
-            }
-
             // Read words from file and store in 'words' array
             wordCount = readWords(file, words, MAX_NUMBER_OF_WORDS);
             fclose(file);
diff --git a/Start_Windows/main.o b/Start_Windows/main.o
deleted file mode 100644
index cdcc4fc..0000000
Binary files a/Start_Windows/main.o and /dev/null differ
diff --git a/Start_Windows/runTests.exe b/Start_Windows/runTests.exe
new file mode 100644
index 0000000..7cea769
Binary files /dev/null and b/Start_Windows/runTests.exe differ
diff --git a/Start_Windows/testwords_delims.txt b/Start_Windows/testwords_delims.txt
new file mode 100644
index 0000000..e721fce
--- /dev/null
+++ b/Start_Windows/testwords_delims.txt
@@ -0,0 +1 @@
+Hund,Katze; Maus
diff --git a/Start_Windows/testwords_empty.txt b/Start_Windows/testwords_empty.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Start_Windows/testwords_simple.txt b/Start_Windows/testwords_simple.txt
new file mode 100644
index 0000000..37d7524
--- /dev/null
+++ b/Start_Windows/testwords_simple.txt
@@ -0,0 +1,3 @@
+Apfel
+Banane
+Kiwi
\ No newline at end of file
diff --git a/Start_Windows/wordsalad.exe b/Start_Windows/wordsalad.exe
deleted file mode 100644
index 65feb88..0000000
Binary files a/Start_Windows/wordsalad.exe and /dev/null differ
diff --git a/Start_Windows/wordsalad_my.exe b/Start_Windows/wordsalad_my.exe
deleted file mode 100644
index 465dde0..0000000
Binary files a/Start_Windows/wordsalad_my.exe and /dev/null differ