Yeah I know I have to do this, before this can be merged :). It's far more work/tricky for the AddressBookPage, as this is used in very different files (other related pull).