Adding addressbook code, just for the record