Modified a lot of code to enable searching based on current location