Zza: use states everywhere we used to use links