#77 Starting to use a keystore