Update Timers

Closes issue #10. Closes issue #18.