WIP second mods to the checkout 'address' state for single page co