Cleaned up row generation code, added TODO