diff --git a/FlippR-Driver/src/input/InputDriver.hpp b/FlippR-Driver/src/input/InputDriver.hpp
index 95701a1..44d4b0c 100644
--- a/FlippR-Driver/src/input/InputDriver.hpp
+++ b/FlippR-Driver/src/input/InputDriver.hpp
@@ -14,8 +14,30 @@ namespace Input
 
 class InputDriver
 {
-  void register_event_handler(EventHandler* handler);
-  void unregister_event_handler(EventHandler* handler);
+
+public:
+  InputDriver(EventNotifier* event_notifier) :
+    event_notifier(event_notifier)
+  {}
+
+  ~InputDriver()
+  {
+    delete event_notifier;
+    event_notifier = NULL;
+  }
+
+  void register_event_handler(EventHandler* handler)
+  {
+    event_notifier->register_event_handler(handler);
+  }
+
+  void unregister_event_handler(EventHandler* handler)
+  {
+    event_notifier->unregister_event_handler(handler);
+  }
+
+private:
+  EventNotifier* event_notifier;
 };
 
 }