Add retry screen, stage stuff