Closes !8

Co-authored-by: Joe Seki <joeseki@proton.me>
Co-authored-by: Bastien Le Querrec <blq@laquadrature.net>