Added _user partial

Just some refactoring
PASSING