Starting to make it **really** row-major