More moving.  Links now also get references.