I thought this would be better placed in `tap_lets_go` because there are two places that this is used so we use the wait/logic in a more sensible place, fix in two places.