785 checkoutscope

Resolves #785. Technically unnecessary for master because we plan to implement #773 but we should pull it in for db consistency