Refactor animation timing to use lazy clocks

Refactor animation timing to use lazy clocks #1595