Public Health & Athletics Fixes
Athletics
Merge branch 'public-health-athletics'