new formatter gets championship data as well

plus data for 07,08