CR2 Batteries

For CR2, I bought one of the EBL set of 8 with the charger, which looks slightly different then what they now sell (that you linked to).

For rechargeable CR123As, I just bought these and they are arriving today, so I'll be installing them in a few hours.