Add new calculations; still needs work