Added objects and calc.
Added array of objects.