Working on getting a keystore working