Interim checkin.  More documentation, improved parsing.