Badges should be sorted out now, banners are not done yet.