requesetiong Full refactor suggestions

Can't read it well on GitHub -- is all this stuff inside the `class User`? If not, move this in. Anything related to `User`s should be placed inside `class User`.