Armor. (Patch Pass: Second commit)