Add the link back. WIP - make it work properly.