Some more work done on checkout