We'll probably want to make the badge also be from shields when I push that change