WIP: Refactor address lookup to fix address not always saving on watch