A much cleaner way to get columns regardless of what the order of the columns is.  Removed a lot of dead or ugly code.