Flesh out repair flow