Working on moving state to created ModuleCalculator instances.