Eval basically done
Merged Aaron's new stuff with mine all tidy-like