diff --git a/src/hasp_button.cpp b/src/hasp_button.cpp
index 95f3f446..9aa764d2 100644
--- a/src/hasp_button.cpp
+++ b/src/hasp_button.cpp
@@ -36,8 +36,7 @@ static void IRAM_ATTR button_event_cb(AceButton * button, uint8_t eventType, uin
             memcpy_P(buffer, PSTR("UP"), sizeof(buffer));
             break;
     }
-    // dispatch_button(button->getId(), buffer);
-    mqtt_send_input(button->getId(), buffer);
+    dispatch_button(button->getId(), buffer);
 }
 
 void buttonSetup(void)
diff --git a/src/hasp_button.h b/src/hasp_button.h
index 1a901d55..e19bb556 100644
--- a/src/hasp_button.h
+++ b/src/hasp_button.h
@@ -4,7 +4,7 @@
 #define HASP_BUTTON_H
 
 void buttonSetup(void);
-void buttonLoop(void);
+void IRAM_ATTR buttonLoop(void);
 
 #endif
 #endif
diff --git a/src/hasp_gpio.cpp b/src/hasp_gpio.cpp
new file mode 100644
index 00000000..76b552e5
--- /dev/null
+++ b/src/hasp_gpio.cpp
@@ -0,0 +1,10 @@
+#include <Arduino.h>
+#include "ArduinoJson.h"
+
+void gpioSetup(JsonObject settings)
+{
+#if defined(ARDUINO_ARCH_ESP8266)
+    pinMode(D1, OUTPUT);
+    pinMode(D2, INPUT_PULLUP);
+#endif
+}
\ No newline at end of file
diff --git a/src/hasp_gpio.h b/src/hasp_gpio.h
new file mode 100644
index 00000000..91911db6
--- /dev/null
+++ b/src/hasp_gpio.h
@@ -0,0 +1,3 @@
+#include "ArduinoJson.h"
+
+void gpioSetup(JsonObject settings);