Location search simulation implemented
Refactoring for clarity
Merge pull request #24 from RightThisWay/FinishSearchLocations

Finish search locations