Adds pie chart; labels still need work.
Fixes merge conflicts.