Addressbook changes per Greg Moser

This "ToDo" should be removed.