Armor & shield bonus calculations work.  Started on Charisma calcualtion from edges & hindrances.