[@Avali]
Looks good. Now I have to decide whether Grace will be given the Mark of the Hero, and if so, how to mechanize it...