Dean
Finalized evaluation step, which now works. Ready to merge into master
818ec2e