Switched in new Eval references/handling. Removed some obsolete methods