beginning family select changes for refactoring
Merge branch 'origin/feature-ds-attendedcheckin'