Battery charger is already apparently planned, as with a lot of other changes that should balance some new stuff more reasonably.
