More than one address input

I changed the code to work with more than one address field on the same screen.