WIP, add waits for reliability