Complete p95.  Work in progress on p96