Merge branch 'evaluation' into Jared-Johnson
Updating scripts
More updates
Merge branch 'Jared-Johnson' into evaluation