reorganizing for better div population, with everything except waffle and bars done
waffle in
bar chart changing
taking out merge conflicts hopefully
renaming average