Replace timers with simple until loop. Easier to use and really all we need here