Fixed keystore problems and added crypto to location mechanism
fixing bad commit...
Revert "fixing bad commit..."

This reverts commit 4a6b1fedfb9dd3571fac906bf2d34c655366344c.
fixing commit 2
fixing commit..
this is where we force push, too bad