#4573: Added links annotation ability

-Some real code uncluded.