Just merging now that the framework is in place and (reasonably) stable.