JamesC PR #3 to Master

Verified that my changes are good on the staging environment PR to master now.