Finishing second scenario, need to handle user data better