Work on Composite. Still more to do.