rearranging stuff
Getting on that authentication