Cool 🙂 Excited to do that, but will do it as a separate PR because it’s a pretty invasive change