Working on checkout
Merge branch 'caple8'