Moving the enum's to the header.