great refactor of auth
fixed conflicts