Refactors double all calls back to one method
Minor
Add more user service stuff and improves api