Some more work in progress.