More auth work, finiished soon