diff --git a/include/cpp3ds/Window/EventManager.hpp b/include/cpp3ds/Window/EventManager.hpp
index 13d70cc..fa4de59 100644
--- a/include/cpp3ds/Window/EventManager.hpp
+++ b/include/cpp3ds/Window/EventManager.hpp
@@ -105,6 +105,8 @@ private:
 	////////////////////////////////////////////////////////////
 	void processEvents();
 
+	bool filterEvent(const Event& event);
+
 	std::queue<Event> m_events;                          ///< Queue of available events
 //	JoystickState     m_joystickStates[Joystick::Count]; ///< Previous state of the joysticks
 	Vector3f          m_sensorValue[Sensor::Count];      ///< Previous value of the sensors
diff --git a/src/cpp3ds/Window/Event.cpp b/src/cpp3ds/Window/Event.cpp
deleted file mode 100644
index b9b4f01..0000000
--- a/src/cpp3ds/Window/Event.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <cpp3ds/Window/Event.hpp>
-
-namespace cpp3ds {
-
-////////////////////////////////////////////////////////////
-bool pollEvent(Event& event) {
-//    if (m_impl && m_impl->popEvent(event, false))
-//    {
-//        return filterEvent(event);
-//    }
-//    else
-//    {
-        return false;
-//    }
-}
-
-
-////////////////////////////////////////////////////////////
-bool waitEvent(Event& event) {
-//    if (m_impl && m_impl->popEvent(event, true))
-//    {
-//        return filterEvent(event);
-//    }
-//    else
-//    {
-        return false;
-//    }
-}
-
-}
diff --git a/src/cpp3ds/Window/EventManager.cpp b/src/cpp3ds/Window/EventManager.cpp
index 80e848a..3f73882 100644
--- a/src/cpp3ds/Window/EventManager.cpp
+++ b/src/cpp3ds/Window/EventManager.cpp
@@ -4,11 +4,19 @@
 namespace cpp3ds {
 
 bool EventManager::pollEvent(Event& event) {
-	return false;
+	if (popEvent(event, false)) {
+		return filterEvent(event);
+	} else {
+		return false;
+	}
 }
 
 bool EventManager::waitEvent(Event& event) {
-	return false;
+	if (popEvent(event, true)) {
+		return filterEvent(event);
+	} else {
+		return false;
+	}
 }
 
 void EventManager::setJoystickThreshold(float threshold) {
@@ -19,6 +27,10 @@ void EventManager::pushEvent(const Event& event) {
 	//
 }
 
+bool EventManager::filterEvent(const Event& event) {
+	return true;
+}
+
 ////////////////////////////////////////////////////////////
 void EventManager::processEvents() {
 	//