Fínished Badges, still needs testing