Isolated AddUserQuery from View.
Merge branch 'rework' of https://github.com/darrensapalo/desipat_phase3.git into rework