Adding in crypto services
Adding keystore file management
Adding in more security.  Review and break up this commit later