Got link and unlink working.
Merge branch 'brownyoda' into cevans