PS: I'm currently shopping for an road bicycle headlight that takes repairable packs or individual cells made from 18650's so I can retrofit with NCR18650B's (or equally good cells) at some point.