Just bought myself a new laptop to replace my aging XPS13. One of these https://starlabs.systems/pages/starbook from @starlabssystems as it's a good price, decent spec, and I like that I can open it and upgrade it. I have previously done a battery swap on the XPS but it wasn't pleasant. That battery is dying again so excuse for an upgrade. The XPS will probably end up in the garage as the 'car laptop'