Revert "threaded timing"

This reverts commit c0a47aa74a702523b60df7c540802219ec021225.

Reverting Threading/Waiting changes back to sleeping
Revert "waiting rather than sleeping"

This reverts commit 4ed91b67fee3eae16d620194673c0a60fc64177a.

Reverting waiting
reverted and fixed all