diff --git a/KeyboardioFirmware.ino b/KeyboardioFirmware.ino
index daae7b47..5b36d201 100644
--- a/KeyboardioFirmware.ino
+++ b/KeyboardioFirmware.ino
@@ -23,6 +23,7 @@ void setup() {
 
 
 void loop() {
+    akelaIF.loop (&akelaIF.hid, &akelaIF.keyMap);
     KeyboardHardware.scan_matrix();
     LEDControl.update(temporary_keymap);
     Keyboard.sendReport();
diff --git a/key_events.cpp b/key_events.cpp
index e474fe2c..58a05675 100644
--- a/key_events.cpp
+++ b/key_events.cpp
@@ -1,7 +1,4 @@
 #include "key_events.h"
-#include "AkelaWrapper.h"
-
-static Keyboardio::AkelaInterface akelaIF;
 
 const Key keymaps[KEYMAPS][ROWS][COLS] = { KEYMAP_LIST };
 
diff --git a/key_events.h b/key_events.h
index 844798bd..d1e79c68 100644
--- a/key_events.h
+++ b/key_events.h
@@ -7,12 +7,16 @@
 #include "LEDControl.h"
 #include "Storage.h"
 #include "keymap_metadata.h"
-#include "generated/keymaps.h"
 
 extern const Key keymaps[KEYMAPS][ROWS][COLS];
 extern uint8_t primary_keymap;
 extern uint8_t temporary_keymap;
 
+#include "AkelaWrapper.h"
+#include "generated/keymaps.h"
+
+static Keyboardio::AkelaInterface akelaIF;
+
 // sending events to the computer
 void handle_synthetic_key_event( Key mappedKey, uint8_t currentState, uint8_t previousState);
 void handle_key_event(byte row, byte col, uint8_t currentState, uint8_t previousState);