#2: Ongoing work to unify site generation