Works better now.

I have to pass the address into the class which seems silly. It should
know who it is.