Some work on the first per-fk template. refs #478