Did a small amount of work on timer stuff