I guess it's time that we allow batteries to be charged, and be placed in machines. We should also rework the storage units so that they will pull from and push to the batteries directly. This will also provide saner charging of the gravi chest plate.

Probably not for the initial 1.18 release.