Merge branch 'evaluation' into Ryan-Haglund
Merge branch 'Ryan-Haglund' into Parker