merge and beginning to combine graphs and website