Finalized evaluation step, which now works. Ready to merge into master 818ec2e Dean commited on Feb 20, 2021