Propogating cursor through smartags
Give TODO's back links.
Fixing UT and implementing perf speed up.