So, the 18650 battery is the way to go then? I have several of those and a slow charger. I can just solder the connector to them and still be able to drop a spare one into the charger and use the other one for a day at the races. If so, that's super cool!