Armor model hook, take 3 (updated for 1.5.1)

Basically a rebase of #468