Reviewed
Added username to User
First step towards routes