Mergin User Update into UserModel Refactor

Still need to fix up some stuff in the UserModel before merging with Master..