Added enums there was a merge error Im too afraid to go near