Added a lot of timer stuff