First attempt for operation refactor.