Would a good solution be to test battery designs in crash tests and tax more flammable designs more? Try and incentivize companies to come up with innovative fire suppression designs