Move this logic into a regular non-eval class