User add discussion

Not complete code, but this is necessary to prevent crazy merge conflicts in the future. you are welcome, future rao.