Bring stack into EvalContext

Fairly risky commit. Essentially brings ADDCLASSES into EvalContext.