Partial migration to using area-dat done. More to do.