Hopefully fixing issue with adding a repo and hopefully, finally,
cleaning up the row handling