Further work; stopping for now.