Many more refactorings of Credentials, but builds!