Adds calculation of things to controller :(
Switch to using controller's calculation instead
Add slice for not-yet-accepted if makes sense
Merge branch 'feature/more-useful-pie-charts'