Did a bit more work. More to follow.