Yep as you say mate decent cells and a decent charger off ebay, i got one off the guy stabba mentioned earlier, an xtar one or nitecore i4, 20 quid and it will have the batts at exactly 4.2volts on the button every time and keeps the batteries in tip top condition to get the maximum output from them. It can charge four batts together, a big difference in run times when using an indipendant lithium ion charger because it monitors each batt seperate and gives each the exact voltage and current needed to boost each batt. Highly reccomended with 18650's.
is this some thing i need to buy now r