WIP
Finishing auth