Committed changes for Sunday 3/17 (validation, etc.)
Committed changes for 3/17 (second attempt)