Key is standardisation, we should all move to li-ion but not at the cost of random shapes and non-swappable. Everything should have similar 3-4 form factor batteries and easily replaceable. Also the charging connector, everything should have USB c, barrel connector should be banned or be forced to just use one single size