Badge types

WIP getting some errors testing that I'm not sure how to address. Also cleaned up some semi-colons (I'm a lint guy).