Moved all evaluation into Scope