New Start
Added enums
Added structs
Cleaned up