More work in progress.