Changed all references of User to UserInfo. NOT TESTED

DO NOT PULL YET