Part way through new address structure