Copied over jon-michael's config et al