Link type

Updated and now targeted to master
that's pretty close to my proposal, which is ultimately pretty simple.  Is there something there you don't like?