FIXME: Further progress.