diff --git a/lambda/Makefile b/lambda/Makefile
index 5eee898..d3350b2 100644
--- a/lambda/Makefile
+++ b/lambda/Makefile
@@ -14,7 +14,7 @@
 
 ## If you've split your program into multiple .c / .h files, 
 ## include the additional source (in same directory) here 
-LOCAL_SOURCE = USART.c adc.c sensors.c integers.c
+LOCAL_SOURCE = USART.c adc.c sensors.c integers.c lcdroutines.c
 
 ## Here you can link to one more directory (and multiple .c files)
 EXTRA_SOURCE_DIR = 
diff --git a/lambda/lambda.c b/lambda/lambda.c
index 6db5350..f9632f4 100644
--- a/lambda/lambda.c
+++ b/lambda/lambda.c
@@ -35,6 +35,7 @@
 #include "adc.h"
 #include "sensors.h"
 #include "integers.h"
+#include "lcdroutines.h"
 
 /**
  * Initializes the USART transmitter and receiver, sets up the ADC
@@ -45,6 +46,7 @@
  */
 int main(void) {
 	initUSART();
+	lcd_init();
 	setupADC();
 	setupSleepMode();
 
diff --git a/lambda/lcdroutines.c b/lambda/lcdroutines.c
new file mode 100644
index 0000000..ea6942e
--- /dev/null
+++ b/lambda/lcdroutines.c
@@ -0,0 +1,179 @@
+// Ansteuerung eines HD44780 kompatiblen LCD im 4-Bit-Interfacemodus
+// http://www.mikrocontroller.net/articles/HD44780
+// http://www.mikrocontroller.net/articles/AVR-GCC-Tutorial/LCD-Ansteuerung
+//
+// Die Pinbelegung ist über defines in lcd-routines.h einstellbar
+ 
+#include <avr/io.h>
+#include "lcdroutines.h"
+#include <util/delay.h>
+
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Erzeugt einen Enable-Puls
+static void lcd_enable( void )
+{
+	LCD_PORT |= (1 << LCD_EN);
+    _delay_us( LCD_ENABLE_US );  // kurze Pause
+    LCD_PORT &= ~(1 << LCD_EN);    // Enable auf 0 setzen
+}
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Sendet eine 4-bit Ausgabeoperation an das LCD
+static void lcd_out( uint8_t data )
+{
+  if (data & 1<<4) LCD_PORT |= (1 << LCD_DB4); else LCD_PORT &= ~(1 << LCD_DB4);
+  if (data & 1<<5) LCD_PORT |= (1 << LCD_DB5); else LCD_PORT &= ~(1 << LCD_DB5);
+  if (data & 1<<6) LCD_PORT |= (1 << LCD_DB6); else LCD_PORT &= ~(1 << LCD_DB6);
+  if (data & 1<<7) LCD_PORT |= (1 << LCD_DB7); else LCD_PORT &= ~(1 << LCD_DB7);
+  lcd_enable();
+}
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Initialisierung: muss ganz am Anfang des Programms aufgerufen werden.
+void lcd_init( void )
+{
+  // verwendete Pins auf Ausgang schalten
+  LCD_DDR |= (1 << LCD_EN);
+  LCD_DDR |= (1 << LCD_RS);
+  LCD_DDR |= (1 << LCD_DB4);
+  LCD_DDR |= (1 << LCD_DB5);
+  LCD_DDR |= (1 << LCD_DB6);
+  LCD_DDR |= (1 << LCD_DB7);
+
+  // initial alle Ausgänge auf Null
+  // ist default
+ 
+  // warten auf die Bereitschaft des LCD
+  _delay_ms( LCD_BOOTUP_MS );
+ 
+  // Soft-Reset muss 3mal hintereinander gesendet werden zur Initialisierung
+  lcd_out( LCD_SOFT_RESET );
+  _delay_ms( LCD_SOFT_RESET_MS1 );
+ 
+  lcd_enable();
+  _delay_ms( LCD_SOFT_RESET_MS2 );
+ 
+  lcd_enable();
+  _delay_ms( LCD_SOFT_RESET_MS3 );
+ 
+  // 4-bit Modus aktivieren 
+  lcd_out( LCD_SET_FUNCTION | LCD_FUNCTION_4BIT );
+  _delay_ms( LCD_SET_4BITMODE_MS );
+ 
+  // 4-bit Modus / 2 Zeilen / 5x7
+  lcd_command( LCD_SET_FUNCTION |
+               LCD_FUNCTION_4BIT |
+               LCD_FUNCTION_2LINE |
+               LCD_FUNCTION_5X7 );
+ 
+  // Display ein / Cursor aus / Blinken aus
+  lcd_command( LCD_SET_DISPLAY |
+               LCD_DISPLAY_ON |
+               LCD_CURSOR_OFF |
+               LCD_BLINKING_OFF); 
+ 
+  // Cursor inkrement / kein Scrollen
+  lcd_command( LCD_SET_ENTRY |
+               LCD_ENTRY_INCREASE |
+               LCD_ENTRY_NOSHIFT );
+ 
+  lcd_clear();
+}
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Sendet ein Datenbyte an das LCD
+void lcd_data( uint8_t data )
+{
+	LCD_PORT |= (1<<LCD_RS);    // RS auf 1 setzen
+ 
+    lcd_out( data );            // zuerst die oberen, 
+    lcd_out( data<<4 );         // dann die unteren 4 Bit senden
+ 
+    _delay_us( LCD_WRITEDATA_US );
+}
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Sendet einen Befehl an das LCD
+void lcd_command( uint8_t data )
+{
+	LCD_PORT &= ~(1<<LCD_RS);    // RS auf 0 setzen
+ 
+    lcd_out( data );             // zuerst die oberen, 
+    lcd_out( data<<4 );           // dann die unteren 4 Bit senden
+ 
+    _delay_us( LCD_COMMAND_US );
+}
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Sendet den Befehl zur Löschung des Displays
+void lcd_clear( void )
+{
+    lcd_command( LCD_CLEAR_DISPLAY );
+    _delay_ms( LCD_CLEAR_DISPLAY_MS );
+}
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Sendet den Befehl: Cursor Home
+void lcd_home( void )
+{
+    lcd_command( LCD_CURSOR_HOME );
+    _delay_ms( LCD_CURSOR_HOME_MS );
+}
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Setzt den Cursor in Spalte x (0..15) Zeile y (1..4) 
+ 
+void lcd_setcursor( uint8_t x, uint8_t y )
+{
+    uint8_t data;
+ 
+    switch (y)
+    {
+        case 1:    // 1. Zeile
+            data = LCD_SET_DDADR + LCD_DDADR_LINE1 + x;
+            break;
+ 
+        case 2:    // 2. Zeile
+            data = LCD_SET_DDADR + LCD_DDADR_LINE2 + x;
+            break;
+ 
+        case 3:    // 3. Zeile
+            data = LCD_SET_DDADR + LCD_DDADR_LINE3 + x;
+            break;
+ 
+        case 4:    // 4. Zeile
+            data = LCD_SET_DDADR + LCD_DDADR_LINE4 + x;
+            break;
+ 
+        default:
+            return;                                   // für den Fall einer falschen Zeile
+    }
+ 
+    lcd_command( data );
+}
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Schreibt einen String auf das LCD
+ 
+void lcd_string( const char *data )
+{
+    while( *data != '\0' )
+        lcd_data( *data++ );
+}
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Schreibt ein Zeichen in den Character Generator RAM
+ 
+void lcd_generatechar( uint8_t code, const uint8_t *data )
+{
+    // Startposition des Zeichens einstellen
+    lcd_command( LCD_SET_CGADR | (code<<3) );
+ 
+    // Bitmuster übertragen
+    uint8_t i;
+    for ( i=0; i<8; i++ )
+    {
+        lcd_data( data[i] );
+    }
+}
diff --git a/lambda/lcdroutines.h b/lambda/lcdroutines.h
new file mode 100644
index 0000000..18b29be
--- /dev/null
+++ b/lambda/lcdroutines.h
@@ -0,0 +1,152 @@
+// Ansteuerung eines HD44780 kompatiblen LCD im 4-Bit-Interfacemodus
+// http://www.mikrocontroller.net/articles/AVR-GCC-Tutorial/LCD-Ansteuerung
+//
+ 
+#ifndef LCD_ROUTINES_H
+#define LCD_ROUTINES_H
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Hier die verwendete Taktfrequenz in Hz eintragen, wichtig!
+ 
+#ifndef F_CPU
+#define F_CPU 1000000L
+#endif
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Pinbelegung für das LCD, an verwendete Pins anpassen
+// Alle LCD Pins dürfen an beliebige Pins am selben Port angeschlossen werden
+
+#define LCD_PORT PORTD
+#define LCD_DDR	 DDRD
+#define LCD_RS   PD6
+#define LCD_EN   PD7
+#define LCD_DB4  PD5
+#define LCD_DB5  PD2
+#define LCD_DB6  PD3
+#define LCD_DB7  PD4
+ 
+////////////////////////////////////////////////////////////////////////////////
+// LCD Ausführungszeiten (MS=Millisekunden, US=Mikrosekunden)
+ 
+#define LCD_BOOTUP_MS           15
+#define LCD_ENABLE_US           20
+#define LCD_WRITEDATA_US        46
+#define LCD_COMMAND_US          42
+ 
+#define LCD_SOFT_RESET_MS1      5
+#define LCD_SOFT_RESET_MS2      1
+#define LCD_SOFT_RESET_MS3      1
+#define LCD_SET_4BITMODE_MS     5
+ 
+#define LCD_CLEAR_DISPLAY_MS    2
+#define LCD_CURSOR_HOME_MS      2
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Zeilendefinitionen des verwendeten LCD
+// Die Einträge hier sollten für ein LCD mit einer Zeilenlänge von 16 Zeichen passen
+// Bei anderen Zeilenlängen müssen diese Einträge angepasst werden
+ 
+#define LCD_DDADR_LINE1         0x00
+#define LCD_DDADR_LINE2         0x40
+#define LCD_DDADR_LINE3         0x10
+#define LCD_DDADR_LINE4         0x50
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Initialisierung: muss ganz am Anfang des Programms aufgerufen werden.
+void lcd_init( void );
+ 
+////////////////////////////////////////////////////////////////////////////////
+// LCD löschen
+void lcd_clear( void );
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Cursor in die 1. Zeile, 0-te Spalte
+void lcd_home( void );
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Cursor an eine beliebige Position 
+void lcd_setcursor( uint8_t spalte, uint8_t zeile );
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Ausgabe eines einzelnen Zeichens an der aktuellen Cursorposition 
+void lcd_data( uint8_t data );
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Ausgabe eines Strings an der aktuellen Cursorposition 
+void lcd_string( const char *data );
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Definition eines benutzerdefinierten Sonderzeichens.
+// data muss auf ein Array[8] mit den Zeilencodes des zu definierenden Zeichens
+// zeigen
+void lcd_generatechar( uint8_t code, const uint8_t *data );
+ 
+////////////////////////////////////////////////////////////////////////////////
+// Ausgabe eines Kommandos an das LCD.
+void lcd_command( uint8_t data );
+ 
+ 
+////////////////////////////////////////////////////////////////////////////////
+// LCD Befehle und Argumente.
+// Zur Verwendung in lcd_command
+ 
+// Clear Display -------------- 0b00000001
+#define LCD_CLEAR_DISPLAY       0x01
+ 
+// Cursor Home ---------------- 0b0000001x
+#define LCD_CURSOR_HOME         0x02
+ 
+// Set Entry Mode ------------- 0b000001xx
+#define LCD_SET_ENTRY           0x04
+ 
+#define LCD_ENTRY_DECREASE      0x00
+#define LCD_ENTRY_INCREASE      0x02
+#define LCD_ENTRY_NOSHIFT       0x00
+#define LCD_ENTRY_SHIFT         0x01
+ 
+// Set Display ---------------- 0b00001xxx
+#define LCD_SET_DISPLAY         0x08
+ 
+#define LCD_DISPLAY_OFF         0x00
+#define LCD_DISPLAY_ON          0x04
+#define LCD_CURSOR_OFF          0x00
+#define LCD_CURSOR_ON           0x02
+#define LCD_BLINKING_OFF        0x00
+#define LCD_BLINKING_ON         0x01
+ 
+// Set Shift ------------------ 0b0001xxxx
+#define LCD_SET_SHIFT           0x10
+ 
+#define LCD_CURSOR_MOVE         0x00
+#define LCD_DISPLAY_SHIFT       0x08
+#define LCD_SHIFT_LEFT          0x00
+#define LCD_SHIFT_RIGHT         0x04
+ 
+// Set Function --------------- 0b001xxxxx
+#define LCD_SET_FUNCTION        0x20
+ 
+#define LCD_FUNCTION_4BIT       0x00
+#define LCD_FUNCTION_8BIT       0x10
+#define LCD_FUNCTION_1LINE      0x00
+#define LCD_FUNCTION_2LINE      0x08
+#define LCD_FUNCTION_5X7        0x00
+#define LCD_FUNCTION_5X10       0x04
+ 
+#define LCD_SOFT_RESET          0x30
+ 
+// Set CG RAM Address --------- 0b01xxxxxx  (Character Generator RAM)
+#define LCD_SET_CGADR           0x40
+ 
+#define LCD_GC_CHAR0            0
+#define LCD_GC_CHAR1            1
+#define LCD_GC_CHAR2            2
+#define LCD_GC_CHAR3            3
+#define LCD_GC_CHAR4            4
+#define LCD_GC_CHAR5            5
+#define LCD_GC_CHAR6            6
+#define LCD_GC_CHAR7            7
+ 
+// Set DD RAM Address --------- 0b1xxxxxxx  (Display Data RAM)
+#define LCD_SET_DDADR           0x80
+ 
+#endif
diff --git a/lambda/sensors.c b/lambda/sensors.c
index ae09abd..43f5799 100644
--- a/lambda/sensors.c
+++ b/lambda/sensors.c
@@ -35,6 +35,7 @@
 #include "adc.h"
 #include "sensors.h"
 #include "integers.h"
+#include "lcdroutines.h"
 
 /**
  * Table used to look up the lambda value at 12 V heater voltage
@@ -85,6 +86,7 @@
 /**
  * Measures the "input" and "output" temperatures and the lambda value
  * and displays the measured values.
+ * TODO tests, with local implementation of getVoltage()?
  */
 void measure(void) {
 	int16_t tempIVoltage = getVoltage(PC5);
@@ -101,7 +103,9 @@
 	int16_t tempO = toTempO(tempOVoltageAvg);
 	int16_t lambda = toLambda(lambdaVoltageAvg);
 
-	display(tempIVoltageAvg, tempI, tempOVoltageAvg, tempO, lambdaVoltageAvg, lambda);
+	display(tempIVoltageAvg, tempI,
+			tempOVoltageAvg, tempO,
+			lambdaVoltageAvg, lambda);
 }
 
 void display(
@@ -110,13 +114,21 @@
 		int16_t lambdaVoltage, int16_t lambda) {
 	div_t lambdaT = div(lambda, 1000);
 
-	// TODO LCD, 16 chars per line
-	char line0[40];
-	char line1[40];
-	snprintf(line0, sizeof(line0), "Ti %3d C %d   To %3d C %d\r\n", tempI, tempIVoltage, tempO, tempOVoltage);
-	snprintf(line1, sizeof(line1), "L %d.%03d %d\r\n", lambdaT.quot, abs(lambdaT.rem), lambdaVoltage);
-	printString(line0);
-	printString(line1);
+	char log[64];
+	snprintf(log, sizeof(log), "Ti %3d C %d - To %3d C %d - L %d.%03d %d\r\n",
+			tempI, tempIVoltage, tempO, tempOVoltage,
+			lambdaT.quot, abs(lambdaT.rem), lambdaVoltage);
+	printString(log);
+
+	char line0[17];
+	char line1[17];
+	snprintf(line0, sizeof(line0), "Ti %3dC To %3dC", tempI, tempO);
+	snprintf(line1, sizeof(line1), "L %d.%03d %s",
+			lambdaT.quot, abs(lambdaT.rem), toInfo(lambda));
+	lcd_setcursor(0, 1);
+	lcd_string(line0);
+	lcd_setcursor(0, 2);
+	lcd_string(line1);
 }
 
 int16_t average(int16_t value, int16_t average, uint8_t weight) {