Code

Merge branch 'jc/checkout-m-twoway'