Start add_user feature; slight helper refactor