WIP: Addresses. Need tests