Added preliminary location searching