Group additions

- Reorged the code a bit
- Trying to figure out how to render the many values onto a single chart