Add live timers
Remove silly methods
Merge branch 'features/live-timers'