Fudged the User model, kind of...