This seems like it could be done in the `waitFor` too