Added in ability for user to add operations other than flags
Merge branch 'op_conversion' into CAN_conversion