Do a quick intergration into main for the battery charging logic
Do a quick intergration into main for the battery charging logic