Removed the Payload badge related hack by changing the badge to be a pointer to
int and adding the SetBadge method.