getting all the relevant graphs working again.

trying tidy the way the calculation class is called