[@Gunther] I should point out you are now a Co-GM.

Also all that looks good, let me know when it's done with the Sappers and whatnot and I'll put it on the OP. Are you planning to put the Armour in that or keep it separate?