true auth in progress
update user class and abstractuser class
Merge conflicts