wip: More auth...