Further work in progress.