Incremental checkin of commented code.  There is more to do.