switched my states to ENUMS to make my life easier
merging