I think we had sort of covered #1 (although not clearly defined what would be a qualifying link), but #2 is an interesting addition in that it brings in the torrent concept.