Finish first pass through 7.3.1