Added work on some timer stuff