merge of nat, continued. almost there.