Point coverage to the right thing and add badges