Added some alternative Waiting functionality to partially remedy the fundamental "waiting" flaw that was imminent