Revise the way columns are built in rows. Sort is broken.