LocalSearch Refactoring - PART II - now we need to implement