Further progress with FileMaker mode.