Added logic and instantiation for subclasses in onCalculate. Working on math with stepper now