Introduced massive breakage, but got an address encoding format that should work going forwards.