Attempting to refactor the auth tables.