Added timer

- Still got bug and causes exception so commented