Addressbook changes per Greg Moser

This comment should be removed