Move patch to address class - much simpler