Revert last commit (pretty much). Implemented custom timers