Start using dicts for rows, fix some stuff to return any data. Still sort of in flux