Got rows working again
Do it Live!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Pre Merge
Ready for commit
merge branch