Make wait() less bodged
WIP