Went to the store where I bought my Note 7 today (bought it about 2 weeks today). They exchanged the Note 7 for a phone of my choice and I picked the Edge 7, figuring its the closest to the note. As far as I can tell the only difference is the lack of the S-pen on the edge. When the Note 7's with safe batteries are available I can then do another exchange to get the new Note -7, even if it is months away. I didn't have to pay any fees and in fact got a small amount of money back because the Edge costs less. I can of course keep the Edge, but I'm 99% sure I'll get the updated note, since I really make use of the s-pen. Overall a good experience...but it took a while since the store was so busy with all of the other note 7 exchanges.