Implemented modifications to IOperations, restructured code!