Pushed auth helpers forward, still some bugs