Completed Adding the AddressAndPayment view.  Page 121
Completed without the admin settings