Modified User model (broken)
Added user functions
Change attr name
Changed function name
merged