Made calorimeters work, some other stuff as well. TypeError in trail I don't understand, but everything runs fine.
Big merge. Still TypeError in Trail I can't figure out but everything seems to work.
More merge.