User model

merging in user model