diff --git a/Kitt/Kitt.ino b/Kitt/Kitt.ino
new file mode 100644
index 0000000..c43eb76
--- /dev/null
+++ b/Kitt/Kitt.ino
@@ -0,0 +1,58 @@
+#include <LiquidCrystal.h>
+
+LiquidCrystal lcd(12, 11, 5, 4, 3, 2);
+
+const int switchPinA = 8;
+const int switchPinB = 13;
+int switchState = 0;
+int menuA = 0;
+int menuB = 0;
+
+void setup()
+{
+    lcd.begin(16, 2);
+    Serial.begin(9600);
+    pinMode(switchPinA, INPUT);
+    pinMode(switchPinB, INPUT);
+    lcd.clear();
+    lcd.setCursor(1, 0);
+    lcd.print("WELCOME");
+    lcd.setCursor(0, 1);
+    lcd.print("NIGHT RIDER!");
+    delay(500);
+    lcd.clear();
+    lcd.setCursor(0, 1);
+    lcd.print("Computing....");
+    delay(500);
+}
+
+void loop()
+{
+    menuA = digitalRead(switchPinA);
+    Serial.print(menuA);
+    menuB = digitalRead(switchPinB);
+    lcd.setCursor(0, 1);
+    lcd.print("Waiting for instructions...");
+    lcd.clear();
+    lcd.setCursor(0, 0);
+    if (menuA == HIGH)
+    {
+        Serial.print("Menu A ");
+        Serial.print(menuA);
+        Serial.print("\n");
+        lcd.clear();
+        lcd.print("Hello...");
+    }
+
+    if (menuB == HIGH)
+    {
+        Serial.print("Menu B ");
+        Serial.print(menuB);
+        Serial.print("\n");
+        lcd.clear();
+        lcd.setCursor(0, 1);
+        lcd.print("Sylvain!");
+    }
+
+    delay(250);
+}
diff --git a/Screen/Screen.ino b/Screen/Screen.ino
index f49908e..d59d30a 100644
--- a/Screen/Screen.ino
+++ b/Screen/Screen.ino
@@ -9,70 +9,50 @@ int reply;
 
 void setup()
 {
-    Serial.begin(9600);
     lcd.begin(16, 2);
     pinMode(switchPin, INPUT);
-}
-
-void scroll(char message[], int position)
-{
-    int n;
-    n = 15;
-    char *ptr = message;
-    while (n != -14)
-    {
-        lcd.clear();
-        lcd.setCursor(n, position);
-        if (n < 0)
-        {
-            ptr++;
-        }
-        lcd.print(ptr);
-        n--;
-        delay(250);
-    }
-    lcd.clear();
+    lcd.print("ASK THE");
+    lcd.setCursor(0, 1);
+    lcd.print("Crystal Ball!");
 }
 
 void loop()
 {
-    scroll("Un mec entre dans un café", 0);
-    scroll("Plouf !", 1);
-    // switchState = digitalRead(switchPin);
-    // if (switchState != prevSwitchState)
-    // {
-    //     if (switchState == LOW)
-    //     {
-    //         reply = random(8);
-    //         lcd.clear();
-    //         lcd.setCursor(0, 0);
-    //         lcd.print("The ball says:");
-    //         lcd.setCursor(0, 1);
-    //         switch (reply)
-    //         {
-    //         case 0:
-    //             lcd.print("Yes");
-    //             break;
-    //         case 2:
-    //             lcd.print("No");
-    //             break;
-    //         case 3:
-    //             lcd.print("Most likely");
-    //             break;
-    //         case 4:
-    //             lcd.print("Certainly");
-    //             break;
-    //         case 5:
-    //             lcd.print("Unsure");
-    //             break;
-    //         case 6:
-    //             lcd.print("Ask again");
-    //             break;
-    //         case 7:
-    //             lcd.print("Doubtful");
-    //             break;
-    //         }
-    //     }
-    // }
-    // prevSwitchState = switchState;
+    switchState = digitalRead(switchPin);
+    if (switchState != prevSwitchState)
+    {
+        if (switchState == LOW)
+        {
+            reply = random(8);
+            lcd.clear();
+            lcd.setCursor(0, 0);
+            lcd.print("The ball says:");
+            lcd.setCursor(0, 1);
+            switch (reply)
+            {
+            case 0:
+                lcd.print("Yes");
+                break;
+            case 2:
+                lcd.print("No");
+                break;
+            case 3:
+                lcd.print("Most likely");
+                break;
+            case 4:
+                lcd.print("Certainly");
+                break;
+            case 5:
+                lcd.print("Unsure");
+                break;
+            case 6:
+                lcd.print("Ask again");
+                break;
+            case 7:
+                lcd.print("Doubtful");
+                break;
+            }
+        }
+    }
+    prevSwitchState = switchState;
 }