Plan rev 5/5b and contract criteria 21-29 (25 amended to the two-part touch proof), TODO line, journal.