Revert "Remove ADDRESS Stuff"

This reverts commit 81b4a633814cb6047180f34b1c78aea123b6e4fd.