Started adding mode dependence to multiplier class