Moved start of waitForStart task to before nxt delay setter

I'm 99.999% sure this goes here, if I'm wrong revert this.