Sounds good! I think this is the only remaining block on this pull request. Except perhaps checking the site.domain thing below.