Minor progress

Made row generation a little better. Hope to focus more tomorrow.