More work on checkout.