[WIP] Updated KeystoneStrategy

NOT TESTED!