Add column sorting (wip)