Abstracted over Operands and their format

no longer separate classes for 1 or 2 operands
Also, moved 'One'