New Badges

I quite like the new badges, although losing sight of my step badges is annoying. I do note that the badges are very heavily weighted towards stepping, running and cycling. Where are all the swimming badges? I would have thought that some of the usual open water and pool swim distances would be worthy of a badge. Come on Garmin...there's a badge for a drone activity but not for a 1 mile swim? Not convinced that flying a drone does much for your fitness.