Moved eval to own source file