WIP, remove some client.helper.wait()