Somewhat further along towards implementing key ratcheting