Misc. changes to SQLColumns and commented out references to deprecated COLUMNS_ enums
Basic testing now runs correctly
Working for about half of the columns