Make some clean
Add a year chart for each measure