#40 - Pass over core section to update formulas to better protect against order of operations issues