More auth and validation work