User class

Formatted, and added Username, per our meeting last Monday/Wednesday