Reworked the system to be less invasive on the individual Operation subclasses.