Updated timer, added recurring timer functionality