No substantial changes to logic, just adding more header rows.  Going to update logic on next version, so setting this one here as clean.