Rought draft for cleaning up addresses logic