getting my fork in sync.

I wanted to draw your attention to the fact that I set the default to 0 not -1, and that I would be adding an attempt at an armour calculation.