Making headway on the XJC task.