Badge system updates

cc @SamSaffron