Added components to year chart.
First work on year comparison chart.
Whoops.
Cleanup and debug