Added Armor functions/variables and tested