Created state service
Merged conflicts
Added a userType to return