Updates from the ghiraldi-views-engine work.