More work on battery multi block