Revert "Revert "Forward Port Circle Battery (WIP)""

This reverts commit 1044f0447ce496fd6282ed3166d6daed07026588.