WIP, refactoring LocalMethods
Finished refactor of local operations.
Merge pull request #755 from lossyrob/localmethods

WIP: Refactor\fix to local method changes