WIP on new external authentication