Moved New User info to new class