TODO updated.
Accessory work templating fixex.