Modified User model (broken)
Added user functions