merged timer, git commmit might work this time....?