Issue #13: Added storing of some data to track the row.