Initial work on address_tool