Rough draft for cleaning up addresses logic