moved the rest of col names to enums from class