diff --git a/include/conductor/Conductor.h b/include/conductor/Conductor.h
index f6885a2..448faf8 100644
--- a/include/conductor/Conductor.h
+++ b/include/conductor/Conductor.h
@@ -2,25 +2,16 @@
 #define DEF_CONDUCTOR
 
 #include <SFML/Graphics.hpp>
-#include "conductor/ControllerHandler.h"
-#include "conductor/ScheduleHandler.h"
-#include "conductor/PhysicsHandler.h"
-#include "conductor/DrawHandler.h"
-#include "conductor/AudioHandler.h"
+#include "Controllable.h"
 
 class Conductor {
   public:
     Conductor();
     void flush();
-    Controlable[] getEntities();
+    Controllable* getEntities();
     ~Conductor();
 
   private:
-    ControllerHandler controllerHandler;
-    ScheduleHandler scheduleHandler;
-    PhysicsHandler physicsHandler;
-    DrawHandler drawHandler;
-    AudioHandler audioHandler;
 };
 
 #endif
diff --git a/include/conductor/Controllable.h b/include/conductor/Controllable.h
index 4d2bf20..8351985 100644
--- a/include/conductor/Controllable.h
+++ b/include/conductor/Controllable.h
@@ -2,14 +2,15 @@
 #define DEF_CONTROLLABLE
 
 #include <SFML/Graphics.hpp>
+#include <SFML/Window/Keyboard.hpp>
 
 class Controllable {
   public:
   Controllable();
-  void keyHeldEvent(Key key, int timePressed)
-  void keyNotHeldEvent(Key key, int timePressed)
-  void keyPressedEvent(Key key, int timePressed)
-  void keyReleasedEvent(Key key, int timePressed)
+  void keyHeldEvent(sf::Keyboard::Key key, int timePressed);
+  void keyNotHeldEvent(sf::Keyboard::Key key, int timePressed);
+  void keyPressedEvent(sf::Keyboard::Key key, int timePressed);
+  void keyReleasedEvent(sf::Keyboard::Key key, int timePressed);
   ~Controllable();
 
   private:
diff --git a/src/conductor/Conductor.cpp b/src/conductor/Conductor.cpp
new file mode 100644
index 0000000..078f114
--- /dev/null
+++ b/src/conductor/Conductor.cpp
@@ -0,0 +1,15 @@
+#include "Conductor.h"
+
+Conductor::Conductor(){
+}
+
+void Conductor::flush(){
+}
+
+Controllable* Conductor::getEntities(){
+  return NULL;
+}
+
+Conductor::~Conductor(){
+}
+
diff --git a/src/conductor/Controllable.cpp b/src/conductor/Controllable.cpp
new file mode 100644
index 0000000..c6e4d26
--- /dev/null
+++ b/src/conductor/Controllable.cpp
@@ -0,0 +1,15 @@
+#include "Controllable.h"
+
+Controllable::Controllable(){
+}
+void Controllable::keyHeldEvent(sf::Keyboard::Key key, int timePressed){
+}
+void Controllable::keyNotHeldEvent(sf::Keyboard::Key key, int timePressed){
+}
+void Controllable::keyPressedEvent(sf::Keyboard::Key key, int timePressed){
+}
+void Controllable::keyReleasedEvent(sf::Keyboard::Key key, int timePressed){
+}
+Controllable::~Controllable(){
+}
+
diff --git a/src/main.cpp b/src/main.cpp
index e4bd9c4..de57f46 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,7 +29,7 @@ int main(){
     }
 
     // objects update.
-    conductor.flush()
+    conductor.flush();
     window.clear(sf::Color::Black);
     // TODO
     window.display();