Add initial work before I realized credentials have to be in-process