Added Damage handling in all but shield.
Merge origin/master