Got the timers working
merged the files