first crack at correctly not skipping changed stages on restart