Add locate for address, looks like it's finished