More work on the addresses section.