Work to finish fixing add badge

Issues exist because of regression in CreateBadge.