Working on control flow for User and Computer, most recent code