#40 - Pass over weapon section to protect against order of operations issues