Major refactor. Begin addRow()