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