Started adding support for links.