Massive changes: added Local feature and did some refactoring that that necessitated