Merging user class
merging user class
Adding UserService implementation