diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..cbf8a57
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libraries/U8g2_Arduino"]
+	path = libraries/U8g2_Arduino
+	url = https://github.com/olikraus/U8g2_Arduino
diff --git a/esp32-env-monitor.ino b/esp32-env-monitor.ino
index 067c1ec..8ba3d22 100644
--- a/esp32-env-monitor.ino
+++ b/esp32-env-monitor.ino
@@ -1,22 +1,60 @@
+#include <Arduino.h>
+
 #include <WiFi.h>
 #include "wifi_login.h"
 
+#include <U8x8lib.h>
+
+#ifdef U8X8_HAVE_HW_SPI
+#include <SPI.h>
+#endif
+
+U8X8_SSD1327_EA_W128128_4W_HW_SPI u8x8(/* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);
+
+// setup the terminal (U8X8LOG) and connect to u8g2 for automatic refresh of the display
+// The size (width * height) depends on the display 
+
+#define U8LOG_WIDTH 16
+#define U8LOG_HEIGHT 12
+uint8_t u8log_buffer[U8LOG_WIDTH*U8LOG_HEIGHT];
+U8X8LOG u8x8log;
+
 void setup() {
 
+  //Init Display  
+  u8x8.begin();
+  u8x8.setFont(u8x8_font_chroma48medium8_r);
+  
+  u8x8log.begin(u8x8, U8LOG_WIDTH, U8LOG_HEIGHT, u8log_buffer);
+  u8x8log.setRedrawMode(0);		// 0: Update screen with newline, 1: Update screen for every char
+
+
   //Init wifi connection
   WiFi.begin(ssid, password);
 
+  u8x8log.print("Connecting to SSID:\n");
+  u8x8log.print(ssid);
+  u8x8log.print("\n");
+  u8x8log.print("\n");
+
   while (WiFi.status() != WL_CONNECTED) {
     delay(500);
-    //Serial.print(".");
+    u8x8log.print(".");
   }
 
-  //Serial.println("");
-  //Serial.println("WiFi connected");
-  //Serial.println("IP address: ");
-  //Serial.println(WiFi.localIP());
+  u8x8log.print("\n");
+  u8x8log.print("WiFi connected\n");
+  u8x8log.print("IP address:\n");
+  u8x8log.println(WiFi.localIP());
+  u8x8log.print("\n");
+  u8x8log.print("\n");
 
 }
 
 void loop() {
+
+  //Clear screen
+  u8x8log.print("\f");
+  delay(10000);
+
 }
diff --git a/libraries/U8g2_Arduino b/libraries/U8g2_Arduino
new file mode 160000
index 0000000..486ceff
--- /dev/null
+++ b/libraries/U8g2_Arduino
@@ -0,0 +1 @@
+Subproject commit 486ceff1693812a459038a8d836c8cddcb2c7efb