diff --git a/chicken_door.ino b/chicken_door.ino
index fc418bd..73f9854 100644
--- a/chicken_door.ino
+++ b/chicken_door.ino
@@ -5,35 +5,7 @@
  *
  */
 
-
-// Enable deep sleep with wake on watchdog interrupt.
-// Based on Donal Morrissey's code at http://donalmorrissey.blogspot.co.uk/2010/04/sleeping-arduino-part-5-wake-up-via.html
-#include <avr/sleep.h>
-#include <avr/power.h>
-#include <avr/wdt.h>
-
-volatile int f_wdt=1;
-
-ISR(WDT_vect) {
-  if (f_wdt == 0)
-  {
-    f_wdt=1;
-  }
-}
-
-void enterSleep(void) {
-  set_sleep_mode(SLEEP_MODE_PWR_DOWN);   /* PWR_SAVE or PWR_DOWN */
-  sleep_enable();  
-  sleep_mode();
-  
-  /* The program will continue from here after the WDT timeout*/
-  sleep_disable(); /* First thing to do is disable sleep. */
-  
-  /* Re-enable the peripherals. */
-  power_all_enable();
-//  delay(8000);
-//  f_wdt = 1;
-}
+#include <Narcoleptic.h>
 
 #define ONOFF_PIN        5
 #define FWREV_PIN        3
@@ -48,44 +20,39 @@
 #define RAISE_DOOR     4
 
 #define BRIGHTNESS_SIZE  3
-#define BRIGHT_THRESHOLD 800
+#define BRIGHT_THRESHOLD 700
 #define OPEN_DELAY       6250
+#define HYSTERESIS       50
 
 word brightness[BRIGHTNESS_SIZE];
 int state = WAIT_FOR_LIGHT;
-
-void setupWDT() {
-  /* Clear the reset flag. */
-  MCUSR &= ~(1<<WDRF);
-  
-  /* In order to change WDE or the prescaler, we need to
-   * set WDCE (This will allow updates for 4 clock cycles).
-   */
-  WDTCSR |= (1<<WDCE) | (1<<WDE);
-
-  /* set new watchdog timeout prescaler value */
-  WDTCSR = 1<<WDP0 | 1<<WDP3; /* 8.0 seconds */
-  
-  /* Enable the WD interrupt (note no reset). */
-  WDTCSR |= _BV(WDIE);
-}
+volatile int button_state = 0;
 
 void setup() {
   pinMode(ONOFF_PIN, OUTPUT);
   pinMode(FWREV_PIN, OUTPUT);
   pinMode(DOOR_CONTACT_PIN, INPUT);
+  digitalWrite(DOOR_CONTACT_PIN, LOW);
   pinMode(BUTTON_PIN, INPUT);
+//  attachInterrupt(0, pressButton, LOW);
   digitalWrite(ONOFF_PIN, LOW);
   digitalWrite(FWREV_PIN, LOW);
-//  Serial.begin(9600);
   state = INITIALIZE;
   word currentBrightness = analogRead(PHOTOCELL_PIN);
   for (int i = 0; i < BRIGHTNESS_SIZE; i++) {
     brightness[i] = currentBrightness;
   }
-  setupWDT();
+  Narcoleptic.disableTimer1();
+  Narcoleptic.disableTimer2();
+  Narcoleptic.disableSerial();
+  Narcoleptic.disableWire();
+  Narcoleptic.disableSPI();
 }
 
+/* void pressButton() {
+  button_state = 1;
+} */
+
 void raiseDoor() {
   digitalWrite(FWREV_PIN, LOW);
   delay(10);
@@ -119,45 +86,40 @@
     total += brightness[i];
   }
   word avg = total / (BRIGHTNESS_SIZE + 1);
-/*  Serial.begin(9600);
-  Serial.print("Brightness, avg: ");
-  Serial.print(avg);
-  Serial.print(", current: ");
-  Serial.print(currentBrightness);
-  Serial.print("\n"); */
   return avg;
 }
 
 void loop() {
-  if (f_wdt == 1) {
-    f_wdt = 0;
-    
-    switch (state) {
-      case INITIALIZE:
-        if (digitalRead(DOOR_CONTACT_PIN) == LOW) {
-          raiseDoor();
-        }
-        state = WAIT_FOR_LIGHT;
-        break;
-      case WAIT_FOR_LIGHT:
-        if (readBrightness() > BRIGHT_THRESHOLD) {
-          state = LOWER_DOOR;
-        }
-        break;
-      case LOWER_DOOR:
-        lowerDoor();
-        state = WAIT_FOR_DARK;
-        break;
-      case WAIT_FOR_DARK:
-        if (readBrightness() < BRIGHT_THRESHOLD) {
-          state = RAISE_DOOR;
-        }
-        break;
-      case RAISE_DOOR:
+  switch (state) {
+    case INITIALIZE:
+      if (digitalRead(DOOR_CONTACT_PIN) == LOW) {
         raiseDoor();
-        state = WAIT_FOR_LIGHT;
-        break;
-    }
-    enterSleep();
+      }
+      state = WAIT_FOR_LIGHT;
+      break;
+    case WAIT_FOR_LIGHT:
+      if ((readBrightness() > (BRIGHT_THRESHOLD + HYSTERESIS)) || (button_state == 1)) {
+        button_state = 0;
+        state = LOWER_DOOR;
+      } else {
+        Narcoleptic.delay(30000);
+      }
+      break;
+    case LOWER_DOOR:
+      lowerDoor();
+      state = WAIT_FOR_DARK;
+      break;
+    case WAIT_FOR_DARK:
+      if ((readBrightness() < (BRIGHT_THRESHOLD - HYSTERESIS)) || (button_state == 1)) {
+        button_state = 0;
+        state = RAISE_DOOR;
+      } else {
+        Narcoleptic.delay(30000);
+      }
+      break;
+    case RAISE_DOOR:
+      raiseDoor();
+      state = WAIT_FOR_LIGHT;
+      break;
   }
 }