Remove Address type and just use raw numbers. This type was more trouble than it was worth.