Finish credentials.  Update XSD.  Refactor.