Lots of changes and refactoring. Check in of address_keeper example.