Training now optional
Eval overhaul underway