General updates and rearrange auth
Squashing commits