Link type

Updated and now targeted to master
stick this in a before block?