Working much more beautifully, still work to do.