Lazy mode of operation for links
Updated TODO list