anchor.diff:  to_json(Req, #config_state{organization_name = OrgName,
                              organization_guid = OrgGuid,
                              node_name = NodeName,
  -                           incarnation_id = IncarnationId} = State) ->
  +                           incarnation_id = IncarnationId,
  +                           requestor_key = ClientKey } = State) ->
       Host = envy:get(pushy, server_name, string),
       ConfigLifetime = envy:get(pushy, config_lifetime, ?DEFAULT_CONFIG_LIFETIME, integer),
       HeartbeatAddress = iolist_to_binary(
  
positive.code:           {<<"organization">>, OrgName},
            {<<"public_key">>, PublicKey},
            {<<"session_key">>, KeyStruct},
            {<<"lifetime">>, ConfigLifetime},
            {<<"incarnation_id">>, IncarnationId}
           ]},
  
negative.code:     %% The session key should be sent encrypted using the client's public key. We're
      %% skipping that for the moment, but this work is not done unless we fix this.
      %% This needs the client key fetch work to be done first though...
  
      EncodedKey = public_key:encrypt_public(Key, ClientKey),
      B64EncodedKey = base64:encode(EncodedKey),
      EKeyStruct =  {[{<<"method">>, Method}, {<<"key">>, B64EncodedKey}]},
      KeyStruct =  {[{<<"method">>, Method}, {<<"key">>, base64:encode(Key) }]}, %% TODO REMOVE
  
      lager:info("Key ~s~n~s", [Key, base64:encode(Key)]),
      lager:info("EncodedKey ~s~n~s", [EncodedKey, B64EncodedKey]),
  
      ConfigurationStruct =
          {[{<<"type">>, <<"config">>},
  