More badges

Moar badges (got lost in b0rked branch)