Rename some functions
Add missing functions
Extract all functions in Expr
Proof that both evals are equal