Starting to get the supporting classes & enums defined