https://www.amazon.com/MXJO-18650-2500mAh-35A-Battery/dp/B00N793Z30
Busy right now, but I'll try and post more about it later.