Rewrite using Estira (don't merge yet)