Adding missing links (or at least TODO)