--- a/tuikit/core/application.py	Wed Mar 19 00:32:38 2014 +0100
+++ b/tuikit/core/application.py	Wed Mar 19 20:42:52 2014 +0100
@@ -1,5 +1,6 @@
 from tuikit.core.window import WindowManager, Window
 from tuikit.core.theme import default_theme
+from tuikit.core.timer import Timer
 
 import logging
 
@@ -14,12 +15,10 @@
     """
 
     def __init__(self, driver='curses'):
-        # logger
         self.log = logging.getLogger('tuikit')
-        # Driver
         self.driver = None
-        # Window Manager and root Window
-        self.window_manager = WindowManager()
+        self.timer = Timer()
+        self.window_manager = WindowManager(timer=self.timer)
         self.root_window = Window()
         # flags
         self._started = False
@@ -57,18 +56,18 @@
         """The main loop."""
         self._started = True
         self.window_manager.handle_event('resize', *self.driver.size)
-#        timer = self._timer
 
         while not self._quit:
             self.window_manager.draw(self.driver)
             self.driver.flush()
 
-            #timeout = timer.nearest_timeout()
-            events = self.driver.getevents()#timeout)
-            #timer.process_timeouts()
+            timeout = self.timer.nearest_timeout()
+            events = self.driver.getevents(timeout)
 
+            self.timer.process_timeouts()
             for event in events:
                 self.window_manager.handle_event(event[0], *event[1:])
+
         self._started = False
         self.log.info('=== quit ===')