Some Chapter 6 work (lots more to come...)
Authored by: cmpilato 2003-01-19
Parent: [r145]
Child: [r147]
