Implemented IC separation of calculation and payment

Relates to #172