Did more work on new user data system.