Working on refactoring eval and users.