I am working on a 21700 to 2C adapter. 21700’s maybe the ultimate “fuel” for a 2C light in terms of run time - I don’t know of anything with more Watt hours that will fit in a unmodified 2C tube.