I actually just ordered a nitecore i4, and some 4000mah 18650's for a cheapie Ultrafire Flashlight I just purchased off of amazon.

I didn't like the charger it came with (and didn't like the 2200mah rating of the battery) it came with, so thought I would try some higher capacity/quality batteries in it.