Made some progress on the address search feature