adding all fields, saving them in an enum for future use

updating the check function - splitting it to two functions for easier maintainability