Finished refactor of local operations.