If they had made it to where you can just drop 18650s into the lights, I'd be ordering one ASAP. Or better still, 26650s. The world does not need more proprietary batteries.