This works in theory. Haven't had time to write tests and/or test it either.
Nots.
Merge branch 'feature/Issues/65/Linking_via_SiteConfig' into Development