Evaluation, updates to final
Finished final for review