Untracked files commit
Merge branch 'Cycle2Ryan'
fixed validation issues and resolved another commit conflict