started restructuring modelcalculator part